diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 13:17:11 -0500 |
| commit | a46699c9a32505cb5bbfd16f76e7d4a2c84a7705 (patch) | |
| tree | 5c0bc91dd1c07ab95769f5749b3b58235c758d50 /arch/arm/Kconfig | |
| parent | 7ed0175a462c4c30f6df6fac1cccac058f997739 (diff) | |
| parent | b216c01829d0b73a468204e2e763c0a818b77a46 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ec77721507cb..3df7cbd924a1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -239,6 +239,8 @@ source "arch/arm/plat-omap/Kconfig" | |||
| 239 | 239 | ||
| 240 | source "arch/arm/mach-omap1/Kconfig" | 240 | source "arch/arm/mach-omap1/Kconfig" |
| 241 | 241 | ||
| 242 | source "arch/arm/mach-omap2/Kconfig" | ||
| 243 | |||
| 242 | source "arch/arm/mach-s3c2410/Kconfig" | 244 | source "arch/arm/mach-s3c2410/Kconfig" |
| 243 | 245 | ||
| 244 | source "arch/arm/mach-lh7a40x/Kconfig" | 246 | source "arch/arm/mach-lh7a40x/Kconfig" |