From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2011 17:56:34 +0000 (-0700)
Subject: Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0-rc1~30
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=04830fccdcafa7e0ea913990ae56437253553fef;p=cascardo%2Flinux.git

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
  gpio/pch_gpio: Support new device ML7223
  gpio: make gpio_{request,free}_array gpio array parameter const
  GPIO: OMAP: move to drivers/gpio
  GPIO: OMAP: move register offset defines into <plat/gpio.h>
  gpio: Convert gpio_is_valid to return bool
  gpio: Move the s5pc100 GPIO to drivers/gpio
  gpio: Move the s5pv210 GPIO to drivers/gpio
  gpio: Move the exynos4 GPIO to drivers/gpio
  gpio: Move to Samsung common GPIO library to drivers/gpio
  gpio/nomadik: add function to read GPIO pull down status
  gpio/nomadik: show all pins in debug
  gpio: move Nomadik GPIO driver to drivers/gpio
  gpio: move U300 GPIO driver to drivers/gpio
  langwell_gpio: add runtime pm support
  gpio/pca953x: Add support for pca9574 and pca9575 devices
  gpio/cs5535: Show explicit dependency between gpio_cs5535 and mfd_cs5535
---

04830fccdcafa7e0ea913990ae56437253553fef
diff --cc arch/arm/mach-exynos4/Makefile
index 683fc387c8af,97837e75afa3..a9bb94fabaa7
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@@ -13,10 -13,9 +13,10 @@@ obj-				:
  # Core support for EXYNOS4 system
  
  obj-$(CONFIG_CPU_EXYNOS4210)	+= cpu.o init.o clock.o irq-combiner.o
- obj-$(CONFIG_CPU_EXYNOS4210)	+= setup-i2c0.o gpiolib.o irq-eint.o dma.o
+ obj-$(CONFIG_CPU_EXYNOS4210)	+= setup-i2c0.o irq-eint.o dma.o
  obj-$(CONFIG_PM)		+= pm.o sleep.o
  obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
 +obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  
  obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o