diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-20 14:53:39 +0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 14:53:39 +0400 |
commit | ff065ddd96c233d27322de493fa023357939c888 (patch) | |
tree | b60d8a362dea386d1cec91422fd18f92da244ffd | |
parent | 0dd194d02d2584c34e06ddd26c7a7896a5fa1974 (diff) | |
download | linux-ff065ddd96c233d27322de493fa023357939c888.tar.xz |
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>
-rw-r--r-- | include/asm-powerpc/dbdma.h (renamed from include/asm-ppc/dbdma.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/heathrow.h (renamed from include/asm-ppc/heathrow.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/keylargo.h (renamed from include/asm-ppc/keylargo.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/macio.h (renamed from include/asm-ppc/macio.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/mediabay.h (renamed from include/asm-ppc/mediabay.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/ohare.h (renamed from include/asm-ppc/ohare.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/pmac_feature.h (renamed from include/asm-ppc/pmac_feature.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/pmac_low_i2c.h (renamed from include/asm-ppc/pmac_low_i2c.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/smu.h (renamed from include/asm-ppc64/smu.h) | 0 | ||||
-rw-r--r-- | include/asm-powerpc/uninorth.h (renamed from include/asm-ppc/uninorth.h) | 0 | ||||
-rw-r--r-- | include/asm-ppc64/dbdma.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/keylargo.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/macio.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/pmac_feature.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/pmac_low_i2c.h | 2 | ||||
-rw-r--r-- | include/asm-ppc64/uninorth.h | 2 |
16 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-ppc/dbdma.h b/include/asm-powerpc/dbdma.h index 8973565f95d3..8973565f95d3 100644 --- a/include/asm-ppc/dbdma.h +++ b/include/asm-powerpc/dbdma.h diff --git a/include/asm-ppc/heathrow.h b/include/asm-powerpc/heathrow.h index 22ac179856b9..22ac179856b9 100644 --- a/include/asm-ppc/heathrow.h +++ b/include/asm-powerpc/heathrow.h diff --git a/include/asm-ppc/keylargo.h b/include/asm-powerpc/keylargo.h index a669a3f0f5a2..a669a3f0f5a2 100644 --- a/include/asm-ppc/keylargo.h +++ b/include/asm-powerpc/keylargo.h diff --git a/include/asm-ppc/macio.h b/include/asm-powerpc/macio.h index b553dd4b139e..b553dd4b139e 100644 --- a/include/asm-ppc/macio.h +++ b/include/asm-powerpc/macio.h diff --git a/include/asm-ppc/mediabay.h b/include/asm-powerpc/mediabay.h index 9daa3252d7b6..9daa3252d7b6 100644 --- a/include/asm-ppc/mediabay.h +++ b/include/asm-powerpc/mediabay.h diff --git a/include/asm-ppc/ohare.h b/include/asm-powerpc/ohare.h index 023b59772231..023b59772231 100644 --- a/include/asm-ppc/ohare.h +++ b/include/asm-powerpc/ohare.h diff --git a/include/asm-ppc/pmac_feature.h b/include/asm-powerpc/pmac_feature.h index e9683bcff19b..e9683bcff19b 100644 --- a/include/asm-ppc/pmac_feature.h +++ b/include/asm-powerpc/pmac_feature.h diff --git a/include/asm-ppc/pmac_low_i2c.h b/include/asm-powerpc/pmac_low_i2c.h index 809a5963d5e7..809a5963d5e7 100644 --- a/include/asm-ppc/pmac_low_i2c.h +++ b/include/asm-powerpc/pmac_low_i2c.h diff --git a/include/asm-ppc64/smu.h b/include/asm-powerpc/smu.h index dee8eefe47bc..dee8eefe47bc 100644 --- a/include/asm-ppc64/smu.h +++ b/include/asm-powerpc/smu.h diff --git a/include/asm-ppc/uninorth.h b/include/asm-powerpc/uninorth.h index f737732c3861..f737732c3861 100644 --- a/include/asm-ppc/uninorth.h +++ b/include/asm-powerpc/uninorth.h diff --git a/include/asm-ppc64/dbdma.h b/include/asm-ppc64/dbdma.h deleted file mode 100644 index f2d5d5dc3377..000000000000 --- 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 index 4d78e3d0314c..000000000000 --- 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 index a3028b364f70..000000000000 --- 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 index e07e36c4cbb2..000000000000 --- 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 index 7bcfc72c5c8a..000000000000 --- 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 index 7ad7059f2c80..000000000000 --- a/include/asm-ppc64/uninorth.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <asm-ppc/uninorth.h> - |