diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-ns9xxx/gpio-ns9360.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
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-ns9xxx/gpio-ns9360.c')
| -rw-r--r-- | arch/arm/mach-ns9xxx/gpio-ns9360.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ns9xxx/gpio-ns9360.c b/arch/arm/mach-ns9xxx/gpio-ns9360.c index cabfb879dda9..377330c1b250 100644 --- a/arch/arm/mach-ns9xxx/gpio-ns9360.c +++ b/arch/arm/mach-ns9xxx/gpio-ns9360.c | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | 16 | ||
| 17 | #include <asm/arch-ns9xxx/regs-bbu.h> | 17 | #include <mach/regs-bbu.h> |
| 18 | #include <asm/arch-ns9xxx/processor-ns9360.h> | 18 | #include <mach/processor-ns9360.h> |
| 19 | 19 | ||
| 20 | #include "gpio-ns9360.h" | 20 | #include "gpio-ns9360.h" |
| 21 | 21 | ||