diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-22 13:47:49 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-22 13:47:49 +0100 |
| commit | 3cf42efc3479806bc5db5176fd440d23bb73854b (patch) | |
| tree | a6a0a57cbe89a4f779625f8ce6e8ebc7ea49f2c0 /drivers/pcmcia/bfin_cf_pcmcia.c | |
| parent | 6ec9249a83b00a754af435ed57ad02ffed105d93 (diff) | |
| parent | 9d8cc89c316d9cc8ff269068ac8f904f13b5a70d (diff) | |
| download | kernel_replicant_linux-3cf42efc3479806bc5db5176fd440d23bb73854b.tar.gz kernel_replicant_linux-3cf42efc3479806bc5db5176fd440d23bb73854b.tar.bz2 kernel_replicant_linux-3cf42efc3479806bc5db5176fd440d23bb73854b.zip | |
Merge branch 'devel' into for-next
Diffstat (limited to 'drivers/pcmcia/bfin_cf_pcmcia.c')
| -rw-r--r-- | drivers/pcmcia/bfin_cf_pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index bba1dcbb8075..8b0923fd76c6 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c @@ -36,10 +36,10 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/io.h> +#include <linux/gpio.h> #include <pcmcia/ss.h> #include <pcmcia/cisreg.h> -#include <asm/gpio.h> #define SZ_1K 0x00000400 #define SZ_8K 0x00002000 |