diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-29 03:36:24 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-29 03:36:24 -0400 |
| commit | 7407cf355fdf5500430be966dbbde84a27293bad (patch) | |
| tree | 922861288ff38558ed721a79653f52b17b13bb95 /arch/arm/mach-omap2/Kconfig | |
| parent | 6a47dc1418682c83d603b491df1d048f73aa973e (diff) | |
| parent | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/block_dev.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index a8a3d1e23e26..2455dcc744a0 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -59,8 +59,10 @@ config MACH_OMAP3_BEAGLE | |||
| 59 | select OMAP_PACKAGE_CBB | 59 | select OMAP_PACKAGE_CBB |
| 60 | 60 | ||
| 61 | config MACH_DEVKIT8000 | 61 | config MACH_DEVKIT8000 |
| 62 | bool "DEVKIT8000 board" | 62 | bool "DEVKIT8000 board" |
| 63 | depends on ARCH_OMAP3 | 63 | depends on ARCH_OMAP3 |
| 64 | select OMAP_PACKAGE_CUS | ||
| 65 | select OMAP_MUX | ||
| 64 | 66 | ||
| 65 | config MACH_OMAP_LDP | 67 | config MACH_OMAP_LDP |
| 66 | bool "OMAP3 LDP board" | 68 | bool "OMAP3 LDP board" |