diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/asm-ppc/serial.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-ppc/serial.h')
| -rw-r--r-- | include/asm-ppc/serial.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h index 6d47438be58c..485a924e4d06 100644 --- a/include/asm-ppc/serial.h +++ b/include/asm-ppc/serial.h | |||
| @@ -18,8 +18,6 @@ | |||
| 18 | #include <platforms/powerpmc250.h> | 18 | #include <platforms/powerpmc250.h> |
| 19 | #elif defined(CONFIG_LOPEC) | 19 | #elif defined(CONFIG_LOPEC) |
| 20 | #include <platforms/lopec.h> | 20 | #include <platforms/lopec.h> |
| 21 | #elif defined(CONFIG_MCPN765) | ||
| 22 | #include <platforms/mcpn765.h> | ||
| 23 | #elif defined(CONFIG_MVME5100) | 21 | #elif defined(CONFIG_MVME5100) |
| 24 | #include <platforms/mvme5100.h> | 22 | #include <platforms/mvme5100.h> |
| 25 | #elif defined(CONFIG_PAL4) | 23 | #elif defined(CONFIG_PAL4) |