summaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 11:47:45 -0700
committerOlof Johansson <olof@lixom.net>2013-04-26 11:47:45 -0700
commit340fcb5cb4c91e58a5102beb0b86b9c416b8c956 (patch)
treed0e41752e473069f4ec9a065cd1f060c4e91266b /drivers/gpio
parent37746c9a2dd28d52790dd84267b848c087a63b2e (diff)
parent4923ee444a39c8b75027ed01a7812e940194dbec (diff)
downloadlinux-3.10-340fcb5cb4c91e58a5102beb0b86b9c416b8c956.tar.gz
linux-3.10-340fcb5cb4c91e58a5102beb0b86b9c416b8c956.tar.bz2
linux-3.10-340fcb5cb4c91e58a5102beb0b86b9c416b8c956.zip
Merge branch 'samsung/exynos-multiplatform' into next/drivers
This merges in the revert of multiplatform support for exynos. Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK" to the non-multiplatform EXYNOS config option. * samsung/exynos-multiplatform: Revert "ARM: exynos: enable multiplatform support" Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 7b6f8105d35..a274d7df3c8 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -57,7 +57,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
-obj-$(CONFIG_PLAT_SAMSUNG_SINGLE) += gpio-samsung.o
+obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o
obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
obj-$(CONFIG_GPIO_SODAVILLE) += gpio-sodaville.o