From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Sep 2011 00:25:28 +0000 (+1000)
Subject: Merge remote-tracking branch 's5p/for-next'
X-Git-Tag: next-20110923~98
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39eacb1f426f0de7fa2be2065a736b36bb0fb253;p=karo-tx-linux.git

Merge remote-tracking branch 's5p/for-next'

Conflicts:
	drivers/gpio/Makefile
---

39eacb1f426f0de7fa2be2065a736b36bb0fb253
diff --cc drivers/gpio/Makefile
index 84bc7389e367,62db458c850d..758817d0cacd
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_GPIO_ADP5588)	+= gpio-adp5
  obj-$(CONFIG_GPIO_BT8XX)	+= gpio-bt8xx.o
  obj-$(CONFIG_GPIO_CS5535)	+= gpio-cs5535.o
  obj-$(CONFIG_GPIO_DA9052)	+= gpio-da9052.o
 +obj-$(CONFIG_ARCH_DAVINCI)	+= gpio-davinci.o
  obj-$(CONFIG_GPIO_EP93XX)	+= gpio-ep93xx.o
- obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o
  obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o
  obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o
 +obj-$(CONFIG_MACH_KS8695)	+= gpio-ks8695.o
  obj-$(CONFIG_GPIO_LANGWELL)	+= gpio-langwell.o
 +obj-$(CONFIG_ARCH_LPC32XX)	+= gpio-lpc32xx.o
  obj-$(CONFIG_GPIO_MAX730X)	+= gpio-max730x.o
  obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
  obj-$(CONFIG_GPIO_MAX7301)	+= gpio-max7301.o
@@@ -41,11 -37,7 +40,8 @@@ obj-$(CONFIG_GPIO_PCF857X)	+= gpio-pcf8
  obj-$(CONFIG_GPIO_PCH)		+= gpio-pch.o
  obj-$(CONFIG_GPIO_PL061)	+= gpio-pl061.o
  obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
- 
- obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o
- obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o
- obj-$(CONFIG_GPIO_S5PV210)	+= gpio-s5pv210.o
 +obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o
+ obj-$(CONFIG_PLAT_SAMSUNG)	+= gpio-samsung.o
  obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
  obj-$(CONFIG_GPIO_STMPE)	+= gpio-stmpe.o
  obj-$(CONFIG_GPIO_SX150X)	+= gpio-sx150x.o