diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-14 01:59:15 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-14 01:59:15 +0200 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/arm/plat-samsung/Kconfig | |
| parent | arch/tile: extend syscall ABI to set r1 on return as well. (diff) | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| download | linux-7d72e6fa56c4100b9669efe0044f77ed9eb785a1.tar.xz linux-7d72e6fa56c4100b9669efe0044f77ed9eb785a1.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 2753fb3e4f73..4529dd6232bc 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -160,6 +160,11 @@ config S3C_DEV_HSMMC2 help Compile in platform device definitions for HSMMC channel 2 +config S3C_DEV_HSMMC3 + bool + help + Compile in platform device definitions for HSMMC channel 3 + config S3C_DEV_HWMON bool help @@ -216,6 +221,11 @@ config SAMSUNG_DEV_ADC help Compile in platform device definition for ADC controller +config SAMSUNG_DEV_IDE + bool + help + Compile in platform device definitions for IDE + config S3C64XX_DEV_SPI bool help @@ -227,6 +237,11 @@ config SAMSUNG_DEV_TS help Common in platform device definitions for touchscreen device +config SAMSUNG_DEV_KEYPAD + bool + help + Compile in platform device definitions for keypad + # DMA config S3C_DMA |