From e5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 20 May 2011 11:53:37 +0200 Subject: [PATCH] GPIO: OMAP: move to drivers/gpio Move OMAP GPIO driver to drivers/gpio. Builds whenever CONFIG_ARCH_OMAP=y. Signed-off-by: Kevin Hilman --- arch/arm/plat-omap/Makefile | 2 +- drivers/gpio/Makefile | 1 + arch/arm/plat-omap/gpio.c => drivers/gpio/gpio-omap.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/plat-omap/gpio.c => drivers/gpio/gpio-omap.c (99%) diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index a4a12859fdd5..f0233e6abcdf 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 becef5954356..a6f1d42f2653 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 similarity index 99% rename from arch/arm/plat-omap/gpio.c rename to drivers/gpio/gpio-omap.c index 44acabd5f530..6c51191da567 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 -- 2.34.1