diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:42 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:42 -0400 |
| commit | 05a690d2db5bd57d3c94293b06b69158535835df (patch) | |
| tree | fb924faf327ae3d6b1f4a7cde96e007e9b32d7be /arch/arm/plat-samsung/Kconfig | |
| parent | 1770a8988f6178efdc1bfc85fb29deacac49fe91 (diff) | |
| parent | 4f7cdc38c000deba82479205f4c99f4c1e7c6d1f (diff) | |
ARM: Merge for-2635/samsung-ts
Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 5349d2181bd..2f1b3d4a09b 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
| @@ -190,6 +190,11 @@ config S3C_DEV_NAND | |||
| 190 | help | 190 | help |
| 191 | Compile in platform device definition for NAND controller | 191 | Compile in platform device definition for NAND controller |
| 192 | 192 | ||
| 193 | config SAMSUNG_DEV_ADC | ||
| 194 | bool | ||
| 195 | help | ||
| 196 | Compile in platform device definition for ADC controller | ||
| 197 | |||
| 193 | config S3C64XX_DEV_SPI | 198 | config S3C64XX_DEV_SPI |
| 194 | bool | 199 | bool |
| 195 | help | 200 | help |