fix compile error
SVN-Revision: 5051
This commit is contained in:
parent
3791d54399
commit
851f1d7713
1 changed files with 71 additions and 70 deletions
|
@ -1,6 +1,6 @@
|
||||||
diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
|
diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
|
||||||
--- linux.old/arch/mips/Kconfig 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/arch/mips/Kconfig 2006-06-18 03:49:35.000000000 +0200
|
||||||
+++ linux.dev/arch/mips/Kconfig 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/Kconfig 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -742,6 +742,19 @@
|
@@ -742,6 +742,19 @@
|
||||||
select SYS_SUPPORTS_BIG_ENDIAN
|
select SYS_SUPPORTS_BIG_ENDIAN
|
||||||
select TOSHIBA_BOARDS
|
select TOSHIBA_BOARDS
|
||||||
|
@ -31,8 +31,8 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
|
||||||
default "5"
|
default "5"
|
||||||
|
|
||||||
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
|
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
|
||||||
--- linux.old/arch/mips/Makefile 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/arch/mips/Makefile 2006-10-11 21:55:59.000000000 +0200
|
||||||
+++ linux.dev/arch/mips/Makefile 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/Makefile 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -580,6 +580,13 @@
|
@@ -580,6 +580,13 @@
|
||||||
load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
|
load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
|
||||||
|
|
||||||
|
@ -48,8 +48,8 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
|
||||||
# Toshiba RBTX4937 board
|
# Toshiba RBTX4937 board
|
||||||
#
|
#
|
||||||
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
||||||
--- linux.old/arch/mips/mm/tlbex.c 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/arch/mips/mm/tlbex.c 2006-06-18 03:49:35.000000000 +0200
|
||||||
+++ linux.dev/arch/mips/mm/tlbex.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/mm/tlbex.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -876,7 +876,6 @@
|
@@ -876,7 +876,6 @@
|
||||||
case CPU_R10000:
|
case CPU_R10000:
|
||||||
case CPU_R12000:
|
case CPU_R12000:
|
||||||
|
@ -68,7 +68,7 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
||||||
case CPU_34K:
|
case CPU_34K:
|
||||||
diff -urN linux.old/arch/mips/pci/fixup-rb500.c linux.dev/arch/mips/pci/fixup-rb500.c
|
diff -urN linux.old/arch/mips/pci/fixup-rb500.c linux.dev/arch/mips/pci/fixup-rb500.c
|
||||||
--- linux.old/arch/mips/pci/fixup-rb500.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/pci/fixup-rb500.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/pci/fixup-rb500.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/pci/fixup-rb500.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,49 @@
|
@@ -0,0 +1,49 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2001 MontaVista Software Inc.
|
+ * Copyright 2001 MontaVista Software Inc.
|
||||||
|
@ -120,8 +120,8 @@ diff -urN linux.old/arch/mips/pci/fixup-rb500.c linux.dev/arch/mips/pci/fixup-rb
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
|
diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
|
||||||
--- linux.old/arch/mips/pci/Makefile 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/arch/mips/pci/Makefile 2006-06-18 03:49:35.000000000 +0200
|
||||||
+++ linux.dev/arch/mips/pci/Makefile 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/pci/Makefile 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -57,3 +57,4 @@
|
@@ -57,3 +57,4 @@
|
||||||
obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-tx4938.o ops-tx4938.o
|
obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-tx4938.o ops-tx4938.o
|
||||||
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
|
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
|
||||||
|
@ -129,7 +129,7 @@ diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
|
||||||
+obj-$(CONFIG_MIKROTIK_RB500) += pci-rc32434.o ops-rc32434.o fixup-rb500.o
|
+obj-$(CONFIG_MIKROTIK_RB500) += pci-rc32434.o ops-rc32434.o fixup-rb500.o
|
||||||
diff -urN linux.old/arch/mips/pci/ops-rc32434.c linux.dev/arch/mips/pci/ops-rc32434.c
|
diff -urN linux.old/arch/mips/pci/ops-rc32434.c linux.dev/arch/mips/pci/ops-rc32434.c
|
||||||
--- linux.old/arch/mips/pci/ops-rc32434.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/pci/ops-rc32434.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/pci/ops-rc32434.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/pci/ops-rc32434.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,195 @@
|
@@ -0,0 +1,195 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
|
@ -328,7 +328,7 @@ diff -urN linux.old/arch/mips/pci/ops-rc32434.c linux.dev/arch/mips/pci/ops-rc32
|
||||||
+};
|
+};
|
||||||
diff -urN linux.old/arch/mips/pci/pci-rc32434.c linux.dev/arch/mips/pci/pci-rc32434.c
|
diff -urN linux.old/arch/mips/pci/pci-rc32434.c linux.dev/arch/mips/pci/pci-rc32434.c
|
||||||
--- linux.old/arch/mips/pci/pci-rc32434.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/pci/pci-rc32434.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/pci/pci-rc32434.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/pci/pci-rc32434.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,234 @@
|
@@ -0,0 +1,234 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
|
@ -566,7 +566,7 @@ diff -urN linux.old/arch/mips/pci/pci-rc32434.c linux.dev/arch/mips/pci/pci-rc32
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/rb500/devices.c linux.dev/arch/mips/rb500/devices.c
|
diff -urN linux.old/arch/mips/rb500/devices.c linux.dev/arch/mips/rb500/devices.c
|
||||||
--- linux.old/arch/mips/rb500/devices.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/devices.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/devices.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/devices.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,211 @@
|
@@ -0,0 +1,211 @@
|
||||||
+#include <linux/kernel.h>
|
+#include <linux/kernel.h>
|
||||||
+#include <linux/init.h>
|
+#include <linux/init.h>
|
||||||
|
@ -781,7 +781,7 @@ diff -urN linux.old/arch/mips/rb500/devices.c linux.dev/arch/mips/rb500/devices.
|
||||||
+#endif
|
+#endif
|
||||||
diff -urN linux.old/arch/mips/rb500/early_serial.c linux.dev/arch/mips/rb500/early_serial.c
|
diff -urN linux.old/arch/mips/rb500/early_serial.c linux.dev/arch/mips/rb500/early_serial.c
|
||||||
--- linux.old/arch/mips/rb500/early_serial.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/early_serial.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/early_serial.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/early_serial.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,199 @@
|
@@ -0,0 +1,199 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
|
@ -984,7 +984,7 @@ diff -urN linux.old/arch/mips/rb500/early_serial.c linux.dev/arch/mips/rb500/ear
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
|
diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
|
||||||
--- linux.old/arch/mips/rb500/irq.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/irq.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/irq.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/irq.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,264 @@
|
@@ -0,0 +1,264 @@
|
||||||
+/*
|
+/*
|
||||||
+ * BRIEF MODULE DESCRIPTION
|
+ * BRIEF MODULE DESCRIPTION
|
||||||
|
@ -1252,7 +1252,7 @@ diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/rb500/Makefile linux.dev/arch/mips/rb500/Makefile
|
diff -urN linux.old/arch/mips/rb500/Makefile linux.dev/arch/mips/rb500/Makefile
|
||||||
--- linux.old/arch/mips/rb500/Makefile 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/Makefile 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/Makefile 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/Makefile 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,5 @@
|
@@ -0,0 +1,5 @@
|
||||||
+#
|
+#
|
||||||
+# Makefile for the RB500 board specific parts of the kernel
|
+# Makefile for the RB500 board specific parts of the kernel
|
||||||
|
@ -1261,7 +1261,7 @@ diff -urN linux.old/arch/mips/rb500/Makefile linux.dev/arch/mips/rb500/Makefile
|
||||||
+obj-y += irq.o time.o setup.o serial.o early_serial.o prom.o misc.o devices.o
|
+obj-y += irq.o time.o setup.o serial.o early_serial.o prom.o misc.o devices.o
|
||||||
diff -urN linux.old/arch/mips/rb500/misc.c linux.dev/arch/mips/rb500/misc.c
|
diff -urN linux.old/arch/mips/rb500/misc.c linux.dev/arch/mips/rb500/misc.c
|
||||||
--- linux.old/arch/mips/rb500/misc.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/misc.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/misc.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/misc.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,54 @@
|
@@ -0,0 +1,54 @@
|
||||||
+#include <linux/module.h>
|
+#include <linux/module.h>
|
||||||
+#include <linux/kernel.h> /* printk() */
|
+#include <linux/kernel.h> /* printk() */
|
||||||
|
@ -1319,7 +1319,7 @@ diff -urN linux.old/arch/mips/rb500/misc.c linux.dev/arch/mips/rb500/misc.c
|
||||||
+EXPORT_SYMBOL(changeLatchU5);
|
+EXPORT_SYMBOL(changeLatchU5);
|
||||||
diff -urN linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
|
diff -urN linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
|
||||||
--- linux.old/arch/mips/rb500/prom.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/prom.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/prom.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/prom.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,181 @@
|
@@ -0,0 +1,181 @@
|
||||||
+/*
|
+/*
|
||||||
+* prom.c
|
+* prom.c
|
||||||
|
@ -1504,7 +1504,7 @@ diff -urN linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
|
||||||
+
|
+
|
||||||
diff -urN linux.old/arch/mips/rb500/serial.c linux.dev/arch/mips/rb500/serial.c
|
diff -urN linux.old/arch/mips/rb500/serial.c linux.dev/arch/mips/rb500/serial.c
|
||||||
--- linux.old/arch/mips/rb500/serial.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/serial.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/serial.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/serial.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,79 @@
|
@@ -0,0 +1,79 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
|
@ -1587,7 +1587,7 @@ diff -urN linux.old/arch/mips/rb500/serial.c linux.dev/arch/mips/rb500/serial.c
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
|
diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
|
||||||
--- linux.old/arch/mips/rb500/setup.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/setup.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/setup.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,84 @@
|
@@ -0,0 +1,84 @@
|
||||||
+/*
|
+/*
|
||||||
+ * setup.c - boot time setup code
|
+ * setup.c - boot time setup code
|
||||||
|
@ -1675,7 +1675,7 @@ diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
|
||||||
+}
|
+}
|
||||||
diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
|
diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
|
||||||
--- linux.old/arch/mips/rb500/time.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/arch/mips/rb500/time.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/arch/mips/rb500/time.c 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/arch/mips/rb500/time.c 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,94 @@
|
@@ -0,0 +1,94 @@
|
||||||
+/*
|
+/*
|
||||||
+****************************************************************************
|
+****************************************************************************
|
||||||
|
@ -1772,8 +1772,8 @@ diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/devices/block2mtd.c
|
diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/devices/block2mtd.c
|
||||||
--- linux.old/drivers/mtd/devices/block2mtd.c 2006-07-29 19:53:54.000000000 +0200
|
--- linux.old/drivers/mtd/devices/block2mtd.c 2006-10-11 21:55:59.000000000 +0200
|
||||||
+++ linux.dev/drivers/mtd/devices/block2mtd.c 2006-07-29 19:47:03.000000000 +0200
|
+++ linux.dev/drivers/mtd/devices/block2mtd.c 2006-10-11 21:57:34.000000000 +0200
|
||||||
@@ -26,7 +26,6 @@
|
@@ -26,7 +26,6 @@
|
||||||
#define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
|
#define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
|
||||||
#define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args)
|
#define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args)
|
||||||
|
@ -1782,7 +1782,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
/* Info for the block device */
|
/* Info for the block device */
|
||||||
struct block2mtd_dev {
|
struct block2mtd_dev {
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
@@ -106,7 +103,7 @@
|
@@ -104,7 +103,7 @@
|
||||||
|
|
||||||
while (pages) {
|
while (pages) {
|
||||||
page = page_readahead(mapping, index);
|
page = page_readahead(mapping, index);
|
||||||
|
@ -1791,7 +1791,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
if (IS_ERR(page))
|
if (IS_ERR(page))
|
||||||
return PTR_ERR(page);
|
return PTR_ERR(page);
|
||||||
@@ -285,7 +282,7 @@
|
@@ -285,7 +284,7 @@
|
||||||
|
|
||||||
|
|
||||||
/* FIXME: ensure that mtd->size % erase_size == 0 */
|
/* FIXME: ensure that mtd->size % erase_size == 0 */
|
||||||
|
@ -1800,7 +1800,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
{
|
{
|
||||||
struct block_device *bdev;
|
struct block_device *bdev;
|
||||||
struct block2mtd_dev *dev;
|
struct block2mtd_dev *dev;
|
||||||
@@ -315,14 +312,15 @@
|
@@ -328,14 +327,15 @@
|
||||||
|
|
||||||
/* Setup the MTD structure */
|
/* Setup the MTD structure */
|
||||||
/* make the name contain the block device in */
|
/* make the name contain the block device in */
|
||||||
|
@ -1818,7 +1818,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
dev->mtd.erasesize = erase_size;
|
dev->mtd.erasesize = erase_size;
|
||||||
dev->mtd.type = MTD_RAM;
|
dev->mtd.type = MTD_RAM;
|
||||||
dev->mtd.flags = MTD_CAP_RAM;
|
dev->mtd.flags = MTD_CAP_RAM;
|
||||||
@@ -341,7 +339,7 @@
|
@@ -353,7 +353,7 @@
|
||||||
}
|
}
|
||||||
list_add(&dev->list, &blkmtd_device_list);
|
list_add(&dev->list, &blkmtd_device_list);
|
||||||
INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
|
INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
|
||||||
|
@ -1827,30 +1827,31 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
dev->mtd.erasesize >> 10, dev->mtd.erasesize);
|
dev->mtd.erasesize >> 10, dev->mtd.erasesize);
|
||||||
return dev;
|
return dev;
|
||||||
|
|
||||||
@@ -416,10 +414,10 @@
|
@@ -425,11 +425,11 @@
|
||||||
return 0; \
|
#endif
|
||||||
} while (0)
|
|
||||||
|
|
||||||
-static int block2mtd_setup(const char *val, struct kernel_param *kp)
|
|
||||||
+int block2mtd_setup(const char *val, struct kernel_param *kp)
|
-static int block2mtd_setup2(const char *val)
|
||||||
|
+int block2mtd_setup2(const char *val)
|
||||||
{
|
{
|
||||||
char buf[80+12], *str=buf; /* 80 for device, 12 for erase size */
|
char buf[80 + 12]; /* 80 for device, 12 for erase size */
|
||||||
|
char *str = buf;
|
||||||
- char *token[2];
|
- char *token[2];
|
||||||
+ char *token[3];
|
+ char *token[3];
|
||||||
char *name;
|
char *name;
|
||||||
size_t erase_size = PAGE_SIZE;
|
size_t erase_size = PAGE_SIZE;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
@@ -430,7 +428,7 @@
|
@@ -440,7 +440,7 @@
|
||||||
strcpy(str, val);
|
strcpy(str, val);
|
||||||
kill_final_newline(str);
|
kill_final_newline(str);
|
||||||
|
|
||||||
- for (i=0; i<2; i++)
|
- for (i = 0; i < 2; i++)
|
||||||
+ for (i=0; i<3; i++)
|
+ for (i = 0; i < 3; i++)
|
||||||
token[i] = strsep(&str, ",");
|
token[i] = strsep(&str, ",");
|
||||||
|
|
||||||
if (str)
|
if (str)
|
||||||
@@ -453,7 +451,7 @@
|
@@ -461,7 +461,7 @@
|
||||||
parse_err("illegal erase size");
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- add_device(name, erase_size);
|
- add_device(name, erase_size);
|
||||||
|
@ -1858,7 +1859,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -461,6 +459,7 @@
|
@@ -496,6 +496,7 @@
|
||||||
|
|
||||||
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
||||||
MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
|
MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
|
||||||
|
@ -1867,8 +1868,8 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
|
||||||
static int __init block2mtd_init(void)
|
static int __init block2mtd_init(void)
|
||||||
{
|
{
|
||||||
diff -urN linux.old/drivers/pci/Makefile linux.dev/drivers/pci/Makefile
|
diff -urN linux.old/drivers/pci/Makefile linux.dev/drivers/pci/Makefile
|
||||||
--- linux.old/drivers/pci/Makefile 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/drivers/pci/Makefile 2006-06-18 03:49:35.000000000 +0200
|
||||||
+++ linux.dev/drivers/pci/Makefile 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/drivers/pci/Makefile 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -27,6 +27,7 @@
|
@@ -27,6 +27,7 @@
|
||||||
obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
|
obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
|
||||||
obj-$(CONFIG_X86_VISWS) += setup-irq.o
|
obj-$(CONFIG_X86_VISWS) += setup-irq.o
|
||||||
|
@ -1878,8 +1879,8 @@ diff -urN linux.old/drivers/pci/Makefile linux.dev/drivers/pci/Makefile
|
||||||
#
|
#
|
||||||
# ACPI Related PCI FW Functions
|
# ACPI Related PCI FW Functions
|
||||||
diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
|
diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
|
||||||
--- linux.old/include/asm-mips/bootinfo.h 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/include/asm-mips/bootinfo.h 2006-06-18 03:49:35.000000000 +0200
|
||||||
+++ linux.dev/include/asm-mips/bootinfo.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/bootinfo.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -218,6 +218,8 @@
|
@@ -218,6 +218,8 @@
|
||||||
#define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */
|
#define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */
|
||||||
#define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */
|
#define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */
|
||||||
|
@ -1890,8 +1891,8 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti
|
||||||
|
|
||||||
const char *get_system_type(void);
|
const char *get_system_type(void);
|
||||||
diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
||||||
--- linux.old/include/asm-mips/cpu.h 2006-07-29 19:53:20.000000000 +0200
|
--- linux.old/include/asm-mips/cpu.h 2006-06-18 03:49:35.000000000 +0200
|
||||||
+++ linux.dev/include/asm-mips/cpu.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/cpu.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -200,7 +200,8 @@
|
@@ -200,7 +200,8 @@
|
||||||
#define CPU_SB1A 62
|
#define CPU_SB1A 62
|
||||||
#define CPU_74K 63
|
#define CPU_74K 63
|
||||||
|
@ -1904,7 +1905,7 @@ diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
||||||
* ISA Level encodings
|
* ISA Level encodings
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/crom.h linux.dev/include/asm-mips/rc32434/crom.h
|
diff -urN linux.old/include/asm-mips/rc32434/crom.h linux.dev/include/asm-mips/rc32434/crom.h
|
||||||
--- linux.old/include/asm-mips/rc32434/crom.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/crom.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/crom.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/crom.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,98 @@
|
@@ -0,0 +1,98 @@
|
||||||
+#ifndef __IDT_CROM_H__
|
+#ifndef __IDT_CROM_H__
|
||||||
+#define __IDT_CROM_H__
|
+#define __IDT_CROM_H__
|
||||||
|
@ -2006,7 +2007,7 @@ diff -urN linux.old/include/asm-mips/rc32434/crom.h linux.dev/include/asm-mips/r
|
||||||
+#endif // __IDT_CROM_H__
|
+#endif // __IDT_CROM_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/ddr.h linux.dev/include/asm-mips/rc32434/ddr.h
|
diff -urN linux.old/include/asm-mips/rc32434/ddr.h linux.dev/include/asm-mips/rc32434/ddr.h
|
||||||
--- linux.old/include/asm-mips/rc32434/ddr.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/ddr.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/ddr.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/ddr.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,175 @@
|
@@ -0,0 +1,175 @@
|
||||||
+#ifndef __IDT_DDR_H__
|
+#ifndef __IDT_DDR_H__
|
||||||
+#define __IDT_DDR_H__
|
+#define __IDT_DDR_H__
|
||||||
|
@ -2185,7 +2186,7 @@ diff -urN linux.old/include/asm-mips/rc32434/ddr.h linux.dev/include/asm-mips/rc
|
||||||
+#endif // __IDT_DDR_H__
|
+#endif // __IDT_DDR_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/dev.h linux.dev/include/asm-mips/rc32434/dev.h
|
diff -urN linux.old/include/asm-mips/rc32434/dev.h linux.dev/include/asm-mips/rc32434/dev.h
|
||||||
--- linux.old/include/asm-mips/rc32434/dev.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/dev.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/dev.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/dev.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,134 @@
|
@@ -0,0 +1,134 @@
|
||||||
+#ifndef __IDT_DEV_H__
|
+#ifndef __IDT_DEV_H__
|
||||||
+#define __IDT_DEV_H__
|
+#define __IDT_DEV_H__
|
||||||
|
@ -2323,7 +2324,7 @@ diff -urN linux.old/include/asm-mips/rc32434/dev.h linux.dev/include/asm-mips/rc
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/dma.h linux.dev/include/asm-mips/rc32434/dma.h
|
diff -urN linux.old/include/asm-mips/rc32434/dma.h linux.dev/include/asm-mips/rc32434/dma.h
|
||||||
--- linux.old/include/asm-mips/rc32434/dma.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/dma.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/dma.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/dma.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,202 @@
|
@@ -0,0 +1,202 @@
|
||||||
+#ifndef __IDT_DMA_H__
|
+#ifndef __IDT_DMA_H__
|
||||||
+#define __IDT_DMA_H__
|
+#define __IDT_DMA_H__
|
||||||
|
@ -2529,7 +2530,7 @@ diff -urN linux.old/include/asm-mips/rc32434/dma.h linux.dev/include/asm-mips/rc
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/dma_v.h linux.dev/include/asm-mips/rc32434/dma_v.h
|
diff -urN linux.old/include/asm-mips/rc32434/dma_v.h linux.dev/include/asm-mips/rc32434/dma_v.h
|
||||||
--- linux.old/include/asm-mips/rc32434/dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/dma_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/dma_v.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/dma_v.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,73 @@
|
@@ -0,0 +1,73 @@
|
||||||
+#ifndef __IDT_DMA_V_H__
|
+#ifndef __IDT_DMA_V_H__
|
||||||
+#define __IDT_DMA_V_H__
|
+#define __IDT_DMA_V_H__
|
||||||
|
@ -2606,7 +2607,7 @@ diff -urN linux.old/include/asm-mips/rc32434/dma_v.h linux.dev/include/asm-mips/
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/eth.h linux.dev/include/asm-mips/rc32434/eth.h
|
diff -urN linux.old/include/asm-mips/rc32434/eth.h linux.dev/include/asm-mips/rc32434/eth.h
|
||||||
--- linux.old/include/asm-mips/rc32434/eth.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/eth.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/eth.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/eth.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,322 @@
|
@@ -0,0 +1,322 @@
|
||||||
+#ifndef __IDT_ETH_H__
|
+#ifndef __IDT_ETH_H__
|
||||||
+#define __IDT_ETH_H__
|
+#define __IDT_ETH_H__
|
||||||
|
@ -2932,7 +2933,7 @@ diff -urN linux.old/include/asm-mips/rc32434/eth.h linux.dev/include/asm-mips/rc
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/eth_v.h linux.dev/include/asm-mips/rc32434/eth_v.h
|
diff -urN linux.old/include/asm-mips/rc32434/eth_v.h linux.dev/include/asm-mips/rc32434/eth_v.h
|
||||||
--- linux.old/include/asm-mips/rc32434/eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/eth_v.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/eth_v.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/eth_v.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,64 @@
|
@@ -0,0 +1,64 @@
|
||||||
+#ifndef __IDT_ETH_V_H__
|
+#ifndef __IDT_ETH_V_H__
|
||||||
+#define __IDT_ETH_V_H__
|
+#define __IDT_ETH_V_H__
|
||||||
|
@ -3000,7 +3001,7 @@ diff -urN linux.old/include/asm-mips/rc32434/eth_v.h linux.dev/include/asm-mips/
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/gpio.h linux.dev/include/asm-mips/rc32434/gpio.h
|
diff -urN linux.old/include/asm-mips/rc32434/gpio.h linux.dev/include/asm-mips/rc32434/gpio.h
|
||||||
--- linux.old/include/asm-mips/rc32434/gpio.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/gpio.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/gpio.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/gpio.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,182 @@
|
@@ -0,0 +1,182 @@
|
||||||
+#ifndef __IDT_GPIO_H__
|
+#ifndef __IDT_GPIO_H__
|
||||||
+#define __IDT_GPIO_H__
|
+#define __IDT_GPIO_H__
|
||||||
|
@ -3186,7 +3187,7 @@ diff -urN linux.old/include/asm-mips/rc32434/gpio.h linux.dev/include/asm-mips/r
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/i2c.h linux.dev/include/asm-mips/rc32434/i2c.h
|
diff -urN linux.old/include/asm-mips/rc32434/i2c.h linux.dev/include/asm-mips/rc32434/i2c.h
|
||||||
--- linux.old/include/asm-mips/rc32434/i2c.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/i2c.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/i2c.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/i2c.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,147 @@
|
@@ -0,0 +1,147 @@
|
||||||
+#ifndef __IDT_I2C_H__
|
+#ifndef __IDT_I2C_H__
|
||||||
+#define __IDT_I2C_H__
|
+#define __IDT_I2C_H__
|
||||||
|
@ -3337,7 +3338,7 @@ diff -urN linux.old/include/asm-mips/rc32434/i2c.h linux.dev/include/asm-mips/rc
|
||||||
+#endif // __IDT_I2C_H__
|
+#endif // __IDT_I2C_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/integ.h linux.dev/include/asm-mips/rc32434/integ.h
|
diff -urN linux.old/include/asm-mips/rc32434/integ.h linux.dev/include/asm-mips/rc32434/integ.h
|
||||||
--- linux.old/include/asm-mips/rc32434/integ.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/integ.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/integ.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/integ.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,78 @@
|
@@ -0,0 +1,78 @@
|
||||||
+#ifndef __IDT_INTEG_H__
|
+#ifndef __IDT_INTEG_H__
|
||||||
+#define __IDT_INTEG_H__
|
+#define __IDT_INTEG_H__
|
||||||
|
@ -3419,7 +3420,7 @@ diff -urN linux.old/include/asm-mips/rc32434/integ.h linux.dev/include/asm-mips/
|
||||||
+#endif // __IDT_INTEG_H__
|
+#endif // __IDT_INTEG_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/int.h linux.dev/include/asm-mips/rc32434/int.h
|
diff -urN linux.old/include/asm-mips/rc32434/int.h linux.dev/include/asm-mips/rc32434/int.h
|
||||||
--- linux.old/include/asm-mips/rc32434/int.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/int.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/int.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/int.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,167 @@
|
@@ -0,0 +1,167 @@
|
||||||
+#ifndef __IDT_INT_H__
|
+#ifndef __IDT_INT_H__
|
||||||
+#define __IDT_INT_H__
|
+#define __IDT_INT_H__
|
||||||
|
@ -3590,7 +3591,7 @@ diff -urN linux.old/include/asm-mips/rc32434/int.h linux.dev/include/asm-mips/rc
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/iparb.h linux.dev/include/asm-mips/rc32434/iparb.h
|
diff -urN linux.old/include/asm-mips/rc32434/iparb.h linux.dev/include/asm-mips/rc32434/iparb.h
|
||||||
--- linux.old/include/asm-mips/rc32434/iparb.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/iparb.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/iparb.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/iparb.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,95 @@
|
@@ -0,0 +1,95 @@
|
||||||
+#ifndef __IDT_IPARB_H__
|
+#ifndef __IDT_IPARB_H__
|
||||||
+#define __IDT_IPARB_H__
|
+#define __IDT_IPARB_H__
|
||||||
|
@ -3689,7 +3690,7 @@ diff -urN linux.old/include/asm-mips/rc32434/iparb.h linux.dev/include/asm-mips/
|
||||||
+#endif // __IDT_IPARB_H__
|
+#endif // __IDT_IPARB_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/irm.h linux.dev/include/asm-mips/rc32434/irm.h
|
diff -urN linux.old/include/asm-mips/rc32434/irm.h linux.dev/include/asm-mips/rc32434/irm.h
|
||||||
--- linux.old/include/asm-mips/rc32434/irm.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/irm.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/irm.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/irm.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,55 @@
|
@@ -0,0 +1,55 @@
|
||||||
+#ifndef __IDT_IRM_H__
|
+#ifndef __IDT_IRM_H__
|
||||||
+#define __IDT_IRM_H__
|
+#define __IDT_IRM_H__
|
||||||
|
@ -3748,7 +3749,7 @@ diff -urN linux.old/include/asm-mips/rc32434/irm.h linux.dev/include/asm-mips/rc
|
||||||
+#endif // __IDT_IRM_H__
|
+#endif // __IDT_IRM_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/irq.h linux.dev/include/asm-mips/rc32434/irq.h
|
diff -urN linux.old/include/asm-mips/rc32434/irq.h linux.dev/include/asm-mips/rc32434/irq.h
|
||||||
--- linux.old/include/asm-mips/rc32434/irq.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/irq.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/irq.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/irq.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,8 @@
|
@@ -0,0 +1,8 @@
|
||||||
+#ifndef __ASM_MACH_MIPS_IRQ_H
|
+#ifndef __ASM_MACH_MIPS_IRQ_H
|
||||||
+#define __ASM_MACH_MIPS_IRQ_H
|
+#define __ASM_MACH_MIPS_IRQ_H
|
||||||
|
@ -3760,7 +3761,7 @@ diff -urN linux.old/include/asm-mips/rc32434/irq.h linux.dev/include/asm-mips/rc
|
||||||
+#endif /* __ASM_MACH_MIPS_IRQ_H */
|
+#endif /* __ASM_MACH_MIPS_IRQ_H */
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/nvram.h linux.dev/include/asm-mips/rc32434/nvram.h
|
diff -urN linux.old/include/asm-mips/rc32434/nvram.h linux.dev/include/asm-mips/rc32434/nvram.h
|
||||||
--- linux.old/include/asm-mips/rc32434/nvram.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/nvram.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/nvram.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/nvram.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,97 @@
|
@@ -0,0 +1,97 @@
|
||||||
+#ifndef __IDT_NVRAM_H
|
+#ifndef __IDT_NVRAM_H
|
||||||
+#define __IDT_NVRAM_H
|
+#define __IDT_NVRAM_H
|
||||||
|
@ -3861,7 +3862,7 @@ diff -urN linux.old/include/asm-mips/rc32434/nvram.h linux.dev/include/asm-mips/
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/pci.h linux.dev/include/asm-mips/rc32434/pci.h
|
diff -urN linux.old/include/asm-mips/rc32434/pci.h linux.dev/include/asm-mips/rc32434/pci.h
|
||||||
--- linux.old/include/asm-mips/rc32434/pci.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/pci.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/pci.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/pci.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,695 @@
|
@@ -0,0 +1,695 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
|
@ -4560,7 +4561,7 @@ diff -urN linux.old/include/asm-mips/rc32434/pci.h linux.dev/include/asm-mips/rc
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/pcikorina.h linux.dev/include/asm-mips/rc32434/pcikorina.h
|
diff -urN linux.old/include/asm-mips/rc32434/pcikorina.h linux.dev/include/asm-mips/rc32434/pcikorina.h
|
||||||
--- linux.old/include/asm-mips/rc32434/pcikorina.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/pcikorina.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/pcikorina.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/pcikorina.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,209 @@
|
@@ -0,0 +1,209 @@
|
||||||
+/* $Id: pciacacia.h,v 1.5 2001/05/01 10:09:17 carstenl Exp $
|
+/* $Id: pciacacia.h,v 1.5 2001/05/01 10:09:17 carstenl Exp $
|
||||||
+ *
|
+ *
|
||||||
|
@ -4773,7 +4774,7 @@ diff -urN linux.old/include/asm-mips/rc32434/pcikorina.h linux.dev/include/asm-m
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/pci_regs.h linux.dev/include/asm-mips/rc32434/pci_regs.h
|
diff -urN linux.old/include/asm-mips/rc32434/pci_regs.h linux.dev/include/asm-mips/rc32434/pci_regs.h
|
||||||
--- linux.old/include/asm-mips/rc32434/pci_regs.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/pci_regs.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/pci_regs.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/pci_regs.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,8 @@
|
@@ -0,0 +1,8 @@
|
||||||
+/* Override the default address space for this arch
|
+/* Override the default address space for this arch
|
||||||
+*/
|
+*/
|
||||||
|
@ -4785,7 +4786,7 @@ diff -urN linux.old/include/asm-mips/rc32434/pci_regs.h linux.dev/include/asm-mi
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/rb.h linux.dev/include/asm-mips/rc32434/rb.h
|
diff -urN linux.old/include/asm-mips/rc32434/rb.h linux.dev/include/asm-mips/rc32434/rb.h
|
||||||
--- linux.old/include/asm-mips/rc32434/rb.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/rb.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/rb.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/rb.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,69 @@
|
@@ -0,0 +1,69 @@
|
||||||
+#ifndef __MIPS_RB_H__
|
+#ifndef __MIPS_RB_H__
|
||||||
+#define __MIPS_RB_H__
|
+#define __MIPS_RB_H__
|
||||||
|
@ -4858,7 +4859,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rb.h linux.dev/include/asm-mips/rc3
|
||||||
+#endif
|
+#endif
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/rc32434.h linux.dev/include/asm-mips/rc32434/rc32434.h
|
diff -urN linux.old/include/asm-mips/rc32434/rc32434.h linux.dev/include/asm-mips/rc32434/rc32434.h
|
||||||
--- linux.old/include/asm-mips/rc32434/rc32434.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/rc32434.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/rc32434.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/rc32434.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,126 @@
|
@@ -0,0 +1,126 @@
|
||||||
+/*
|
+/*
|
||||||
+ ***************************************************************************
|
+ ***************************************************************************
|
||||||
|
@ -4988,7 +4989,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rc32434.h linux.dev/include/asm-mip
|
||||||
+#endif /* _RC32434_H_ */
|
+#endif /* _RC32434_H_ */
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/rst.h linux.dev/include/asm-mips/rc32434/rst.h
|
diff -urN linux.old/include/asm-mips/rc32434/rst.h linux.dev/include/asm-mips/rc32434/rst.h
|
||||||
--- linux.old/include/asm-mips/rc32434/rst.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/rst.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/rst.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/rst.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,105 @@
|
@@ -0,0 +1,105 @@
|
||||||
+#ifndef __IDT_RST_H__
|
+#ifndef __IDT_RST_H__
|
||||||
+#define __IDT_RST_H__
|
+#define __IDT_RST_H__
|
||||||
|
@ -5097,7 +5098,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rst.h linux.dev/include/asm-mips/rc
|
||||||
+#endif // __IDT_RST_H__
|
+#endif // __IDT_RST_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/spi.h linux.dev/include/asm-mips/rc32434/spi.h
|
diff -urN linux.old/include/asm-mips/rc32434/spi.h linux.dev/include/asm-mips/rc32434/spi.h
|
||||||
--- linux.old/include/asm-mips/rc32434/spi.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/spi.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/spi.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/spi.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,100 @@
|
@@ -0,0 +1,100 @@
|
||||||
+#ifndef __IDT_SPI_H__
|
+#ifndef __IDT_SPI_H__
|
||||||
+#define __IDT_SPI_H__
|
+#define __IDT_SPI_H__
|
||||||
|
@ -5201,7 +5202,7 @@ diff -urN linux.old/include/asm-mips/rc32434/spi.h linux.dev/include/asm-mips/rc
|
||||||
+#endif // __IDT_SPI_H__
|
+#endif // __IDT_SPI_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/timer.h linux.dev/include/asm-mips/rc32434/timer.h
|
diff -urN linux.old/include/asm-mips/rc32434/timer.h linux.dev/include/asm-mips/rc32434/timer.h
|
||||||
--- linux.old/include/asm-mips/rc32434/timer.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/timer.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/timer.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/timer.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,91 @@
|
@@ -0,0 +1,91 @@
|
||||||
+/**************************************************************************
|
+/**************************************************************************
|
||||||
+ *
|
+ *
|
||||||
|
@ -5296,7 +5297,7 @@ diff -urN linux.old/include/asm-mips/rc32434/timer.h linux.dev/include/asm-mips/
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/tim.h linux.dev/include/asm-mips/rc32434/tim.h
|
diff -urN linux.old/include/asm-mips/rc32434/tim.h linux.dev/include/asm-mips/rc32434/tim.h
|
||||||
--- linux.old/include/asm-mips/rc32434/tim.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/tim.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/tim.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/tim.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,78 @@
|
@@ -0,0 +1,78 @@
|
||||||
+#ifndef __IDT_TIM_H__
|
+#ifndef __IDT_TIM_H__
|
||||||
+#define __IDT_TIM_H__
|
+#define __IDT_TIM_H__
|
||||||
|
@ -5378,7 +5379,7 @@ diff -urN linux.old/include/asm-mips/rc32434/tim.h linux.dev/include/asm-mips/rc
|
||||||
+
|
+
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/types.h linux.dev/include/asm-mips/rc32434/types.h
|
diff -urN linux.old/include/asm-mips/rc32434/types.h linux.dev/include/asm-mips/rc32434/types.h
|
||||||
--- linux.old/include/asm-mips/rc32434/types.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/types.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/types.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/types.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,39 @@
|
@@ -0,0 +1,39 @@
|
||||||
+#ifndef __IDT_TYPES_H__
|
+#ifndef __IDT_TYPES_H__
|
||||||
+#define __IDT_TYPES_H__
|
+#define __IDT_TYPES_H__
|
||||||
|
@ -5421,7 +5422,7 @@ diff -urN linux.old/include/asm-mips/rc32434/types.h linux.dev/include/asm-mips/
|
||||||
+#endif // __IDT_TYPES_H__
|
+#endif // __IDT_TYPES_H__
|
||||||
diff -urN linux.old/include/asm-mips/rc32434/uart.h linux.dev/include/asm-mips/rc32434/uart.h
|
diff -urN linux.old/include/asm-mips/rc32434/uart.h linux.dev/include/asm-mips/rc32434/uart.h
|
||||||
--- linux.old/include/asm-mips/rc32434/uart.h 1970-01-01 01:00:00.000000000 +0100
|
--- linux.old/include/asm-mips/rc32434/uart.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux.dev/include/asm-mips/rc32434/uart.h 2006-07-29 19:31:51.000000000 +0200
|
+++ linux.dev/include/asm-mips/rc32434/uart.h 2006-10-11 21:56:38.000000000 +0200
|
||||||
@@ -0,0 +1,178 @@
|
@@ -0,0 +1,178 @@
|
||||||
+#ifndef __IDT_UART_H__
|
+#ifndef __IDT_UART_H__
|
||||||
+#define __IDT_UART_H__
|
+#define __IDT_UART_H__
|
||||||
|
|
Loading…
Reference in a new issue