diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 11:57:36 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:52:40 +0200 |
| commit | 232bdfad970ce35177ca12c5527d1c96f7ce44f1 (patch) | |
| tree | ddbba9df61ad5f2f41f8557cbcb84960a0b22944 | |
| parent | 7cc89cd10c9df8e739421ac746ea5b8ef3aabb22 (diff) | |
gpio: nomadik: Rename AB8500_GPIO by GPIO_AB8500HEADglk3.0-forward-port-completemaster
To be compliant with future gpio framework
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 2 | ||||
| -rw-r--r-- | drivers/gpio/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 2 | ||||
| -rw-r--r-- | drivers/input/misc/Kconfig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index fe640363c05..c8b12f2782f 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -150,7 +150,7 @@ CONFIG_SPI_PL022=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_TC3589X=y -CONFIG_AB8500_GPIO=y +CONFIG_GPIO_AB8500=y CONFIG_POWER_SUPPLY=y CONFIG_AB8500_BM=y CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 778cad16d2b..49675fe7121 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -441,7 +441,7 @@ config GPIO_JANZ_TTL This driver provides support for driving the pins in output mode only. Input mode is not supported. -config AB8500_GPIO +config GPIO_AB8500 bool "ST-Ericsson AB8500 Mixed Signal Circuit gpio functions" depends on AB8500_CORE help diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index b605f8ec6fb..4a08af1a0cb 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -46,5 +46,5 @@ 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 +obj-$(CONFIG_GPIO_AB8500) += ab8500-gpio.o obj-$(CONFIG_GPIO_TPS65910) += tps65910-gpio.o diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 18d250dbc3e..37967aec976 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -24,7 +24,7 @@ config INPUT_88PM860X_ONKEY config INPUT_AB8500_ACCDET bool "AB8500 AV Accessory detection" - depends on AB8500_CORE && AB8500_GPADC && AB8500_GPIO + depends on AB8500_CORE && AB8500_GPADC && GPIO_AB8500 help Say Y here to enable AV accessory detection features for ST-Ericsson's AB8500 Mix-Sig PMIC. |