summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-11-27 12:09:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:52:56 +0100
commit8715b29db2787f7c70f662b7b4d5b01017c61948 (patch)
tree2f1254879673cde83fe08f11de2a6a0f6c291568 /drivers/pcmcia
parentARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions (diff)
downloadlinux-8715b29db2787f7c70f662b7b4d5b01017c61948.tar.xz
linux-8715b29db2787f7c70f662b7b4d5b01017c61948.zip
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.c3
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 @@
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
-#include <mach/h3600.h>
-#include <mach/h3600_gpio.h>
+#include <mach/h3xxx.h>
#include "sa1100_generic.h"