diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-12-07 15:23:45 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-12-07 15:23:45 +0100 |
| commit | eb485c7d9e6d71e4f621edb83573cb85c1d22975 (patch) | |
| tree | 5a1393c82f2bfecc14fb856a22974a2dd2985c77 /arch | |
| parent | gpio: merrifield: Implement gpio_get_direction callback (diff) | |
| parent | gpio: pl061: delete platform data handling (diff) | |
| download | linux-eb485c7d9e6d71e4f621edb83573cb85c1d22975.tar.xz linux-eb485c7d9e6d71e4f621edb83573cb85c1d22975.zip | |
Merge branch 'pl061' into devel
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index ed9a01484030..a109f6482413 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -21,7 +21,6 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> #include <linux/amba/mmci.h> -#include <linux/amba/pl061.h> #include <linux/io.h> #include <linux/platform_data/clk-integrator.h> #include <linux/slab.h> |