summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-30 09:07:39 +0200
committerIngo Molnar <mingo@elte.hu>2011-03-30 09:07:43 +0200
commit9f644c4ba86b76159d36747fda7da496f72a1872 (patch)
tree31e025a5f283aff691fb636bf07fd0b445cf07a3 /drivers/gpio/Makefile
parent1b7155f7de119870f0d3fad89f125de2ff6c16be (diff)
parent0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff)
downloadop-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.zip
op-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.tar.gz
Merge commit 'v2.6.39-rc1' into perf/urgent
Merge reason: use the post-merge-window tree. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpio/Makefile')
-rw-r--r--drivers/gpio/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 3351cf8..becef59 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -42,3 +42,4 @@ obj-$(CONFIG_GPIO_JANZ_TTL) += janz-ttl.o
obj-$(CONFIG_GPIO_SX150X) += sx150x.o
obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o
obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o
+obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o
OpenPOWER on IntegriCloud