diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
| commit | 2b235826098bb653982894dfc3f70fd029f6c2e4 (patch) | |
| tree | ec525ddba74f58017a3f145bb68cf94376648c1c /arch/arm/common/locomo.c | |
| parent | b4b52db71529bbe46da914eda772fb574914c94d (diff) | |
| parent | c77054e518d9163578cfcad09826d7b959f95ece (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/common/locomo.c')
| -rw-r--r-- | arch/arm/common/locomo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index a7bd85700152..e8053d16829b 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 28 | 28 | ||
| 29 | #include <asm/hardware.h> | 29 | #include <asm/hardware.h> |
| 30 | #include <asm/mach-types.h> | ||
| 31 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 32 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 33 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |