diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-20 20:53:39 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 20:53:39 +1000 |
commit | ff065ddd96c233d27322de493fa023357939c888 (patch) | |
tree | b60d8a362dea386d1cec91422fd18f92da244ffd /include | |
parent | 0dd194d02d2584c34e06ddd26c7a7896a5fa1974 (diff) | |
download | op-kernel-dev-ff065ddd96c233d27322de493fa023357939c888.zip op-kernel-dev-ff065ddd96c233d27322de493fa023357939c888.tar.gz |
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>
Diffstat (limited to 'include')
-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 8973565..8973565 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 22ac179..22ac179 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 a669a3f..a669a3f 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 b553dd4..b553dd4 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 9daa325..9daa325 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 023b597..023b597 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 e9683bc..e9683bc 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 809a596..809a596 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 dee8eef..dee8eef 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 f737732..f737732 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 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 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 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 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 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 index 7ad7059..0000000 --- a/include/asm-ppc64/uninorth.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <asm-ppc/uninorth.h> - |