diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/asm-ppc/reg.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'include/asm-ppc/reg.h')
| -rw-r--r-- | include/asm-ppc/reg.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-ppc/reg.h b/include/asm-ppc/reg.h index 88b4222154d4..73c33e3ef9c6 100644 --- a/include/asm-ppc/reg.h +++ b/include/asm-ppc/reg.h | |||
| @@ -366,12 +366,6 @@ | |||
| 366 | #define PVR_STB03XXX 0x40310000 | 366 | #define PVR_STB03XXX 0x40310000 |
| 367 | #define PVR_NP405H 0x41410000 | 367 | #define PVR_NP405H 0x41410000 |
| 368 | #define PVR_NP405L 0x41610000 | 368 | #define PVR_NP405L 0x41610000 |
| 369 | #define PVR_440GP_RB 0x40120440 | ||
| 370 | #define PVR_440GP_RC1 0x40120481 | ||
| 371 | #define PVR_440GP_RC2 0x40200481 | ||
| 372 | #define PVR_440GX_RA 0x51b21850 | ||
| 373 | #define PVR_440GX_RB 0x51b21851 | ||
| 374 | #define PVR_440GX_RC 0x51b21892 | ||
| 375 | #define PVR_601 0x00010000 | 369 | #define PVR_601 0x00010000 |
| 376 | #define PVR_602 0x00050000 | 370 | #define PVR_602 0x00050000 |
| 377 | #define PVR_603 0x00030000 | 371 | #define PVR_603 0x00030000 |