summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-05-20 11:53:37 +0200
committerKevin Hilman <khilman@ti.com>2011-05-27 08:43:34 -0700
commite5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1 (patch)
tree0421e5fc4819966c366fd68a6cdfc5f89422c430
parent5ee1a81b84ee8b0bd0b4f8cdbac48b472863c1f2 (diff)
downloadop-kernel-dev-e5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1.zip
op-kernel-dev-e5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1.tar.gz
GPIO: OMAP: move to drivers/gpio
Move OMAP GPIO driver to drivers/gpio. Builds whenever CONFIG_ARCH_OMAP=y. Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r--arch/arm/plat-omap/Makefile2
-rw-r--r--drivers/gpio/Makefile1
-rw-r--r--drivers/gpio/gpio-omap.c (renamed from arch/arm/plat-omap/gpio.c)2
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index a4a1285..f0233e6 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -3,7 +3,7 @@
#
# Common support
-obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
+obj-y := common.o sram.o clock.o devices.o dma.o mux.o \
usb.o fb.o io.o counter_32k.o
obj-m :=
obj-n :=
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index becef59..a6f1d42 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_GPIO_MAX732X) += max732x.o
obj-$(CONFIG_GPIO_MC33880) += mc33880.o
obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
obj-$(CONFIG_GPIO_74X164) += 74x164.o
+obj-$(CONFIG_ARCH_OMAP) += gpio-omap.o
obj-$(CONFIG_GPIO_PCA953X) += pca953x.o
obj-$(CONFIG_GPIO_PCF857X) += pcf857x.o
obj-$(CONFIG_GPIO_PCH) += pch_gpio.o
diff --git a/arch/arm/plat-omap/gpio.c b/drivers/gpio/gpio-omap.c
index 44acabd..6c51191 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1,6 +1,4 @@
/*
- * linux/arch/arm/plat-omap/gpio.c
- *
* Support functions for OMAP GPIO
*
* Copyright (C) 2003-2005 Nokia Corporation
OpenPOWER on IntegriCloud