diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 20:10:12 (GMT) |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 20:10:12 (GMT) |
commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-sa1100/gpio.c | |
parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
download | linux-fsl-qoriq-af7a535688a758d15f06a98833e6a143b29af9de.tar.xz |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-sa1100/gpio.c')
-rw-r--r-- | arch/arm/mach-sa1100/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/gpio.c b/arch/arm/mach-sa1100/gpio.c index 372f1f4..0d3829a 100644 --- a/arch/arm/mach-sa1100/gpio.c +++ b/arch/arm/mach-sa1100/gpio.c @@ -12,7 +12,7 @@ #include <linux/module.h> #include <asm/gpio.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include "generic.h" static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) |