diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /include/asm-ppc/serial.h | |
| parent | 600511e86babe3727264a0883a3a264f6fb6caf5 (diff) | |
| parent | f3cab8a0b1a772dc8b055b7affa567a366627c9e (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc/serial.h')
| -rw-r--r-- | include/asm-ppc/serial.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h index 485a924e4d06..b74af5461564 100644 --- a/include/asm-ppc/serial.h +++ b/include/asm-ppc/serial.h | |||
| @@ -41,15 +41,10 @@ | |||
| 41 | #else | 41 | #else |
| 42 | 42 | ||
| 43 | /* | 43 | /* |
| 44 | * XXX Assume for now it has PC-style ISA serial ports. | 44 | * XXX Assume it has PC-style ISA serial ports - true for PReP at least. |
| 45 | * This is true for PReP and CHRP at least. | ||
| 46 | */ | 45 | */ |
| 47 | #include <asm/pc_serial.h> | 46 | #include <asm/pc_serial.h> |
| 48 | 47 | ||
| 49 | #if defined(CONFIG_MAC_SERIAL) | ||
| 50 | #define SERIAL_DEV_OFFSET ((_machine == _MACH_prep || _machine == _MACH_chrp) ? 0 : 2) | ||
| 51 | #endif | ||
| 52 | |||
| 53 | #endif /* !CONFIG_GEMINI and others */ | 48 | #endif /* !CONFIG_GEMINI and others */ |
| 54 | #endif /* __ASM_SERIAL_H__ */ | 49 | #endif /* __ASM_SERIAL_H__ */ |
| 55 | #endif /* __KERNEL__ */ | 50 | #endif /* __KERNEL__ */ |