powerpc: Merge various powermac-related header files.

Except for smu.h, which moved from asm-ppc64 to asm-powerpc, all
of these moved from asm-ppc to asm-powerpc.  In each case the
asm-ppc64 version (if there was one) was just a single line
including the asm-ppc version.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/include/asm-ppc/dbdma.h b/include/asm-powerpc/dbdma.h
similarity index 100%
rename from include/asm-ppc/dbdma.h
rename to include/asm-powerpc/dbdma.h

diff --git a/include/asm-ppc/heathrow.h b/include/asm-powerpc/heathrow.h
similarity index 100%
rename from include/asm-ppc/heathrow.h
rename to include/asm-powerpc/heathrow.h

diff --git a/include/asm-ppc/keylargo.h b/include/asm-powerpc/keylargo.h
similarity index 100%
rename from include/asm-ppc/keylargo.h
rename to include/asm-powerpc/keylargo.h

diff --git a/include/asm-ppc/macio.h b/include/asm-powerpc/macio.h
similarity index 100%
rename from include/asm-ppc/macio.h
rename to include/asm-powerpc/macio.h

diff --git a/include/asm-ppc/mediabay.h b/include/asm-powerpc/mediabay.h
similarity index 100%
rename from include/asm-ppc/mediabay.h
rename to include/asm-powerpc/mediabay.h

diff --git a/include/asm-ppc/ohare.h b/include/asm-powerpc/ohare.h
similarity index 100%
rename from include/asm-ppc/ohare.h
rename to include/asm-powerpc/ohare.h

diff --git a/include/asm-ppc/pmac_feature.h b/include/asm-powerpc/pmac_feature.h
similarity index 100%
rename from include/asm-ppc/pmac_feature.h
rename to include/asm-powerpc/pmac_feature.h

diff --git a/include/asm-ppc/pmac_low_i2c.h b/include/asm-powerpc/pmac_low_i2c.h
similarity index 100%
rename from include/asm-ppc/pmac_low_i2c.h
rename to include/asm-powerpc/pmac_low_i2c.h

diff --git a/include/asm-ppc64/smu.h b/include/asm-powerpc/smu.h
similarity index 100%
rename from include/asm-ppc64/smu.h
rename to include/asm-powerpc/smu.h

diff --git a/include/asm-ppc/uninorth.h b/include/asm-powerpc/uninorth.h
similarity index 100%
rename from include/asm-ppc/uninorth.h
rename to include/asm-powerpc/uninorth.h

diff --git a/include/asm-ppc64/dbdma.h b/include/asm-ppc64/dbdma.h
deleted file mode 100644 (file)
index f2d5d5d..0000000
--- a/include/asm-ppc64/dbdma.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/dbdma.h>
-

diff --git a/include/asm-ppc64/keylargo.h b/include/asm-ppc64/keylargo.h
deleted file mode 100644 (file)
index 4d78e3d..0000000
--- a/include/asm-ppc64/keylargo.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/keylargo.h>
-

diff --git a/include/asm-ppc64/macio.h b/include/asm-ppc64/macio.h
deleted file mode 100644 (file)
index a3028b3..0000000
--- a/include/asm-ppc64/macio.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/macio.h>
-

diff --git a/include/asm-ppc64/pmac_feature.h b/include/asm-ppc64/pmac_feature.h
deleted file mode 100644 (file)
index e07e36c..0000000
--- a/include/asm-ppc64/pmac_feature.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/pmac_feature.h>
-

diff --git a/include/asm-ppc64/pmac_low_i2c.h b/include/asm-ppc64/pmac_low_i2c.h
deleted file mode 100644 (file)
index 7bcfc72..0000000
--- a/include/asm-ppc64/pmac_low_i2c.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/pmac_low_i2c.h>
-

diff --git a/include/asm-ppc64/uninorth.h b/include/asm-ppc64/uninorth.h
deleted file mode 100644 (file)
index 7ad7059..0000000
--- a/include/asm-ppc64/uninorth.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/uninorth.h>
-