Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04830fcc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 571503e1 1486a740

arch/arm/mach-exynos4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 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

arch/arm/mach-nomadik/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config MACH_NOMADIK_8815NHK 
	bool "ST 8815 Nomadik Hardware Kit (evaluation board)"

	select NOMADIK_8815

	select HAS_MTU

	select NOMADIK_GPIO



endmenu

arch/arm/mach-s5pc100/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj- := 


# Core support for S5PC100 system



obj-$(CONFIG_CPU_S5PC100)	+= cpu.o init.o clock.o gpiolib.o

obj-$(CONFIG_CPU_S5PC100)	+= cpu.o init.o clock.o

obj-$(CONFIG_CPU_S5PC100)	+= setup-i2c0.o

obj-$(CONFIG_CPU_S5PC100)	+= dma.o

arch/arm/mach-s5pv210/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj- := 


# Core support for S5PV210 system



obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o gpiolib.o

obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o

obj-$(CONFIG_CPU_S5PV210)	+= setup-i2c0.o

obj-$(CONFIG_S5PV210_PM)	+= pm.o sleep.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o

arch/arm/mach-u300/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel, U300 machine.

#



obj-y		:= core.o clock.o timer.o gpio.o padmux.o

obj-y		:= core.o clock.o timer.o padmux.o

obj-m		:=

obj-n		:=

obj-		:=