summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelly Daly <kelly@au.ibm.com>2005-11-02 07:07:51 +0300
committerKelly Daly <kelly@au.ibm.com>2005-11-02 07:07:51 +0300
commit6cbbdabb0163471590bf0a57766e3ea5d920d26e (patch)
treee51d1931b5cceb70f3505570213bb62608728bc8
parentc43a55ff4e55d1bcfdf0cadfe2f00281e156c436 (diff)
downloadlinux-6cbbdabb0163471590bf0a57766e3ea5d920d26e.tar.xz
merge filename and modify references to iseries/iseries_io.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
-rw-r--r--include/asm-powerpc/iseries/iseries_io.h (renamed from include/asm-ppc64/iSeries/iSeries_io.h)0
-rw-r--r--include/asm-ppc64/io.h2
2 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc64/iSeries/iSeries_io.h b/include/asm-powerpc/iseries/iseries_io.h
index 9f79413342b3..9f79413342b3 100644
--- a/include/asm-ppc64/iSeries/iSeries_io.h
+++ b/include/asm-powerpc/iseries/iseries_io.h
diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h
index bd7c9532d77b..77fc07c3c6bd 100644
--- a/include/asm-ppc64/io.h
+++ b/include/asm-ppc64/io.h
@@ -13,7 +13,7 @@
#include <asm/page.h>
#include <asm/byteorder.h>
#ifdef CONFIG_PPC_ISERIES
-#include <asm/iSeries/iSeries_io.h>
+#include <asm/iseries/iseries_io.h>
#endif
#include <asm/synch.h>
#include <asm/delay.h>