[PATCH 08/13] pcmcia: replace linux/gpio.h inclusions
Arnd Bergmann <[email protected]>
| Newsgroups | org.kernel.vger.linux-samsung-soc,dev.linux.lists.linux-sunxi,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-phy,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-gpio,org.kernel.vger.linux-input,org.kernel.vger.linux-kernel,org.kernel.vger.linux-m68k,org.kernel.vger.linux-media,org.kernel.vger.linux-mips,org.kernel.vger.linux-sh,org.kernel.vger.linux-sound,org.kernel.vger.netdev |
|---|---|
| Message-ID | <[email protected]> |
From: Arnd Bergmann <[email protected]> The pcmcia drivers all use the legacy interfaces, so convert to include linux/gpio/legacy.h instead. Signed-off-by: Arnd Bergmann <[email protected]> --- drivers/pcmcia/bcm63xx_pcmcia.c | 2 +- drivers/pcmcia/db1xxx_ss.c | 2 +- drivers/pcmcia/sa1100_h3600.c | 2 +- drivers/pcmcia/soc_common.c | 2 +- drivers/pcmcia/xxs1500_ss.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index 724fd6ee0fd0..1612b5d76975 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -14,7 +14,7 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/pci.h> -#include <linux/gpio.h> +#include <linux/gpio/legacy.h> #include <bcm63xx_regs.h> #include <bcm63xx_io.h> diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 7b896d7dbc9f..410d24762f13 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c @@ -23,7 +23,7 @@ */ #include <linux/delay.h> -#include <linux/gpio.h> +#include <linux/gpio/legacy.h> #include <linux/interrupt.h> #include <linux/pm.h> #include <linux/module.h> diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index 10cb99c20a7f..6c52d90795eb 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c @@ -11,7 +11,7 @@ #include <linux/interrupt.h> #include <linux/init.h> #include <linux/delay.h> -#include <linux/gpio.h> +#include <linux/gpio/legacy.h> #include <mach/hardware.h> #include <asm/irq.h> diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 87aa3f667117..23585e3968e9 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -32,8 +32,8 @@ #include <linux/cpufreq.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> +#include <linux/gpio/legacy.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h> diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index 8a8aae1843b5..ba1bd0f9d9f8 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c @@ -7,7 +7,7 @@ */ #include <linux/delay.h> -#include <linux/gpio.h> +#include <linux/gpio/legacy.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/ioport.h> -- 2.39.5