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 /drivers/pcmcia | |
| 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 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/sa1100_h3600.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index fd7af123053c..8706d42c9418 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c | |||
| @@ -15,8 +15,7 @@ | |||
| 15 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
| 16 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
| 17 | #include <asm/mach-types.h> | 17 | #include <asm/mach-types.h> |
| 18 | #include <mach/h3600.h> | 18 | #include <mach/h3xxx.h> |
| 19 | #include <mach/h3600_gpio.h> | ||
| 20 | 19 | ||
| 21 | #include "sa1100_generic.h" | 20 | #include "sa1100_generic.h" |
| 22 | 21 | ||