ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
authorDmitry Artamonow <mad_soft@inbox.ru>
Fri, 27 Nov 2009 11:09:25 +0000 (12:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 16:52:56 +0000 (16:52 +0000)
commit8715b29db2787f7c70f662b7b4d5b01017c61948
tree2f1254879673cde83fe08f11de2a6a0f6c291568
parent4c88a5c20f59c07afc4536c219a9c1f196cec36d
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>
arch/arm/mach-sa1100/h3600.c
arch/arm/mach-sa1100/include/mach/h3600.h [deleted file]
arch/arm/mach-sa1100/include/mach/h3xxx.h [moved from arch/arm/mach-sa1100/include/mach/h3600_gpio.h with 86% similarity]
drivers/pcmcia/sa1100_h3600.c