diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 01:24:25 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 01:24:25 +0100 |
| commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
| tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/include | |
| parent | powerpc/pmac: Fix SMP kernels on pre-core99 UP machines (diff) | |
| parent | powerpc/47x: Add support for the new IBM currituck platform (diff) | |
| download | linux-1e7342e7789fa2ca9202701467428726cbcfd649.tar.xz linux-1e7342e7789fa2ca9202701467428726cbcfd649.zip | |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 559da199edb5..7fdc2c0b7fa0 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -951,6 +951,7 @@ #define PVR_403GCX 0x00201400 #define PVR_405GP 0x40110000 #define PVR_476 0x11a52000 +#define PVR_476FPE 0x7ff50000 #define PVR_STB03XXX 0x40310000 #define PVR_NP405H 0x41410000 #define PVR_NP405L 0x41610000 |