diff --git a/[refs] b/[refs] index 2c018b39147b..6e0d7ed06121 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 302c0ef7317ddd49c0ae82004cfe308b5a2b6ab3 +refs/heads/master: f7538ac95200fd122fd84c8f85ff1130ee7645b5 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index d7c0984d4a86..0d8fac3b0371 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -354,7 +354,6 @@ config ARCH_SA1100 config ARCH_S3C2410 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" select GENERIC_GPIO - select GENERIC_TIME help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or