diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 16:05:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 16:05:57 -0400 |
| commit | 932c37c375cca25175f9b6acee4c75d7a96d985f (patch) | |
| tree | d7ba3620cd9a7a21c2de1bdfc7badd7637ed635e /arch/arm/mach-omap2/Kconfig | |
| parent | c855ff3718e5f667b463b20b9de516b4cd7625ad (diff) | |
| parent | 805f53f085346b6765eda02820721a14ce0d644f (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
ARM: OMAP: Fix GCC-reported compile time bug
ARM: OMAP: restore CONFIG_GENERIC_TIME
ARM: OMAP: partial LED fixes
ARM: OMAP: add SoSSI clock (call propagate_rate for childrens)
ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)
ARM: OMAP: Sync framebuffer headers with N800 tree
ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree
ARM: OMAP: Fix gpmc header
ARM: OMAP: Add mailbox support for IVA
[ARM] armv7: add Makefile and Kconfig entries
[ARM] armv7: add support for asid-tagged VIVT I-cache
[ARM] armv7: add dedicated ARMv7 barrier instructions
[ARM] armv7: Add ARMv7 cacheid macros
[ARM] armv7: add support for ARMv7 cores.
[ARM] Fix ARM branch relocation range
[ARM] 4363/1: AT91: Remove legacy PIO definitions
[ARM] 4361/1: AT91: Build error
ARM: OMAP: Sync core code with linux-omap
ARM: OMAP: Sync headers with linux-omap
ARM: OMAP: h4 must have blinky leds!!
...
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index aab97ccf1e63..7393109f5c30 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -9,6 +9,7 @@ config ARCH_OMAP2420 | |||
| 9 | bool "OMAP2420 support" | 9 | bool "OMAP2420 support" |
| 10 | depends on ARCH_OMAP24XX | 10 | depends on ARCH_OMAP24XX |
| 11 | select OMAP_DM_TIMER | 11 | select OMAP_DM_TIMER |
| 12 | select ARCH_OMAP_OTG | ||
| 12 | 13 | ||
| 13 | comment "OMAP Board Type" | 14 | comment "OMAP Board Type" |
| 14 | depends on ARCH_OMAP2 | 15 | depends on ARCH_OMAP2 |
| @@ -20,6 +21,7 @@ config MACH_OMAP_GENERIC | |||
| 20 | config MACH_OMAP_H4 | 21 | config MACH_OMAP_H4 |
| 21 | bool "OMAP 2420 H4 board" | 22 | bool "OMAP 2420 H4 board" |
| 22 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | 23 | depends on ARCH_OMAP2 && ARCH_OMAP24XX |
| 24 | select OMAP_DEBUG_LEDS if LEDS || LEDS_OMAP_DEBUG | ||
| 23 | 25 | ||
| 24 | config MACH_OMAP_APOLLON | 26 | config MACH_OMAP_APOLLON |
| 25 | bool "OMAP 2420 Apollon board" | 27 | bool "OMAP 2420 Apollon board" |