summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2004-08-23 18:31:24 -0700
committerTom Rini <trini@kernel.crashing.org>2004-08-23 18:31:24 -0700
commit603b71dcbbdb7e2fba23de0f2ac7cbed7481ef29 (patch)
treea484d5fd938bdf398b5b3627c3b9bb031527eac4 /include
parent6e7d5ca63e1989627441058491aad34a28168918 (diff)
parentdc0eb57c2b4c3bca3df024321401f06a493e76d6 (diff)
Merge kernel.crashing.org:/home/trini/work/kernel/devel/linux-2.6-reorg
into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/serial.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h
index 310206e28686..affec978627e 100644
--- a/include/asm-ppc/serial.h
+++ b/include/asm-ppc/serial.h
@@ -13,17 +13,17 @@
#elif defined(CONFIG_GEMINI)
#include <platforms/gemini_serial.h>
#elif defined(CONFIG_POWERPMC250)
-#include <platforms/powerpmc250_serial.h>
+#include <platforms/powerpmc250.h>
#elif defined(CONFIG_LOPEC)
-#include <platforms/lopec_serial.h>
+#include <platforms/lopec.h>
#elif defined(CONFIG_MCPN765)
-#include <platforms/mcpn765_serial.h>
+#include <platforms/mcpn765.h>
#elif defined(CONFIG_MVME5100)
-#include <platforms/mvme5100_serial.h>
+#include <platforms/mvme5100.h>
#elif defined(CONFIG_PRPMC750)
-#include <platforms/prpmc750_serial.h>
+#include <platforms/prpmc750.h>
#elif defined(CONFIG_PRPMC800)
-#include <platforms/prpmc800_serial.h>
+#include <platforms/prpmc800.h>
#elif defined(CONFIG_SANDPOINT)
#include <platforms/sandpoint.h>
#elif defined(CONFIG_SPRUCE)