OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

including fix for GENERIC_GPIO based on previous pull-request for timer-samsung 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRYvj+AAoJEA0Cl+kVi2xqyK8P/09bx/H2Ud/1WL3/eGV3qfCd
 MuSGk/nIHCZ75MBQnIwtKoJ44cyqopJh8xC5wptORMKP6k9MDh5gXYPiClmAQBOT
 82SH0zZorPtANMHivTvxWr7mBs0/fCIXjR6Sg43vMRzM5Nz9l6RFjzZr7RiAm7lr
 G1gjfG3LDAoaiomVG6Okof7og4wfJQe9ROdRe2oCRepCCUJ9l5tYptYwA/ulo6ge
 3H/+OcxkOQYu7X+zKZWjnZTFLzBkaivnfUxQo969yowrAtdTkrWQdDEih+hsxXl+
 KPEhwhKJnS7Kl6ZRSK2/Y8baNIZrFHsc7r4ZdZ7IVVhAoPCQsO0C0k8w5hD1mXwL
 7kEtw/0uioTb5uE03GUdCg7Ibq+kVhAdRLfBDFx7rHb9Ef7WJ/OZXj2zYv3yHFrG
 PQA58jJ75uBym/104QdlB5D68bn8D2+HqqYu1glnd+SnjabtNtNXiONRo6HWEBfM
 V2mGlDBUps91zcuiUKlNkO1v0ZK63VmxDj+JnKvKbI3gXCMeZg9aGYSorGSlq6vv
 t8Qws2cQKMdkJzYQNqOXOYl32T3tvRjWbu0g874w6lXGBxt7sQgD8maljdFPH8/s
 YC/3gk7E6ugOiQ1dqBQEjR29cLwYQ6SzF9t3N8kvLQog81VS3uVDxt2sIwaqariS
 wHPrZPKsma6XE5jldGAA
 =L8iS
 -----END PGP SIGNATURE-----

Merge tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

From Kukjin Kim <kgene.kim@samsung.com>:

including fix for GENERIC_GPIO based on previous pull-request for timer-samsung

* tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: change GENERIC_GPIO to ARCH_REQUIRE_GPIOLIB

Signed-off-by: Arnd Bergmann <arnd@anrdb.de>
This commit is contained in:
Arnd Bergmann 2013-04-09 22:47:38 +02:00
parent 0b8467ee39 536504309c
commit 26b2da5ae5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Kconfig
View File

@ -770,10 +770,10 @@ config ARCH_SA1100
config ARCH_S3C24XX
bool "Samsung S3C24XX SoCs"
select ARCH_HAS_CPUFREQ
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
select GENERIC_GPIO
select HAVE_CLK
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
@ -829,11 +829,11 @@ config ARCH_S5P64X0
config ARCH_S5PC100
bool "Samsung S5PC100"
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select CPU_V7
select GENERIC_CLOCKEVENTS
select GENERIC_GPIO
select HAVE_CLK
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG