From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Apr 2012 03:20:20 +0000 (+1000)
Subject: Merge remote-tracking branch 'gpio/gpio/next'
X-Git-Tag: next-20120417~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8331453521da88f99ca5c32dee3d02019e0ea9f;p=karo-tx-linux.git

Merge remote-tracking branch 'gpio/gpio/next'
---

a8331453521da88f99ca5c32dee3d02019e0ea9f
diff --cc drivers/of/Makefile
index 0040d1858665,aff2c6230390..e027f444d10c
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@@ -4,9 -4,9 +4,8 @@@ obj-$(CONFIG_OF_PROMTREE) += pdt.
  obj-$(CONFIG_OF_ADDRESS)  += address.o
  obj-$(CONFIG_OF_IRQ)    += irq.o
  obj-$(CONFIG_OF_DEVICE) += device.o platform.o
- obj-$(CONFIG_OF_GPIO)   += gpio.o
  obj-$(CONFIG_OF_I2C)	+= of_i2c.o
  obj-$(CONFIG_OF_NET)	+= of_net.o
 -obj-$(CONFIG_OF_SPI)	+= of_spi.o
  obj-$(CONFIG_OF_SELFTEST) += selftest.o
  obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
  obj-$(CONFIG_OF_PCI)	+= of_pci.o