--- Yoichi Yuasa <yuasa@xxxxxxxxxxxxxx> wrote: > Hi Pete, > > On Thu, 14 Jul 2005 18:48:00 +0100 > ppopov@xxxxxxxxxxxxxx wrote: > > > > > Log message: > > Philips PNX8550 support: MIPS32-like core with 2 > Trimedias on it. > > I think the following include path is better. Thanks :)! I thought I cleaned up everything ;) Pete > > Yoichi > > Signed-off-by: Yoichi Yuasa <yuasa@xxxxxxxxxxxxxx> > > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/gdb_hook.c > a/arch/mips/philips/pnx8550/common/gdb_hook.c > --- > a-orig/arch/mips/philips/pnx8550/common/gdb_hook.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/gdb_hook.c > 2005-07-15 23:44:03.361056952 +0900 > @@ -31,7 +31,7 @@ > #include <asm/serial.h> > #include <asm/io.h> > > -#include <asm/mach-pnx8550/uart.h> > +#include <uart.h> > > static struct serial_state rs_table[RS_TABLE_SIZE] > = { > SERIAL_PORT_DFNS /* Defined in serial.h */ > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/int.c > a/arch/mips/philips/pnx8550/common/int.c > --- a-orig/arch/mips/philips/pnx8550/common/int.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/int.c > 2005-07-15 23:44:32.008701848 +0900 > @@ -35,8 +35,8 @@ > > #include <asm/io.h> > #include <asm/gdb-stub.h> > -#include <asm/mach-pnx8550/int.h> > -#include <asm/mach-pnx8550/uart.h> > +#include <int.h> > +#include <uart.h> > > extern asmlinkage void cp0_irqdispatch(void); > > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/pci.c > a/arch/mips/philips/pnx8550/common/pci.c > --- a-orig/arch/mips/philips/pnx8550/common/pci.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/pci.c > 2005-07-15 23:44:52.444595120 +0900 > @@ -24,9 +24,9 @@ > #include <linux/kernel.h> > #include <linux/init.h> > > -#include <asm/mach-pnx8550/pci.h> > -#include <asm/mach-pnx8550/glb.h> > -#include <asm/mach-pnx8550/nand.h> > +#include <pci.h> > +#include <glb.h> > +#include <nand.h> > > static struct resource pci_io_resource = { > "pci IO space", > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/platform.c > a/arch/mips/philips/pnx8550/common/platform.c > --- > a-orig/arch/mips/philips/pnx8550/common/platform.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/platform.c > 2005-07-15 23:45:16.826888448 +0900 > @@ -17,9 +17,9 @@ > #include <linux/init.h> > #include <linux/resource.h> > > -#include <asm/mach-pnx8550/int.h> > -#include <asm/mach-pnx8550/usb.h> > -#include <asm/mach-pnx8550/uart.h> > +#include <int.h> > +#include <usb.h> > +#include <uart.h> > > static struct resource pnx8550_usb_ohci_resources[] > = { > [0] = { > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/proc.c > a/arch/mips/philips/pnx8550/common/proc.c > --- a-orig/arch/mips/philips/pnx8550/common/proc.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/proc.c > 2005-07-15 23:45:33.076418144 +0900 > @@ -24,8 +24,8 @@ > > #include <asm/io.h> > #include <asm/gdb-stub.h> > -#include <asm/mach-pnx8550/int.h> > -#include <asm/mach-pnx8550/uart.h> > +#include <int.h> > +#include <uart.h> > > > static int pnx8550_timers_read (char* page, char** > start, off_t offset, int count, int* eof, void* > data) > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/prom.c > a/arch/mips/philips/pnx8550/common/prom.c > --- a-orig/arch/mips/philips/pnx8550/common/prom.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/prom.c > 2005-07-15 23:45:44.729646584 +0900 > @@ -15,7 +15,7 @@ > #include <linux/string.h> > > #include <asm/bootinfo.h> > -#include <asm/mach-pnx8550/uart.h> > +#include <uart.h> > > /* #define DEBUG_CMDLINE */ > > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/reset.c > a/arch/mips/philips/pnx8550/common/reset.c > --- a-orig/arch/mips/philips/pnx8550/common/reset.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/reset.c > 2005-07-15 23:45:55.884950720 +0900 > @@ -23,7 +23,7 @@ > #include <linux/config.h> > #include <linux/slab.h> > #include <asm/reboot.h> > -#include <asm/mach-pnx8550/glb.h> > +#include <glb.h> > > void pnx8550_machine_restart(char *command) > { > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/setup.c > a/arch/mips/philips/pnx8550/common/setup.c > --- a-orig/arch/mips/philips/pnx8550/common/setup.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/setup.c > 2005-07-15 23:43:38.693806944 +0900 > @@ -33,11 +33,11 @@ > #include <asm/pgtable.h> > #include <asm/time.h> > > -#include <asm/mach-pnx8550/glb.h> > -#include <asm/mach-pnx8550/int.h> > -#include <asm/mach-pnx8550/pci.h> > -#include <asm/mach-pnx8550/uart.h> > -#include <asm/mach-pnx8550/nand.h> > +#include <glb.h> > +#include <int.h> > +#include <pci.h> > +#include <uart.h> > +#include <nand.h> > > extern void prom_printf(char *fmt, ...); > > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/common/time.c > a/arch/mips/philips/pnx8550/common/time.c > --- a-orig/arch/mips/philips/pnx8550/common/time.c > 2005-07-15 02:47:58.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/common/time.c > 2005-07-15 23:46:11.606560672 +0900 > @@ -31,8 +31,8 @@ > #include <asm/div64.h> > #include <asm/debug.h> > > -#include <asm/mach-pnx8550/int.h> > -#include <asm/mach-pnx8550/cm.h> > +#include <int.h> > +#include <cm.h> > > extern unsigned int mips_hpt_frequency; > > diff -urN -X dontdiff > a-orig/arch/mips/philips/pnx8550/jbs/board_setup.c > a/arch/mips/philips/pnx8550/jbs/board_setup.c > --- > a-orig/arch/mips/philips/pnx8550/jbs/board_setup.c > 2005-07-15 02:47:59.000000000 +0900 > +++ a/arch/mips/philips/pnx8550/jbs/board_setup.c > 2005-07-15 23:46:28.102052976 +0900 > @@ -39,7 +39,7 @@ > #include <asm/reboot.h> > #include <asm/pgtable.h> > > -#include <asm/mach-pnx8550/glb.h> > === message truncated ===