diff options
| author | Dmitry Artamonow <mad_soft@inbox.ru> | 2009-11-27 06:09:25 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 11:52:56 -0500 |
| commit | 8715b29db2787f7c70f662b7b4d5b01017c61948 (patch) | |
| tree | 2f1254879673cde83fe08f11de2a6a0f6c291568 /arch/arm/mach-sa1100/h3600.c | |
| parent | 4c88a5c20f59c07afc4536c219a9c1f196cec36d (diff) | |
ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
Combine both headers into one, rename to h3xxx.h and change all
users accordingly.
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
| -rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 3d52190a2690..dd39f90db0db 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
| @@ -44,8 +44,7 @@ | |||
| 44 | #include <asm/mach/map.h> | 44 | #include <asm/mach/map.h> |
| 45 | #include <asm/mach/serial_sa1100.h> | 45 | #include <asm/mach/serial_sa1100.h> |
| 46 | 46 | ||
| 47 | #include <mach/h3600.h> | 47 | #include <mach/h3xxx.h> |
| 48 | #include <mach/h3600_gpio.h> | ||
| 49 | 48 | ||
| 50 | #include "generic.h" | 49 | #include "generic.h" |
| 51 | 50 | ||