diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 11:12:12 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 11:12:12 -0400 |
| commit | 158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch) | |
| tree | 2e6d808fef46d70268e547ccfc5926a865e3d2ea /arch/arm/Kconfig | |
| parent | 641e79129a56a4c50be1aed0fa713f440b46a440 (diff) | |
| parent | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (diff) | |
Merge branch 'fixes' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 35c5326311b3..e55bbd32dcac 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -357,7 +357,6 @@ config ARCH_SA1100 | |||
| 357 | config ARCH_S3C2410 | 357 | config ARCH_S3C2410 |
| 358 | bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" | 358 | bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" |
| 359 | select GENERIC_GPIO | 359 | select GENERIC_GPIO |
| 360 | select GENERIC_TIME | ||
| 361 | help | 360 | help |
| 362 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics | 361 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics |
| 363 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or | 362 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or |