diff options
Diffstat (limited to 'target/linux/generic-2.4/patches/000-linux_mips.patch')
| -rw-r--r-- | target/linux/generic-2.4/patches/000-linux_mips.patch | 2514 |
1 files changed, 1257 insertions, 1257 deletions
diff --git a/target/linux/generic-2.4/patches/000-linux_mips.patch b/target/linux/generic-2.4/patches/000-linux_mips.patch index bdc0cdedd0..ea973bdaaa 100644 --- a/target/linux/generic-2.4/patches/000-linux_mips.patch +++ b/target/linux/generic-2.4/patches/000-linux_mips.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/au1xxx_irqmap.c 2007-12-15 05:19:42.862863653 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c 2007-12-15 05:19:44.782973074 +0100 -@@ -172,14 +172,14 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/au1xxx_irqmap.c ++++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c +@@ -172,14 +172,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = { { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0}, @@ -25,7 +25,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0}, { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 }, { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, -@@ -200,14 +200,14 @@ +@@ -200,14 +200,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = { { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0}, @@ -50,9 +50,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0}, Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/cputable.c 2007-12-15 05:19:42.870864109 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c 2007-12-15 05:19:44.786973303 +0100 -@@ -39,7 +39,8 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/cputable.c ++++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c +@@ -39,7 +39,8 @@ struct cpu_spec cpu_specs[] = { { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 }, { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 }, { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, @@ -64,8 +64,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c 2007-12-15 05:19:42.878864567 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c 2007-12-15 05:19:44.786973303 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c ++++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c @@ -41,6 +41,8 @@ #include <asm/au1xxx_dbdma.h> #include <asm/system.h> @@ -75,7 +75,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) /* -@@ -60,37 +62,10 @@ +@@ -60,37 +62,10 @@ static spinlock_t au1xxx_dbdma_spin_lock */ #define ALIGN_ADDR(x, a) ((((u32)(x)) + (a-1)) & ~(a-1)) @@ -115,7 +115,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c static dbdev_tab_t dbdev_tab[] = { #ifdef CONFIG_SOC_AU1550 /* UARTS */ -@@ -156,13 +131,13 @@ +@@ -156,13 +131,13 @@ static dbdev_tab_t dbdev_tab[] = { { DSCR_CMD0_MAE_BOTH, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, @@ -135,7 +135,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT, 0, 0, 0x11a0001c, 0, 0 }, { DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN, 0, 0, 0x11a0001c, 0, 0 }, -@@ -172,9 +147,9 @@ +@@ -172,9 +147,9 @@ static dbdev_tab_t dbdev_tab[] = { { DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN, 0, 0, 0x11b0001c, 0, 0 }, { DSCR_CMD0_PSC1_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, @@ -148,7 +148,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, -@@ -183,6 +158,24 @@ +@@ -183,6 +158,24 @@ static dbdev_tab_t dbdev_tab[] = { { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, @@ -173,7 +173,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c }; #define DBDEV_TAB_SIZE (sizeof(dbdev_tab) / sizeof(dbdev_tab_t)) -@@ -202,6 +195,30 @@ +@@ -202,6 +195,30 @@ find_dbdev_id (u32 id) return NULL; } @@ -204,7 +204,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Allocate a channel and return a non-zero descriptor if successful. */ u32 -@@ -214,7 +231,7 @@ +@@ -214,7 +231,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d int i; dbdev_tab_t *stp, *dtp; chan_tab_t *ctp; @@ -213,7 +213,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* We do the intialization on the first channel allocation. * We have to wait because of the interrupt handler initialization -@@ -224,9 +241,6 @@ +@@ -224,9 +241,6 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d au1xxx_dbdma_init(); dbdma_initialized = 1; @@ -223,7 +223,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c if ((stp = find_dbdev_id(srcid)) == NULL) return 0; if ((dtp = find_dbdev_id(destid)) == NULL) return 0; -@@ -268,9 +282,9 @@ +@@ -268,9 +282,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d /* If kmalloc fails, it is caught below same * as a channel not available. */ @@ -235,7 +235,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c break; } } -@@ -278,10 +292,11 @@ +@@ -278,10 +292,11 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d if (ctp != NULL) { memset(ctp, 0, sizeof(chan_tab_t)); @@ -248,7 +248,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c ctp->chan_src = stp; ctp->chan_dest = dtp; ctp->chan_callback = callback; -@@ -298,6 +313,9 @@ +@@ -298,6 +313,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d i |= DDMA_CFG_DED; if (dtp->dev_intpolarity) i |= DDMA_CFG_DP; @@ -258,7 +258,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c cp->ddma_cfg = i; au_sync(); -@@ -308,14 +326,14 @@ +@@ -308,14 +326,14 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d rv = (u32)(&chan_tab_ptr[chan]); } else { @@ -275,7 +275,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Set the device width if source or destination is a FIFO. * Should be 8, 16, or 32 bits. -@@ -343,6 +361,7 @@ +@@ -343,6 +361,7 @@ au1xxx_dbdma_set_devwidth(u32 chanid, in return rv; } @@ -283,7 +283,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Allocate a descriptor ring, initializing as much as possible. */ -@@ -369,7 +388,8 @@ +@@ -369,7 +388,8 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int * and if we try that first we are likely to not waste larger * slabs of memory. */ @@ -293,7 +293,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c if (desc_base == 0) return 0; -@@ -380,7 +400,7 @@ +@@ -380,7 +400,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int kfree((const void *)desc_base); i = entries * sizeof(au1x_ddma_desc_t); i += (sizeof(au1x_ddma_desc_t) - 1); @@ -302,7 +302,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c return 0; desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); -@@ -460,9 +480,14 @@ +@@ -460,9 +480,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int /* If source input is fifo, set static address. */ if (stp->dev_flags & DEV_FLAGS_IN) { @@ -319,7 +319,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Set up dest1. For now, assume no stride and increment. * A channel attribute update can change this later. -@@ -486,10 +511,18 @@ +@@ -486,10 +511,18 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int /* If destination output is fifo, set static address. */ if (dtp->dev_flags & DEV_FLAGS_OUT) { @@ -339,7 +339,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c for (i=0; i<entries; i++) { dp->dscr_cmd0 = cmd0; dp->dscr_cmd1 = cmd1; -@@ -498,6 +531,7 @@ +@@ -498,6 +531,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int dp->dscr_dest0 = dest0; dp->dscr_dest1 = dest1; dp->dscr_stat = 0; @@ -347,7 +347,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(dp + 1)); dp++; } -@@ -510,13 +544,14 @@ +@@ -510,13 +544,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int return (u32)(ctp->chan_desc_base); } @@ -363,7 +363,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { chan_tab_t *ctp; au1x_ddma_desc_t *dp; -@@ -543,24 +578,40 @@ +@@ -543,24 +578,40 @@ au1xxx_dbdma_put_source(u32 chanid, void */ dp->dscr_source0 = virt_to_phys(buf); dp->dscr_cmd1 = nbytes; @@ -408,7 +408,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { chan_tab_t *ctp; au1x_ddma_desc_t *dp; -@@ -582,11 +633,33 @@ +@@ -582,11 +633,33 @@ au1xxx_dbdma_put_dest(u32 chanid, void * if (dp->dscr_cmd0 & DSCR_CMD0_V) return 0; @@ -444,7 +444,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Get next descriptor pointer. */ -@@ -596,6 +669,7 @@ +@@ -596,6 +669,7 @@ au1xxx_dbdma_put_dest(u32 chanid, void * */ return nbytes; } @@ -452,7 +452,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Get a destination buffer into the DMA ring. * Normally used to get a full buffer from the ring during fifo -@@ -645,7 +719,7 @@ +@@ -645,7 +719,7 @@ void au1xxx_dbdma_stop(u32 chanid) { chan_tab_t *ctp; @@ -461,7 +461,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c int halt_timeout = 0; ctp = *((chan_tab_t **)chanid); -@@ -665,6 +739,7 @@ +@@ -665,6 +739,7 @@ au1xxx_dbdma_stop(u32 chanid) cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V); au_sync(); } @@ -469,7 +469,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Start using the current descriptor pointer. If the dbdma encounters * a not valid descriptor, it will stop. In this case, we can just -@@ -674,17 +749,17 @@ +@@ -674,17 +749,17 @@ void au1xxx_dbdma_start(u32 chanid) { chan_tab_t *ctp; @@ -490,7 +490,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c void au1xxx_dbdma_reset(u32 chanid) -@@ -703,15 +778,21 @@ +@@ -703,15 +778,21 @@ au1xxx_dbdma_reset(u32 chanid) do { dp->dscr_cmd0 &= ~DSCR_CMD0_V; @@ -513,7 +513,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c u32 rv; ctp = *((chan_tab_t **)chanid); -@@ -746,15 +827,16 @@ +@@ -746,15 +827,16 @@ au1xxx_dbdma_chan_free(u32 chanid) kfree(ctp); } @@ -532,7 +532,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c intstat = dbdma_gptr->ddma_intstat; au_sync(); -@@ -773,18 +855,26 @@ +@@ -773,18 +855,26 @@ dbdma_interrupt(int irq, void *dev_id, s (ctp->chan_callback)(irq, ctp->chan_callparam, regs); ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); @@ -563,7 +563,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c "Au1xxx dbdma", (void *)dbdma_gptr)) printk("Can't get 1550 dbdma irq"); } -@@ -795,7 +885,8 @@ +@@ -795,7 +885,8 @@ au1xxx_dbdma_dump(u32 chanid) chan_tab_t *ctp; au1x_ddma_desc_t *dp; dbdev_tab_t *stp, *dtp; @@ -573,7 +573,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c ctp = *((chan_tab_t **)chanid); stp = ctp->chan_src; -@@ -820,15 +911,64 @@ +@@ -820,15 +911,64 @@ au1xxx_dbdma_dump(u32 chanid) dp = ctp->chan_desc_base; do { @@ -646,8 +646,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c 2007-12-15 05:19:44.786973303 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c @@ -0,0 +1,118 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -769,9 +769,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c +EXPORT_SYMBOL(au1xxx_gpio_read); Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/irq.c 2007-12-15 05:19:42.890865248 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/irq.c 2007-12-15 05:19:44.786973303 +0100 -@@ -303,8 +303,30 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/irq.c ++++ linux-2.4.35.4/arch/mips/au1000/common/irq.c +@@ -303,8 +303,30 @@ static struct hw_interrupt_type level_ir }; #ifdef CONFIG_PM @@ -803,7 +803,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c local_enable_irq(AU1000_TOY_MATCH2_INT); } #endif -@@ -508,6 +530,7 @@ +@@ -508,6 +530,7 @@ void intc0_req0_irqdispatch(struct pt_re if (!intc0_req0) return; @@ -811,7 +811,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c /* * Because of the tight timing of SETUP token to reply * transactions, the USB devices-side packet complete -@@ -518,6 +541,7 @@ +@@ -518,6 +541,7 @@ void intc0_req0_irqdispatch(struct pt_re do_IRQ(AU1000_USB_DEV_REQ_INT, regs); return; } @@ -819,7 +819,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c irq = au_ffs(intc0_req0) - 1; intc0_req0 &= ~(1<<irq); -@@ -536,17 +560,7 @@ +@@ -536,17 +560,7 @@ void intc0_req1_irqdispatch(struct pt_re irq = au_ffs(intc0_req1) - 1; intc0_req1 &= ~(1<<irq); @@ -840,9 +840,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile 2007-12-15 05:19:42.898865706 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/Makefile 2007-12-15 05:19:44.786973303 +0100 -@@ -19,9 +19,9 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/common/Makefile +@@ -19,9 +19,9 @@ O_TARGET := au1000.o export-objs = prom.o clocks.o power.o usbdev.o obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \ @@ -856,9 +856,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile obj-$(CONFIG_KGDB) += dbg_io.o Index: linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_fixup.c 2007-12-15 05:19:42.906866162 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c 2007-12-15 05:19:44.790973529 +0100 -@@ -75,9 +75,13 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_fixup.c ++++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c +@@ -75,9 +75,13 @@ void __init pcibios_fixup(void) #ifdef CONFIG_NONCOHERENT_IO /* @@ -876,9 +876,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_ops.c 2007-12-15 05:19:42.910866388 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c 2007-12-15 05:19:44.790973529 +0100 -@@ -162,6 +162,7 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_ops.c ++++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c +@@ -162,6 +162,7 @@ unsigned long last_entryLo0, last_entryL static int config_access(unsigned char access_type, struct pci_dev *dev, unsigned char where, u32 * data) { @@ -886,7 +886,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c #if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 ) unsigned char bus = dev->bus->number; unsigned int dev_fn = dev->devfn; -@@ -170,7 +171,6 @@ +@@ -170,7 +171,6 @@ static int config_access(unsigned char a unsigned long offset, status; unsigned long cfg_base; unsigned long flags; @@ -894,7 +894,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c unsigned long entryLo0, entryLo1; if (device > 19) { -@@ -205,9 +205,8 @@ +@@ -205,9 +205,8 @@ static int config_access(unsigned char a last_entryLo0 = last_entryLo1 = 0xffffffff; } @@ -906,7 +906,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c */ if (board_pci_idsel) { if (board_pci_idsel(device, 1) == 0) { -@@ -271,8 +270,11 @@ +@@ -271,8 +270,11 @@ static int config_access(unsigned char a } local_irq_restore(flags); @@ -921,8 +921,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c Index: linux-2.4.35.4/arch/mips/au1000/common/power.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c 2007-12-15 05:19:42.918866846 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/power.c 2007-12-15 05:19:44.790973529 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c ++++ linux-2.4.35.4/arch/mips/au1000/common/power.c @@ -50,7 +50,6 @@ static void calibrate_delay(void); @@ -931,7 +931,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c extern unsigned int get_au1x00_speed(void); extern unsigned long get_au1x00_uart_baud_base(void); extern void set_au1x00_uart_baud_base(unsigned long new_baud_base); -@@ -116,6 +115,7 @@ +@@ -116,6 +115,7 @@ save_core_regs(void) sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK); sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL); @@ -939,7 +939,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c /* Shutdown USB host/device. */ sleep_usbhost_enable = au_readl(USB_HOST_CONFIG); -@@ -127,6 +127,7 @@ +@@ -127,6 +127,7 @@ save_core_regs(void) sleep_usbdev_enable = au_readl(USBD_ENABLE); au_writel(0, USBD_ENABLE); au_sync(); @@ -947,7 +947,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c /* Save interrupt controller state. */ -@@ -212,14 +213,12 @@ +@@ -212,14 +213,12 @@ void wakeup_from_suspend(void) int au_sleep(void) { unsigned long wakeup, flags; @@ -963,7 +963,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c /** The code below is all system dependent and we should probably ** have a function call out of here to set this up. You need ** to configure the GPIO or timer interrupts that will bring -@@ -227,27 +226,26 @@ +@@ -227,27 +226,26 @@ int au_sleep(void) ** For testing, the TOY counter wakeup is useful. **/ @@ -996,7 +996,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c save_and_sleep(); /* after a wakeup, the cpu vectors back to 0x1fc00000 so -@@ -255,6 +253,7 @@ +@@ -255,6 +253,7 @@ int au_sleep(void) */ restore_core_regs(); spin_unlock_irqrestore(&pm_lock, flags); @@ -1004,7 +1004,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c return 0; } -@@ -285,7 +284,6 @@ +@@ -285,7 +284,6 @@ static int pm_do_sleep(ctl_table * ctl, if (retval) return retval; @@ -1012,7 +1012,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c au_sleep(); retval = pm_send_all(PM_RESUME, (void *) 0); } -@@ -296,7 +294,6 @@ +@@ -296,7 +294,6 @@ static int pm_do_suspend(ctl_table * ctl void *buffer, size_t * len) { int retval = 0; @@ -1020,7 +1020,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c if (!write) { *len = 0; -@@ -305,119 +302,9 @@ +@@ -305,119 +302,9 @@ static int pm_do_suspend(ctl_table * ctl if (retval) return retval; suspend_mode = 1; @@ -1141,7 +1141,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c return retval; } -@@ -425,7 +312,6 @@ +@@ -425,7 +312,6 @@ static int pm_do_freq(ctl_table * ctl, i static struct ctl_table pm_table[] = { {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend}, {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep}, @@ -1151,8 +1151,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c 2007-12-15 05:19:42.926867302 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/reset.c 2007-12-15 05:19:44.790973529 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c ++++ linux-2.4.35.4/arch/mips/au1000/common/reset.c @@ -37,8 +37,6 @@ #include <asm/system.h> #include <asm/au1000.h> @@ -1162,7 +1162,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c void au1000_restart(char *command) { /* Set all integrated peripherals to disabled states */ -@@ -144,6 +142,26 @@ +@@ -144,6 +142,26 @@ void au1000_restart(char *command) au_writel(0x00, 0xb1900064); /* sys_auxpll */ au_writel(0x00, 0xb1900100); /* sys_pininputen */ break; @@ -1189,7 +1189,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c default: break; -@@ -163,32 +181,23 @@ +@@ -163,32 +181,23 @@ void au1000_restart(char *command) void au1000_halt(void) { @@ -1235,9 +1235,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c } Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c 2007-12-15 05:19:42.934867757 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/setup.c 2007-12-15 05:19:44.794973758 +0100 -@@ -174,6 +174,40 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c ++++ linux-2.4.35.4/arch/mips/au1000/common/setup.c +@@ -174,6 +174,40 @@ void __init au1x00_setup(void) initrd_end = (unsigned long)&__rd_end; #endif @@ -1278,7 +1278,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c #if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE) #ifdef CONFIG_USB_OHCI if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) { -@@ -187,19 +221,38 @@ +@@ -187,19 +221,38 @@ void __init au1x00_setup(void) #endif #ifdef CONFIG_USB_OHCI @@ -1321,7 +1321,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c conswitchp = &dummy_con; #endif -@@ -209,8 +262,7 @@ +@@ -209,8 +262,7 @@ void __init au1x00_setup(void) #endif #ifdef CONFIG_BLK_DEV_IDE @@ -1333,8 +1333,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c #endif Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/sleeper.S 2007-12-15 05:19:42.938867986 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S 2007-12-15 05:19:44.794973758 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/sleeper.S ++++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S @@ -15,17 +15,48 @@ #include <asm/addrspace.h> #include <asm/regdef.h> @@ -1389,7 +1389,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S subu sp, PT_SIZE sw $1, PT_R1(sp) sw $2, PT_R2(sp) -@@ -34,14 +65,6 @@ +@@ -34,14 +65,6 @@ LEAF(save_and_sleep) sw $5, PT_R5(sp) sw $6, PT_R6(sp) sw $7, PT_R7(sp) @@ -1404,7 +1404,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S sw $16, PT_R16(sp) sw $17, PT_R17(sp) sw $18, PT_R18(sp) -@@ -50,32 +73,47 @@ +@@ -50,32 +73,47 @@ LEAF(save_and_sleep) sw $21, PT_R21(sp) sw $22, PT_R22(sp) sw $23, PT_R23(sp) @@ -1467,7 +1467,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S /* Put SDRAM into self refresh. Preload instructions into cache, * issue a precharge, then auto refresh, then sleep commands to it. -@@ -88,30 +126,65 @@ +@@ -88,30 +126,65 @@ LEAF(save_and_sleep) cache 0x14, 96(t0) .set mips0 @@ -1546,7 +1546,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S mtc0 k0, CP0_CONFIG lw $1, PT_R1(sp) lw $2, PT_R2(sp) -@@ -120,14 +193,6 @@ +@@ -120,14 +193,6 @@ sdsleep: lw $5, PT_R5(sp) lw $6, PT_R6(sp) lw $7, PT_R7(sp) @@ -1561,7 +1561,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S lw $16, PT_R16(sp) lw $17, PT_R17(sp) lw $18, PT_R18(sp) -@@ -136,15 +201,36 @@ +@@ -136,15 +201,36 @@ sdsleep: lw $21, PT_R21(sp) lw $22, PT_R22(sp) lw $23, PT_R23(sp) @@ -1605,8 +1605,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S + Index: linux-2.4.35.4/arch/mips/au1000/common/time.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c 2007-12-15 05:19:42.946868441 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/time.c 2007-12-15 05:19:44.794973758 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c ++++ linux-2.4.35.4/arch/mips/au1000/common/time.c @@ -50,7 +50,6 @@ #include <linux/mc146818rtc.h> #include <linux/timex.h> @@ -1615,7 +1615,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c extern void do_softirq(void); extern volatile unsigned long wall_jiffies; unsigned long missed_heart_beats = 0; -@@ -59,14 +58,14 @@ +@@ -59,14 +58,14 @@ static unsigned long r4k_offset; /* Amou static unsigned long r4k_cur; /* What counter should be at next timer irq */ extern rwlock_t xtime_lock; int no_au1xxx_32khz; @@ -1632,7 +1632,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c static unsigned long last_pc0, last_match20; #endif -@@ -385,7 +384,6 @@ +@@ -385,7 +384,6 @@ void __init au1xxx_timer_setup(void) { unsigned int est_freq; extern unsigned long (*do_gettimeoffset)(void); @@ -1640,7 +1640,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c printk("calculating r4koff... "); r4k_offset = cal_r4koff(); -@@ -437,9 +435,6 @@ +@@ -437,9 +435,6 @@ void __init au1xxx_timer_setup(void) au_writel(0, SYS_TOYWRITE); while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S); @@ -1650,7 +1650,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); /* setup match20 to interrupt once every 10ms */ -@@ -447,13 +442,13 @@ +@@ -447,13 +442,13 @@ void __init au1xxx_timer_setup(void) au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2); au_sync(); while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); @@ -1668,8 +1668,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c #else Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/board_setup.c 2007-12-15 05:19:42.954868897 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c 2007-12-15 05:19:44.794973758 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c @@ -46,10 +46,22 @@ #include <asm/au1000.h> #include <asm/db1x00.h> @@ -1696,7 +1696,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c void board_reset (void) { -@@ -57,6 +69,13 @@ +@@ -57,6 +69,13 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -1710,7 +1710,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c void __init board_setup(void) { u32 pin_func; -@@ -108,8 +127,42 @@ +@@ -108,8 +127,42 @@ void __init board_setup(void) au_writel(0x02000200, GPIO2_OUTPUT); #endif @@ -1755,9 +1755,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c #endif Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/irqmap.c 2007-12-15 05:19:42.962869352 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c 2007-12-15 05:19:44.794973758 +0100 -@@ -53,6 +53,7 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/irqmap.c ++++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c +@@ -53,6 +53,7 @@ au1xxx_irq_map_t au1xxx_irq_map[] = { #ifdef CONFIG_MIPS_DB1550 { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ# { AU1000_GPIO_5, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 1 IRQ# @@ -1767,9 +1767,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 STSCHG# Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/Makefile 2007-12-15 05:19:42.970869808 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile 2007-12-15 05:19:44.794973758 +0100 -@@ -17,4 +17,11 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile +@@ -17,4 +17,11 @@ O_TARGET := db1x00.o obj-y := init.o board_setup.o irqmap.o obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o @@ -1783,8 +1783,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c @@ -0,0 +1,126 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -1914,8 +1914,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c @@ -0,0 +1,270 @@ +/* ---------------------------------------------------------------------- + * mtwilson_keys.c @@ -2189,8 +2189,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c @@ -0,0 +1,261 @@ +/* + * Copyright (C) 2003 Metrowerks, All Rights Reserved. @@ -2455,8 +2455,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c +module_exit(au1xxx_dock_exit); Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c @@ -0,0 +1,226 @@ +/* + * @@ -2686,8 +2686,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c @@ -0,0 +1,76 @@ +/* + * @@ -2767,8 +2767,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c @@ -0,0 +1,61 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -2833,8 +2833,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile @@ -0,0 +1,25 @@ +# +# Copyright 2000 MontaVista Software Inc. @@ -2863,9 +2863,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile +include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/board_setup.c 2007-12-15 05:19:43.014872316 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c 2007-12-15 05:19:44.802974213 +0100 -@@ -51,12 +51,19 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c +@@ -51,12 +51,19 @@ void board_reset (void) { } @@ -2887,8 +2887,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000); Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c @@ -0,0 +1,308 @@ +/* + * Copyright (C) 2003 Metrowerks, All Rights Reserved. @@ -3200,9 +3200,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c +module_exit(hydrogen3_buttons_exit); Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/Makefile 2007-12-15 05:19:43.026873001 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile 2007-12-15 05:19:44.802974213 +0100 -@@ -14,6 +14,11 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile +@@ -14,6 +14,11 @@ USE_STANDARD_AS_RULE := true O_TARGET := hydrogen3.o @@ -3217,8 +3217,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c @@ -0,0 +1,89 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -3311,8 +3311,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c + Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/board_setup.c 2007-12-15 05:19:43.038873685 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c 2007-12-15 05:19:44.806974443 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c @@ -48,6 +48,12 @@ extern struct rtc_ops no_rtc_ops; @@ -3328,9 +3328,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c rtc_ops = &no_rtc_ops; Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/irqmap.c 2007-12-15 05:19:43.046874140 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c 2007-12-15 05:19:44.806974443 +0100 -@@ -72,10 +72,10 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/irqmap.c ++++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c +@@ -72,10 +72,10 @@ au1xxx_pci_irqmap(struct pci_dev *dev, u * A B C D */ { @@ -3347,9 +3347,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c return PCI_IRQ_TABLE_LOOKUP; Index: linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1000/board_setup.c 2007-12-15 05:19:43.054874596 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c 2007-12-15 05:19:44.806974443 +0100 -@@ -58,6 +58,10 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1000/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c +@@ -58,6 +58,10 @@ void board_reset (void) { } @@ -3362,9 +3362,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c u32 pin_func, static_cfg0; Index: linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/board_setup.c 2007-12-15 05:19:43.062875051 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c 2007-12-15 05:19:44.806974443 +0100 -@@ -62,6 +62,10 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c +@@ -62,6 +62,10 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -3377,9 +3377,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c u32 pin_func; Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/Makefile 2007-12-15 05:19:43.070875507 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile 2007-12-15 05:19:44.806974443 +0100 -@@ -16,4 +16,10 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile +@@ -16,4 +16,10 @@ O_TARGET := pb1100.o obj-y := init.o board_setup.o irqmap.o @@ -3392,8 +3392,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c 2007-12-15 05:19:44.806974443 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c @@ -0,0 +1,126 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -3523,8 +3523,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c @@ -0,0 +1,221 @@ +/* + * @@ -3749,8 +3749,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c @@ -0,0 +1,72 @@ +/* + * @@ -3826,8 +3826,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c @@ -0,0 +1,180 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -4011,8 +4011,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile @@ -0,0 +1,25 @@ +# +# Copyright 2000 MontaVista Software Inc. @@ -4041,8 +4041,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile +include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c @@ -0,0 +1,141 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -4187,9 +4187,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1500/board_setup.c 2007-12-15 05:19:43.110877786 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c 2007-12-15 05:19:44.810974669 +0100 -@@ -62,6 +62,10 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1500/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c +@@ -62,6 +62,10 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -4202,8 +4202,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c u32 pin_func; Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/board_setup.c 2007-12-15 05:19:43.118878244 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c 2007-12-15 05:19:44.814974898 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/board_setup.c ++++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c @@ -48,12 +48,31 @@ extern struct rtc_ops no_rtc_ops; @@ -4236,7 +4236,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c void __init board_setup(void) { u32 pin_func; -@@ -78,5 +97,36 @@ +@@ -78,5 +97,36 @@ void __init board_setup(void) au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */ au_sync(); @@ -4275,8 +4275,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c } Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c 2007-12-15 05:19:43.126878700 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c 2007-12-15 05:19:44.814974898 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c ++++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c @@ -50,6 +50,9 @@ au1xxx_irq_map_t au1xxx_irq_map[] = { { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, @@ -4289,9 +4289,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); Index: linux-2.4.35.4/arch/mips/config-shared.in =================================================================== ---- linux-2.4.35.4.orig/arch/mips/config-shared.in 2007-12-15 05:19:43.134879155 +0100 -+++ linux-2.4.35.4/arch/mips/config-shared.in 2007-12-15 05:19:44.814974898 +0100 -@@ -21,16 +21,19 @@ +--- linux-2.4.35.4.orig/arch/mips/config-shared.in ++++ linux-2.4.35.4/arch/mips/config-shared.in +@@ -21,16 +21,19 @@ mainmenu_option next_comment comment 'Machine selection' dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32 @@ -4312,7 +4312,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in dep_bool 'Support for MyCable XXS1500 board' CONFIG_MIPS_XXS1500 $CONFIG_MIPS32 dep_bool 'Support for 4G Systems MTX-1 board' CONFIG_MIPS_MTX1 $CONFIG_MIPS32 dep_bool 'Support for Cogent CSB250 board' CONFIG_COGENT_CSB250 $CONFIG_MIPS32 -@@ -249,6 +252,12 @@ +@@ -249,6 +252,12 @@ if [ "$CONFIG_MIPS_MIRAGE" = "y" ]; then define_bool CONFIG_PC_KEYB y define_bool CONFIG_NONCOHERENT_IO y fi @@ -4325,7 +4325,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in if [ "$CONFIG_MIPS_BOSPORUS" = "y" ]; then define_bool CONFIG_SOC_AU1X00 y define_bool CONFIG_SOC_AU1500 y -@@ -263,6 +272,12 @@ +@@ -263,6 +272,12 @@ if [ "$CONFIG_MIPS_PB1000" = "y" ]; then define_bool CONFIG_SWAP_IO_SPACE_W y define_bool CONFIG_SWAP_IO_SPACE_L y fi @@ -4338,7 +4338,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in if [ "$CONFIG_MIPS_PB1100" = "y" ]; then define_bool CONFIG_SOC_AU1X00 y define_bool CONFIG_SOC_AU1100 y -@@ -271,9 +286,15 @@ +@@ -271,9 +286,15 @@ if [ "$CONFIG_MIPS_PB1100" = "y" ]; then define_bool CONFIG_SWAP_IO_SPACE_W y define_bool CONFIG_SWAP_IO_SPACE_L y fi @@ -4356,7 +4356,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in define_bool CONFIG_NONCOHERENT_IO y define_bool CONFIG_PC_KEYB y fi -@@ -290,18 +311,24 @@ +@@ -290,18 +311,24 @@ if [ "$CONFIG_MIPS_DB1500" = "y" ]; then define_bool CONFIG_NONCOHERENT_IO y define_bool CONFIG_PC_KEYB y fi @@ -4384,7 +4384,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in fi if [ "$CONFIG_MIPS_HYDROGEN3" = "y" ]; then define_bool CONFIG_SOC_AU1X00 y -@@ -327,12 +354,6 @@ +@@ -327,12 +354,6 @@ if [ "$CONFIG_COGENT_CSB250" = "y" ]; th define_bool CONFIG_NONCOHERENT_IO y define_bool CONFIG_PC_KEYB y fi @@ -4397,7 +4397,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in if [ "$CONFIG_MIPS_COBALT" = "y" ]; then define_bool CONFIG_BOOT_ELF32 y define_bool CONFIG_COBALT_LCD y -@@ -729,6 +750,13 @@ +@@ -729,6 +750,13 @@ if [ "$CONFIG_ACER_PICA_61" = "y" -o \ "$CONFIG_MIPS_PB1000" = "y" -o \ "$CONFIG_MIPS_PB1100" = "y" -o \ "$CONFIG_MIPS_PB1500" = "y" -o \ @@ -4413,9 +4413,9 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in "$CONFIG_NINO" = "y" -o \ Index: linux-2.4.35.4/arch/mips/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig 2007-12-15 05:19:43.142879610 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig 2007-12-15 05:19:44.814974898 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig ++++ linux-2.4.35.4/arch/mips/defconfig +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4425,7 +4425,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4437,7 +4437,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -319,9 +314,11 @@ +@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -4449,7 +4449,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -465,7 +462,6 @@ +@@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4459,9 +4459,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig Index: linux-2.4.35.4/arch/mips/defconfig-atlas =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-atlas 2007-12-15 05:19:43.150880066 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-atlas 2007-12-15 05:19:44.818975127 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-atlas ++++ linux-2.4.35.4/arch/mips/defconfig-atlas +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4471,7 +4471,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4483,7 +4483,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -317,9 +312,11 @@ +@@ -317,9 +312,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -4495,7 +4495,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -528,7 +525,6 @@ +@@ -528,7 +525,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4505,9 +4505,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas Index: linux-2.4.35.4/arch/mips/defconfig-bosporus =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus 2007-12-15 05:19:43.158880524 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-bosporus 2007-12-15 05:19:44.818975127 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus ++++ linux-2.4.35.4/arch/mips/defconfig-bosporus +@@ -30,8 +30,8 @@ CONFIG_MIPS_BOSPORUS=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4517,7 +4517,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -208,9 +208,7 @@ +@@ -208,9 +208,7 @@ CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_BOSPORUS=y # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -4527,7 +4527,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -229,7 +227,6 @@ +@@ -229,7 +227,6 @@ CONFIG_MTD_BOSPORUS=y # # Disk-On-Chip Device Drivers # @@ -4535,7 +4535,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -373,11 +370,6 @@ +@@ -373,11 +370,6 @@ CONFIG_IP_NF_MANGLE=m # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4547,7 +4547,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -457,9 +449,11 @@ +@@ -457,9 +449,11 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -4559,7 +4559,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -681,7 +675,6 @@ +@@ -681,7 +675,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4569,9 +4569,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus Index: linux-2.4.35.4/arch/mips/defconfig-capcella =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-capcella 2007-12-15 05:19:43.162880750 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-capcella 2007-12-15 05:19:44.818975127 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-capcella ++++ linux-2.4.35.4/arch/mips/defconfig-capcella +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4581,7 +4581,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -228,11 +228,6 @@ +@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4593,7 +4593,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -472,7 +467,6 @@ +@@ -472,7 +467,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4603,9 +4603,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-cobalt =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-cobalt 2007-12-15 05:19:43.170881205 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-cobalt 2007-12-15 05:19:44.818975127 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-cobalt ++++ linux-2.4.35.4/arch/mips/defconfig-cobalt +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4615,7 +4615,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -222,11 +222,6 @@ +@@ -222,11 +222,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4627,7 +4627,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -505,7 +500,6 @@ +@@ -505,7 +500,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4637,9 +4637,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt Index: linux-2.4.35.4/arch/mips/defconfig-csb250 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-csb250 2007-12-15 05:19:43.178881664 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-csb250 2007-12-15 05:19:44.818975127 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-csb250 ++++ linux-2.4.35.4/arch/mips/defconfig-csb250 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4649,7 +4649,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set CONFIG_COGENT_CSB250=y -@@ -268,11 +268,6 @@ +@@ -268,11 +268,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4661,7 +4661,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -556,7 +551,6 @@ +@@ -556,7 +551,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4671,9 +4671,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 Index: linux-2.4.35.4/arch/mips/defconfig-db1000 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1000 2007-12-15 05:19:43.186882119 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1000 2007-12-15 05:19:44.822975353 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1000 ++++ linux-2.4.35.4/arch/mips/defconfig-db1000 +@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1000=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4683,7 +4683,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -214,11 +214,7 @@ +@@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -4695,7 +4695,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -237,7 +233,6 @@ +@@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y # # Disk-On-Chip Device Drivers # @@ -4703,7 +4703,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -342,11 +337,6 @@ +@@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4715,7 +4715,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -636,7 +626,6 @@ +@@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4725,9 +4725,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 Index: linux-2.4.35.4/arch/mips/defconfig-db1100 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1100 2007-12-15 05:19:43.190882345 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1100 2007-12-15 05:19:44.822975353 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1100 ++++ linux-2.4.35.4/arch/mips/defconfig-db1100 +@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1100=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4737,7 +4737,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -214,11 +214,7 @@ +@@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -4749,7 +4749,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -237,7 +233,6 @@ +@@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y # # Disk-On-Chip Device Drivers # @@ -4757,7 +4757,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -342,11 +337,6 @@ +@@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4769,7 +4769,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -636,7 +626,6 @@ +@@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4777,7 +4777,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -884,6 +873,7 @@ +@@ -884,6 +873,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CYBER2000 is not set @@ -4785,7 +4785,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_FB_MATROX is not set # CONFIG_FB_ATY is not set # CONFIG_FB_RADEON is not set -@@ -895,7 +885,6 @@ +@@ -895,7 +885,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_E1356 is not set @@ -4795,8 +4795,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 CONFIG_FBCON_ADVANCED=y Index: linux-2.4.35.4/arch/mips/defconfig-db1200 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/defconfig-db1200 2007-12-15 05:19:44.822975353 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/defconfig-db1200 @@ -0,0 +1,1032 @@ +# +# Automatically generated make config: don't edit @@ -5832,9 +5832,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1200 +# CONFIG_FW_LOADER is not set Index: linux-2.4.35.4/arch/mips/defconfig-db1500 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1500 2007-12-15 05:19:43.202883030 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1500 2007-12-15 05:19:44.826975582 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1500 ++++ linux-2.4.35.4/arch/mips/defconfig-db1500 +@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1500=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -5844,7 +5844,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -267,11 +267,6 @@ +@@ -267,11 +267,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5856,7 +5856,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -555,7 +550,6 @@ +@@ -555,7 +550,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -5866,9 +5866,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 Index: linux-2.4.35.4/arch/mips/defconfig-db1550 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1550 2007-12-15 05:19:43.210883485 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1550 2007-12-15 05:19:44.826975582 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1550 ++++ linux-2.4.35.4/arch/mips/defconfig-db1550 +@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1550=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -5878,7 +5878,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,11 +213,9 @@ +@@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -5890,7 +5890,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y # # Disk-On-Chip Device Drivers # @@ -5898,7 +5898,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -343,11 +340,6 @@ +@@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5910,7 +5910,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -633,7 +625,6 @@ +@@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -5920,9 +5920,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476 2007-12-15 05:19:43.218883943 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ddb5476 2007-12-15 05:19:44.826975582 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476 ++++ linux-2.4.35.4/arch/mips/defconfig-ddb5476 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -5932,7 +5932,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5944,7 +5944,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -517,7 +512,6 @@ +@@ -517,7 +512,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -5954,9 +5954,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477 2007-12-15 05:19:43.226884399 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ddb5477 2007-12-15 05:19:44.826975582 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477 ++++ linux-2.4.35.4/arch/mips/defconfig-ddb5477 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -5966,7 +5966,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5978,7 +5978,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -434,7 +429,6 @@ +@@ -434,7 +429,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -5988,9 +5988,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 Index: linux-2.4.35.4/arch/mips/defconfig-decstation =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-decstation 2007-12-15 05:19:43.234884854 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-decstation 2007-12-15 05:19:44.826975582 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-decstation ++++ linux-2.4.35.4/arch/mips/defconfig-decstation +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6000,7 +6000,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -223,11 +223,6 @@ +@@ -223,11 +223,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6012,7 +6012,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -306,9 +301,11 @@ +@@ -306,9 +301,11 @@ CONFIG_SCSI_DECNCR=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -6024,7 +6024,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +474,6 @@ +@@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y CONFIG_SERIAL_DEC_CONSOLE=y CONFIG_DZ=y CONFIG_ZS=y @@ -6034,9 +6034,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation Index: linux-2.4.35.4/arch/mips/defconfig-e55 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-e55 2007-12-15 05:19:43.242885309 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-e55 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-e55 ++++ linux-2.4.35.4/arch/mips/defconfig-e55 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6046,7 +6046,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -222,11 +222,6 @@ +@@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6058,7 +6058,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -426,7 +421,6 @@ +@@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y # CONFIG_SERIAL_MULTIPORT is not set # CONFIG_HUB6 is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6068,9 +6068,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-eagle =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-eagle 2007-12-15 05:19:43.246885538 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-eagle 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-eagle ++++ linux-2.4.35.4/arch/mips/defconfig-eagle +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6080,7 +6080,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -208,8 +208,8 @@ +@@ -208,8 +208,8 @@ CONFIG_MTD_CFI_INTELEXT=y # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y @@ -6091,7 +6091,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set -@@ -217,9 +217,7 @@ +@@ -217,9 +217,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -6101,7 +6101,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -238,7 +236,6 @@ +@@ -238,7 +236,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # # Disk-On-Chip Device Drivers # @@ -6109,7 +6109,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -327,11 +324,6 @@ +@@ -327,11 +324,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6121,7 +6121,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -587,7 +579,6 @@ +@@ -587,7 +579,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6131,9 +6131,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ev64120 2007-12-15 05:19:43.254885994 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ev64120 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ev64120 ++++ linux-2.4.35.4/arch/mips/defconfig-ev64120 +@@ -30,8 +30,8 @@ CONFIG_MODULES=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6143,7 +6143,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -230,11 +230,6 @@ +@@ -230,11 +230,6 @@ CONFIG_IP_PNP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6155,7 +6155,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -443,7 +438,6 @@ +@@ -443,7 +438,6 @@ CONFIG_SERIAL=y # CONFIG_SERIAL_CONSOLE is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6165,9 +6165,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100 2007-12-15 05:19:43.262886449 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ev96100 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100 ++++ linux-2.4.35.4/arch/mips/defconfig-ev96100 +@@ -30,8 +30,8 @@ CONFIG_MODULES=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6177,7 +6177,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -232,11 +232,6 @@ +@@ -232,11 +232,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6189,7 +6189,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -441,7 +436,6 @@ +@@ -441,7 +436,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6199,8 +6199,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/defconfig-ficmmp 2007-12-15 05:19:44.834976038 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/defconfig-ficmmp @@ -0,0 +1,862 @@ +# +# Automatically generated make config: don't edit @@ -7066,9 +7066,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp +CONFIG_ZLIB_DEFLATE=m Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-hp-lj 2007-12-15 05:19:43.274887133 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-hp-lj 2007-12-15 05:19:44.834976038 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-hp-lj ++++ linux-2.4.35.4/arch/mips/defconfig-hp-lj +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7078,7 +7078,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -184,8 +184,8 @@ +@@ -184,8 +184,8 @@ CONFIG_MTD_CFI_AMDSTD=y # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y @@ -7089,7 +7089,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set -@@ -193,9 +193,7 @@ +@@ -193,9 +193,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7099,7 +7099,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -214,7 +212,6 @@ +@@ -214,7 +212,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # # Disk-On-Chip Device Drivers # @@ -7107,7 +7107,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -304,11 +301,6 @@ +@@ -304,11 +301,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7119,7 +7119,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -604,7 +596,6 @@ +@@ -604,7 +596,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7129,9 +7129,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3 2007-12-15 05:19:43.282887589 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3 2007-12-15 05:19:44.834976038 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3 ++++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7141,7 +7141,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -214,9 +214,7 @@ +@@ -214,9 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7151,7 +7151,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -235,7 +233,6 @@ +@@ -235,7 +233,6 @@ CONFIG_MTD_HYDROGEN3=y # # Disk-On-Chip Device Drivers # @@ -7159,7 +7159,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -340,11 +337,6 @@ +@@ -340,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7171,7 +7171,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -590,7 +582,6 @@ +@@ -590,7 +582,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7179,7 +7179,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -838,6 +829,7 @@ +@@ -838,6 +829,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CYBER2000 is not set @@ -7187,7 +7187,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_FB_MATROX is not set # CONFIG_FB_ATY is not set # CONFIG_FB_RADEON is not set -@@ -849,7 +841,6 @@ +@@ -849,7 +841,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_E1356 is not set @@ -7197,9 +7197,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 CONFIG_FBCON_ADVANCED=y Index: linux-2.4.35.4/arch/mips/defconfig-ip22 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ip22 2007-12-15 05:19:43.290888044 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ip22 2007-12-15 05:19:44.834976038 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ip22 ++++ linux-2.4.35.4/arch/mips/defconfig-ip22 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7209,7 +7209,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7221,7 +7221,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -319,9 +314,11 @@ +@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -7233,7 +7233,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -465,7 +462,6 @@ +@@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7243,9 +7243,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 Index: linux-2.4.35.4/arch/mips/defconfig-it8172 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-it8172 2007-12-15 05:19:43.294888273 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-it8172 2007-12-15 05:19:44.838976267 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-it8172 ++++ linux-2.4.35.4/arch/mips/defconfig-it8172 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7255,7 +7255,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -186,8 +186,8 @@ +@@ -186,8 +186,8 @@ CONFIG_MTD_CFI_INTELEXT=y # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y @@ -7266,7 +7266,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set -@@ -195,9 +195,7 @@ +@@ -195,9 +195,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7276,7 +7276,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -216,7 +214,6 @@ +@@ -216,7 +214,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # # Disk-On-Chip Device Drivers # @@ -7284,7 +7284,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -304,11 +301,6 @@ +@@ -304,11 +301,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7296,7 +7296,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -592,7 +584,6 @@ +@@ -592,7 +584,6 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_PC_KEYB=y # CONFIG_IT8172_SCR0 is not set # CONFIG_IT8172_SCR1 is not set @@ -7306,9 +7306,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 Index: linux-2.4.35.4/arch/mips/defconfig-ivr =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ivr 2007-12-15 05:19:43.302888729 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ivr 2007-12-15 05:19:44.838976267 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ivr ++++ linux-2.4.35.4/arch/mips/defconfig-ivr +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7318,7 +7318,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7330,7 +7330,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -516,7 +511,6 @@ +@@ -516,7 +511,6 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_QTRONIX_KEYBOARD=y CONFIG_IT8172_CIR=y # CONFIG_IT8172_SCR0 is not set @@ -7340,9 +7340,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927 2007-12-15 05:19:43.310889184 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-jmr3927 2007-12-15 05:19:44.838976267 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927 ++++ linux-2.4.35.4/arch/mips/defconfig-jmr3927 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7352,7 +7352,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -225,11 +225,6 @@ +@@ -225,11 +225,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7364,7 +7364,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -454,7 +449,6 @@ +@@ -454,7 +449,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9_CONSOLE is not set CONFIG_TXX927_SERIAL=y CONFIG_TXX927_SERIAL_CONSOLE=y @@ -7374,9 +7374,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # Index: linux-2.4.35.4/arch/mips/defconfig-lasat =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-lasat 2007-12-15 05:19:43.318889642 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-lasat 2007-12-15 05:19:44.838976267 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-lasat ++++ linux-2.4.35.4/arch/mips/defconfig-lasat +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7386,7 +7386,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -198,9 +198,7 @@ +@@ -198,9 +198,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7396,7 +7396,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -219,7 +217,6 @@ +@@ -219,7 +217,6 @@ CONFIG_MTD_LASAT=y # # Disk-On-Chip Device Drivers # @@ -7404,7 +7404,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -303,11 +300,6 @@ +@@ -303,11 +300,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7416,7 +7416,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -584,7 +576,6 @@ +@@ -584,7 +576,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7426,9 +7426,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat Index: linux-2.4.35.4/arch/mips/defconfig-malta =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-malta 2007-12-15 05:19:43.322889868 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-malta 2007-12-15 05:19:44.842976493 +0100 -@@ -22,16 +22,19 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-malta ++++ linux-2.4.35.4/arch/mips/defconfig-malta +@@ -22,16 +22,19 @@ CONFIG_KMOD=y # # CONFIG_ACER_PICA_61 is not set # CONFIG_MIPS_BOSPORUS is not set @@ -7449,7 +7449,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -237,11 +240,6 @@ +@@ -237,11 +240,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7461,7 +7461,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -273,8 +271,83 @@ +@@ -273,8 +271,83 @@ CONFIG_IP_PNP_BOOTP=y # # ATA/IDE/MFM/RLL support # @@ -7546,7 +7546,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # # SCSI support -@@ -319,9 +392,11 @@ +@@ -319,9 +392,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -7558,7 +7558,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -524,7 +599,6 @@ +@@ -524,7 +599,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7568,9 +7568,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta Index: linux-2.4.35.4/arch/mips/defconfig-mirage =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mirage 2007-12-15 05:19:43.330890324 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-mirage 2007-12-15 05:19:44.842976493 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-mirage ++++ linux-2.4.35.4/arch/mips/defconfig-mirage +@@ -30,8 +30,8 @@ CONFIG_MIPS_MIRAGE=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7580,7 +7580,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -209,9 +209,7 @@ +@@ -209,9 +209,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7590,7 +7590,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage CONFIG_MTD_MIRAGE=y # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -230,7 +228,6 @@ +@@ -230,7 +228,6 @@ CONFIG_MTD_MIRAGE=y # # Disk-On-Chip Device Drivers # @@ -7598,7 +7598,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -335,11 +332,6 @@ +@@ -335,11 +332,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7610,7 +7610,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -560,7 +552,6 @@ +@@ -560,7 +552,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7620,9 +7620,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x 2007-12-15 05:19:43.338890782 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-mpc30x 2007-12-15 05:19:44.842976493 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x ++++ linux-2.4.35.4/arch/mips/defconfig-mpc30x +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7632,7 +7632,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -228,11 +228,6 @@ +@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7644,7 +7644,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -400,7 +395,6 @@ +@@ -400,7 +395,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7654,9 +7654,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mtx-1 2007-12-15 05:19:43.346891237 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-mtx-1 2007-12-15 05:19:44.842976493 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-mtx-1 ++++ linux-2.4.35.4/arch/mips/defconfig-mtx-1 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7666,7 +7666,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_MIPS_XXS1500 is not set CONFIG_MIPS_MTX1=y # CONFIG_COGENT_CSB250 is not set -@@ -193,9 +193,7 @@ +@@ -193,9 +193,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set CONFIG_MTD_MTX1=y @@ -7676,7 +7676,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -214,7 +212,6 @@ +@@ -214,7 +212,6 @@ CONFIG_MTD_MTX1=y # # Disk-On-Chip Device Drivers # @@ -7684,7 +7684,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -371,11 +368,6 @@ +@@ -371,11 +368,6 @@ CONFIG_VLAN_8021Q=m # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7696,7 +7696,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_DECNET is not set CONFIG_BRIDGE=m # CONFIG_X25 is not set -@@ -479,9 +471,11 @@ +@@ -479,9 +471,11 @@ CONFIG_SR_EXTRA_DEVS=2 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -7708,7 +7708,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -700,7 +694,6 @@ +@@ -700,7 +694,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7718,9 +7718,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 Index: linux-2.4.35.4/arch/mips/defconfig-nino =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-nino 2007-12-15 05:19:43.354891693 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-nino 2007-12-15 05:19:44.846976722 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-nino ++++ linux-2.4.35.4/arch/mips/defconfig-nino +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7730,7 +7730,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7742,7 +7742,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -339,7 +334,6 @@ +@@ -339,7 +334,6 @@ CONFIG_SERIAL_TX3912_CONSOLE=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -7752,9 +7752,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # Index: linux-2.4.35.4/arch/mips/defconfig-ocelot =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot 2007-12-15 05:19:43.358891922 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ocelot 2007-12-15 05:19:44.846976722 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot ++++ linux-2.4.35.4/arch/mips/defconfig-ocelot +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7764,7 +7764,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -194,9 +194,7 @@ +@@ -194,9 +194,7 @@ CONFIG_MTD_JEDEC=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7774,7 +7774,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set CONFIG_MTD_OCELOT=y -@@ -215,7 +213,6 @@ +@@ -215,7 +213,6 @@ CONFIG_MTD_OCELOT=y # # Disk-On-Chip Device Drivers # @@ -7782,7 +7782,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot CONFIG_MTD_DOC2000=y # CONFIG_MTD_DOC2001 is not set CONFIG_MTD_DOCPROBE=y -@@ -307,11 +304,6 @@ +@@ -307,11 +304,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7794,7 +7794,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -513,7 +505,6 @@ +@@ -513,7 +505,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7804,9 +7804,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot Index: linux-2.4.35.4/arch/mips/defconfig-osprey =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-osprey 2007-12-15 05:19:43.366892377 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-osprey 2007-12-15 05:19:44.846976722 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-osprey ++++ linux-2.4.35.4/arch/mips/defconfig-osprey +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7816,7 +7816,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -227,11 +227,6 @@ +@@ -227,11 +227,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7828,7 +7828,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -388,7 +383,6 @@ +@@ -388,7 +383,6 @@ CONFIG_SERIAL_MANY_PORTS=y # CONFIG_SERIAL_MULTIPORT is not set # CONFIG_HUB6 is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7838,9 +7838,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1000 2007-12-15 05:19:43.374892832 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1000 2007-12-15 05:19:44.846976722 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1000 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1000 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y CONFIG_MIPS_PB1000=y # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7850,7 +7850,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -215,9 +215,7 @@ +@@ -215,9 +215,7 @@ CONFIG_MTD_PB1000=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7860,7 +7860,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1000=y # # Disk-On-Chip Device Drivers # @@ -7868,7 +7868,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -324,11 +321,6 @@ +@@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7880,7 +7880,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -622,7 +614,6 @@ +@@ -622,7 +614,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7888,7 +7888,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -707,7 +698,7 @@ +@@ -707,7 +698,7 @@ CONFIG_UNIX98_PTY_COUNT=256 # # CONFIG_PCMCIA_SERIAL_CS is not set # CONFIG_SYNCLINK_CS is not set @@ -7899,9 +7899,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100 2007-12-15 05:19:43.382893288 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1100 2007-12-15 05:19:44.850976948 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1100 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set CONFIG_MIPS_PB1100=y # CONFIG_MIPS_PB1500 is not set @@ -7911,7 +7911,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -198,9 +198,7 @@ +@@ -198,9 +198,7 @@ CONFIG_MTD_PB1100=y # CONFIG_MTD_MTX1 is not set CONFIG_MTD_PB1500_BOOT=y CONFIG_MTD_PB1500_USER=y @@ -7921,7 +7921,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -219,7 +217,6 @@ +@@ -219,7 +217,6 @@ CONFIG_MTD_PB1500_USER=y # # Disk-On-Chip Device Drivers # @@ -7929,7 +7929,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -324,11 +321,6 @@ +@@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7941,7 +7941,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -613,7 +605,6 @@ +@@ -613,7 +605,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7949,7 +7949,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -859,6 +850,7 @@ +@@ -859,6 +850,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CYBER2000 is not set @@ -7957,7 +7957,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_FB_MATROX is not set # CONFIG_FB_ATY is not set # CONFIG_FB_RADEON is not set -@@ -870,7 +862,6 @@ +@@ -870,7 +862,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_E1356 is not set @@ -7967,8 +7967,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 CONFIG_FBCON_ADVANCED=y Index: linux-2.4.35.4/arch/mips/defconfig-pb1200 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1200 2007-12-15 05:19:44.850976948 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/defconfig-pb1200 @@ -0,0 +1,1060 @@ +# +# Automatically generated make config: don't edit @@ -9032,9 +9032,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1200 +# CONFIG_FW_LOADER is not set Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1500 2007-12-15 05:19:43.394893972 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1500 2007-12-15 05:19:44.850976948 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1500 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1500 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set CONFIG_MIPS_PB1500=y @@ -9044,7 +9044,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -215,9 +215,7 @@ +@@ -215,9 +215,7 @@ CONFIG_MTD_PB1500=y # CONFIG_MTD_MTX1 is not set CONFIG_MTD_PB1500_BOOT=y # CONFIG_MTD_PB1500_USER is not set @@ -9054,7 +9054,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1500_BOOT=y # # Disk-On-Chip Device Drivers # @@ -9062,7 +9062,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -341,11 +338,6 @@ +@@ -341,11 +338,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9074,7 +9074,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -675,7 +667,6 @@ +@@ -675,7 +667,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9084,9 +9084,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550 2007-12-15 05:19:43.402894428 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1550 2007-12-15 05:19:44.854977177 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1550 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9096,7 +9096,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,11 +213,9 @@ +@@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -9108,7 +9108,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y # # Disk-On-Chip Device Drivers # @@ -9116,7 +9116,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -343,11 +340,6 @@ +@@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9128,7 +9128,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -633,7 +625,6 @@ +@@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9138,9 +9138,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927 2007-12-15 05:19:43.406894657 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927 2007-12-15 05:19:44.854977177 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927 ++++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9150,7 +9150,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -223,11 +223,6 @@ +@@ -223,11 +223,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9162,7 +9162,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -466,7 +461,6 @@ +@@ -466,7 +461,6 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_TXX9=y CONFIG_SERIAL_TXX9_CONSOLE=y # CONFIG_TXX927_SERIAL is not set @@ -9172,9 +9172,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # Index: linux-2.4.35.4/arch/mips/defconfig-rm200 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-rm200 2007-12-15 05:19:43.414895112 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-rm200 2007-12-15 05:19:44.854977177 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-rm200 ++++ linux-2.4.35.4/arch/mips/defconfig-rm200 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9184,7 +9184,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -229,11 +229,6 @@ +@@ -229,11 +229,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9196,7 +9196,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -340,7 +335,6 @@ +@@ -340,7 +335,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9206,9 +9206,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm 2007-12-15 05:19:43.422895567 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm 2007-12-15 05:19:44.854977177 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm ++++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9218,7 +9218,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -90,6 +90,7 @@ +@@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_TBPROF is not set CONFIG_SIBYTE_GENBUS_IDE=y CONFIG_SMP_CAPABLE=y @@ -9226,7 +9226,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm # CONFIG_SNI_RM200_PCI is not set # CONFIG_TANBAC_TB0226 is not set # CONFIG_TANBAC_TB0229 is not set -@@ -253,11 +254,6 @@ +@@ -253,11 +254,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9238,7 +9238,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -469,7 +465,6 @@ +@@ -469,7 +465,6 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SIBYTE_SB1250_DUART=y CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y CONFIG_SERIAL_CONSOLE=y @@ -9248,9 +9248,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm Index: linux-2.4.35.4/arch/mips/defconfig-sead =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-sead 2007-12-15 05:19:43.430896023 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-sead 2007-12-15 05:19:44.854977177 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-sead ++++ linux-2.4.35.4/arch/mips/defconfig-sead +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9260,7 +9260,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sead # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -244,7 +244,6 @@ +@@ -244,7 +244,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9270,9 +9270,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sead # Index: linux-2.4.35.4/arch/mips/defconfig-stretch =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-stretch 2007-12-15 05:19:43.438896481 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-stretch 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-stretch ++++ linux-2.4.35.4/arch/mips/defconfig-stretch +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9282,7 +9282,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -240,11 +240,6 @@ +@@ -240,11 +240,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9294,7 +9294,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -324,9 +319,11 @@ +@@ -324,9 +319,11 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -9306,7 +9306,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -516,7 +513,6 @@ +@@ -516,7 +513,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -9316,9 +9316,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226 2007-12-15 05:19:43.442896707 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-tb0226 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226 ++++ linux-2.4.35.4/arch/mips/defconfig-tb0226 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9328,7 +9328,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -228,11 +228,6 @@ +@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9340,7 +9340,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -312,9 +307,11 @@ +@@ -312,9 +307,11 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -9352,7 +9352,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -518,7 +515,6 @@ +@@ -518,7 +515,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9362,9 +9362,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-tb0229 2007-12-15 05:19:43.450897163 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-tb0229 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0229 ++++ linux-2.4.35.4/arch/mips/defconfig-tb0229 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9374,7 +9374,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -230,11 +230,6 @@ +@@ -230,11 +230,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9386,7 +9386,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -445,7 +440,6 @@ +@@ -445,7 +440,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9396,9 +9396,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ti1500 2007-12-15 05:19:43.458897621 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ti1500 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ti1500 ++++ linux-2.4.35.4/arch/mips/defconfig-ti1500 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9408,7 +9408,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 CONFIG_MIPS_XXS1500=y # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,9 +213,7 @@ +@@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set CONFIG_MTD_XXS1500=y # CONFIG_MTD_MTX1 is not set @@ -9418,7 +9418,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -234,7 +232,6 @@ +@@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y # # Disk-On-Chip Device Drivers # @@ -9426,7 +9426,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -339,11 +336,6 @@ +@@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9438,7 +9438,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -600,7 +592,6 @@ +@@ -600,7 +592,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9448,9 +9448,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 Index: linux-2.4.35.4/arch/mips/defconfig-workpad =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-workpad 2007-12-15 05:19:43.466898076 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-workpad 2007-12-15 05:19:44.862977633 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-workpad ++++ linux-2.4.35.4/arch/mips/defconfig-workpad +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9460,7 +9460,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -222,11 +222,6 @@ +@@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9472,7 +9472,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -426,7 +421,6 @@ +@@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y # CONFIG_SERIAL_MULTIPORT is not set # CONFIG_HUB6 is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9482,9 +9482,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad CONFIG_UNIX98_PTY_COUNT=256 Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-xxs1500 2007-12-15 05:19:43.474898531 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-xxs1500 2007-12-15 05:19:44.862977633 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-xxs1500 ++++ linux-2.4.35.4/arch/mips/defconfig-xxs1500 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9494,7 +9494,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 CONFIG_MIPS_XXS1500=y # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,9 +213,7 @@ +@@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set CONFIG_MTD_XXS1500=y # CONFIG_MTD_MTX1 is not set @@ -9504,7 +9504,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -234,7 +232,6 @@ +@@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y # # Disk-On-Chip Device Drivers # @@ -9512,7 +9512,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -339,11 +336,6 @@ +@@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9524,7 +9524,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -671,7 +663,6 @@ +@@ -671,7 +663,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9534,9 +9534,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 Index: linux-2.4.35.4/arch/mips/defconfig-yosemite =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite 2007-12-15 05:19:43.478898761 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-yosemite 2007-12-15 05:19:44.862977633 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite ++++ linux-2.4.35.4/arch/mips/defconfig-yosemite +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9546,7 +9546,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -227,11 +227,6 @@ +@@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9558,7 +9558,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -310,9 +305,11 @@ +@@ -310,9 +305,11 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -9570,7 +9570,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +474,6 @@ +@@ -477,7 +474,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -9580,9 +9580,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c 2007-12-15 05:19:43.486899216 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c 2007-12-15 05:19:44.862977633 +0100 -@@ -34,21 +34,16 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c ++++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c +@@ -34,21 +34,16 @@ static void r4k_wait(void) ".set\tmips0"); } @@ -9612,7 +9612,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c "sync\n\t" "nop\n\t" "wait\n\t" -@@ -57,11 +52,7 @@ +@@ -57,11 +52,7 @@ void au1k_wait(void) "nop\n\t" "nop\n\t" ".set mips0\n\t" @@ -9625,7 +9625,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c } static inline void check_wait(void) -@@ -100,20 +91,17 @@ +@@ -100,20 +91,17 @@ static inline void check_wait(void) cpu_wait = r4k_wait; printk(" available.\n"); break; @@ -9652,8 +9652,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c break; Index: linux-2.4.35.4/arch/mips/kernel/head.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/head.S 2007-12-15 05:19:43.494899671 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/head.S 2007-12-15 05:19:44.866977862 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/head.S ++++ linux-2.4.35.4/arch/mips/kernel/head.S @@ -43,9 +43,9 @@ /* Cache Error */ @@ -9709,7 +9709,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S .set noat .set noreorder mtc0 k0, CP0_DESAVE -@@ -120,7 +126,7 @@ +@@ -120,7 +126,7 @@ ejtag_return: deret .set mips0 nop @@ -9718,7 +9718,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(ejtag_debug_handler) __INIT -@@ -132,13 +138,17 @@ +@@ -132,13 +138,17 @@ ejtag_return: * unconditional jump to this vector. */ NESTED(except_vec_nmi, 0, sp) @@ -9736,7 +9736,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S .set noat .set noreorder .set mips3 -@@ -147,8 +157,7 @@ +@@ -147,8 +157,7 @@ ejtag_return: move a0, sp RESTORE_ALL eret @@ -9746,7 +9746,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(nmi_handler) __INIT -@@ -157,7 +166,20 @@ +@@ -157,7 +166,20 @@ ejtag_return: * Kernel entry point */ NESTED(kernel_entry, 16, sp) @@ -9767,7 +9767,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S /* * The firmware/bootloader passes argc/argp/envp -@@ -170,8 +192,8 @@ +@@ -170,8 +192,8 @@ ejtag_return: la t1, (_end - 4) 1: addiu t0, 4 @@ -9777,7 +9777,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S /* * Stack for kernel and init, current variable -@@ -182,7 +204,7 @@ +@@ -182,7 +204,7 @@ ejtag_return: sw t0, kernelsp jal init_arch @@ -9786,7 +9786,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(kernel_entry) -@@ -193,17 +215,26 @@ +@@ -193,17 +215,26 @@ ejtag_return: * function after setting up the stack and gp registers. */ LEAF(smp_bootstrap) @@ -9824,9 +9824,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S Index: linux-2.4.35.4/arch/mips/kernel/process.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/process.c 2007-12-15 05:19:43.502900127 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/process.c 2007-12-15 05:19:44.866977862 +0100 -@@ -128,6 +128,26 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/process.c ++++ linux-2.4.35.4/arch/mips/kernel/process.c +@@ -128,6 +128,26 @@ int dump_fpu(struct pt_regs *regs, elf_f return 1; } @@ -9855,9 +9855,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/process.c */ Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S 2007-12-15 05:19:43.506900356 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S 2007-12-15 05:19:44.866977862 +0100 -@@ -121,15 +121,14 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S ++++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S +@@ -121,15 +121,14 @@ reschedule: trace_a_syscall: SAVE_STATIC @@ -9877,8 +9877,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S sltu t0, t0, v0 Index: linux-2.4.35.4/arch/mips/kernel/setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/setup.c 2007-12-15 05:19:43.514900811 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/setup.c 2007-12-15 05:19:44.866977862 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/setup.c ++++ linux-2.4.35.4/arch/mips/kernel/setup.c @@ -5,7 +5,7 @@ * * Copyright (C) 1995 Linus Torvalds @@ -9888,7 +9888,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c * Copyright (C) 1996 Stoned Elipot * Copyright (C) 2000, 2001, 2002 Maciej W. Rozycki */ -@@ -71,6 +71,8 @@ +@@ -71,6 +71,8 @@ extern void * __rd_start, * __rd_end; extern struct rtc_ops no_rtc_ops; struct rtc_ops *rtc_ops; @@ -9897,7 +9897,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c #ifdef CONFIG_PC_KEYB struct kbd_ops *kbd_ops; #endif -@@ -132,10 +134,6 @@ +@@ -132,10 +134,6 @@ init_arch(int argc, char **argv, char ** */ load_mmu(); @@ -9910,9 +9910,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c Index: linux-2.4.35.4/arch/mips/kernel/traps.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/traps.c 2007-12-15 05:19:43.522901266 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/traps.c 2007-12-15 05:19:44.870978088 +0100 -@@ -452,9 +452,10 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/traps.c ++++ linux-2.4.35.4/arch/mips/kernel/traps.c +@@ -452,9 +452,10 @@ static inline void simulate_ll(struct pt } ll_task = current; @@ -9924,7 +9924,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c return; sig: -@@ -485,8 +486,8 @@ +@@ -485,8 +486,8 @@ static inline void simulate_sc(struct pt goto sig; } if (ll_bit == 0 || ll_task != current) { @@ -9934,7 +9934,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c return; } -@@ -495,9 +496,9 @@ +@@ -495,9 +496,9 @@ static inline void simulate_sc(struct pt goto sig; } @@ -9945,7 +9945,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c return; sig: -@@ -887,12 +888,18 @@ +@@ -887,12 +888,18 @@ extern asmlinkage int fpu_emulator_resto void __init per_cpu_trap_init(void) { unsigned int cpu = smp_processor_id(); @@ -9968,7 +9968,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c /* * Some MIPS CPUs have a dedicated interrupt vector which reduces the -@@ -902,7 +909,7 @@ +@@ -902,7 +909,7 @@ void __init per_cpu_trap_init(void) set_c0_cause(CAUSEF_IV); cpu_data[cpu].asid_cache = ASID_FIRST_VERSION; @@ -9977,7 +9977,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c atomic_inc(&init_mm.mm_count); current->active_mm = &init_mm; -@@ -918,8 +925,6 @@ +@@ -918,8 +925,6 @@ void __init trap_init(void) extern char except_vec4; unsigned long i; @@ -9986,7 +9986,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c /* Copy the generic exception handler code to it's final destination. */ memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80); -@@ -1020,10 +1025,5 @@ +@@ -1020,10 +1025,5 @@ void __init trap_init(void) flush_icache_range(KSEG0, KSEG0 + 0x400); @@ -10000,8 +10000,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c } Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c 2007-12-15 05:19:43.530901722 +0100 -+++ linux-2.4.35.4/arch/mips/lib/rtc-no.c 2007-12-15 05:19:44.870978088 +0100 +--- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c ++++ linux-2.4.35.4/arch/mips/lib/rtc-no.c @@ -6,10 +6,9 @@ * Stub RTC routines to keep Linux from crashing on machine which don't * have a RTC chip. @@ -10014,7 +10014,7 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c #include <linux/mc146818rtc.h> static unsigned int shouldnt_happen(void) -@@ -29,5 +28,3 @@ +@@ -29,5 +28,3 @@ struct rtc_ops no_rtc_ops = { .rtc_write_data = (void *) &shouldnt_happen, .rtc_bcd_mode = (void *) &shouldnt_happen }; @@ -10022,8 +10022,8 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c -EXPORT_SYMBOL(rtc_ops); Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/lib/rtc-std.c 2007-12-15 05:19:43.538902180 +0100 -+++ linux-2.4.35.4/arch/mips/lib/rtc-std.c 2007-12-15 05:19:44.870978088 +0100 +--- linux-2.4.35.4.orig/arch/mips/lib/rtc-std.c ++++ linux-2.4.35.4/arch/mips/lib/rtc-std.c @@ -5,9 +5,8 @@ * * RTC routines for PC style attached Dallas chip. @@ -10035,7 +10035,7 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c #include <linux/mc146818rtc.h> #include <asm/io.h> -@@ -33,5 +32,3 @@ +@@ -33,5 +32,3 @@ struct rtc_ops std_rtc_ops = { &std_rtc_write_data, &std_rtc_bcd_mode }; @@ -10043,9 +10043,9 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c -EXPORT_SYMBOL(rtc_ops); Index: linux-2.4.35.4/arch/mips/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/Makefile 2007-12-15 05:19:43.546902635 +0100 -+++ linux-2.4.35.4/arch/mips/Makefile 2007-12-15 05:19:44.870978088 +0100 -@@ -209,7 +209,7 @@ +--- linux-2.4.35.4.orig/arch/mips/Makefile ++++ linux-2.4.35.4/arch/mips/Makefile +@@ -209,7 +209,7 @@ LOADADDR := 0x80080000 endif # @@ -10054,7 +10054,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile # ifdef CONFIG_MIPS_PB1000 LIBS += arch/mips/au1000/pb1000/pb1000.o \ -@@ -218,9 +218,6 @@ +@@ -218,9 +218,6 @@ SUBDIRS += arch/mips/au1000/pb1000 arch LOADADDR := 0x80100000 endif @@ -10064,7 +10064,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile ifdef CONFIG_MIPS_PB1100 LIBS += arch/mips/au1000/pb1100/pb1100.o \ arch/mips/au1000/common/au1000.o -@@ -228,9 +225,6 @@ +@@ -228,9 +225,6 @@ SUBDIRS += arch/mips/au1000/pb1100 LOADADDR += 0x80100000 endif @@ -10074,7 +10074,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile ifdef CONFIG_MIPS_PB1500 LIBS += arch/mips/au1000/pb1500/pb1500.o \ arch/mips/au1000/common/au1000.o -@@ -238,9 +232,6 @@ +@@ -238,9 +232,6 @@ SUBDIRS += arch/mips/au1000/pb1500 arch LOADADDR := 0x80100000 endif @@ -10084,7 +10084,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile ifdef CONFIG_MIPS_DB1000 LIBS += arch/mips/au1000/db1x00/db1x00.o \ arch/mips/au1000/common/au1000.o -@@ -311,6 +302,27 @@ +@@ -311,6 +302,27 @@ SUBDIRS += arch/mips/au1000/pb1550 LOADADDR += 0x80100000 endif @@ -10114,9 +10114,9 @@ Index: linux-2.4.35.4/arch/mips/Makefile # Cogent CSB250 Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/mm/cerr-sb1.c 2007-12-15 05:19:43.554903091 +0100 -+++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c 2007-12-15 05:19:44.870978088 +0100 -@@ -252,14 +252,14 @@ +--- linux-2.4.35.4.orig/arch/mips/mm/cerr-sb1.c ++++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c +@@ -252,14 +252,14 @@ static const uint8_t parity[256] = { /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ static const uint64_t mask_72_64[8] = { @@ -10139,7 +10139,7 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c }; /* Calculate the parity on a range of bits */ -@@ -331,9 +331,9 @@ +@@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor ((lru >> 4) & 0x3), ((lru >> 6) & 0x3)); } @@ -10151,7 +10151,7 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c valid = ((taghi >> 29) & 1); if (valid) { tlo_tmp = taglo & 0xfff3ff; -@@ -474,7 +474,7 @@ +@@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor : "r" ((way << 13) | addr)); taglo = ((unsigned long long)taglohi << 32) | taglolo; @@ -10162,9 +10162,9 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n", Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/mm/c-r4k.c 2007-12-15 05:19:43.558903320 +0100 -+++ linux-2.4.35.4/arch/mips/mm/c-r4k.c 2007-12-15 05:19:44.874978317 +0100 -@@ -867,9 +867,16 @@ +--- linux-2.4.35.4.orig/arch/mips/mm/c-r4k.c ++++ linux-2.4.35.4/arch/mips/mm/c-r4k.c +@@ -867,9 +867,16 @@ static void __init probe_pcache(void) * normally they'd suffer from aliases but magic in the hardware deals * with that for us so we don't need to take care ourselves. */ @@ -10184,7 +10184,7 @@ Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c switch (c->cputype) { case CPU_20KC: -@@ -1069,9 +1076,6 @@ +@@ -1069,9 +1076,6 @@ void __init ld_mmu_r4xx0(void) probe_pcache(); setup_scache(); @@ -10196,8 +10196,8 @@ Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c r4k_blast_dcache_setup(); Index: linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/mm/tlbex-mips32.S 2007-12-15 05:19:43.566903775 +0100 -+++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S 2007-12-15 05:19:44.874978317 +0100 +--- linux-2.4.35.4.orig/arch/mips/mm/tlbex-mips32.S ++++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S @@ -196,7 +196,7 @@ .set noat; \ SAVE_ALL; \ @@ -10209,8 +10209,8 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S jal do_page_fault; \ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/mm/tlbex-r4k.S 2007-12-15 05:19:43.574904230 +0100 -+++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S 2007-12-15 05:19:44.874978317 +0100 +--- linux-2.4.35.4.orig/arch/mips/mm/tlbex-r4k.S ++++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S @@ -184,13 +184,10 @@ P_MTC0 k0, CP0_ENTRYLO0 # load it PTE_SRL k1, k1, 6 # convert to entrylo1 @@ -10228,7 +10228,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S END(except_vec0_r4000) /* TLB refill, EXL == 0, R4600 version */ -@@ -468,13 +465,9 @@ +@@ -468,13 +465,9 @@ invalid_tlbl: PTE_PRESENT(k0, k1, nopage_tlbl) PTE_MAKEVALID(k0, k1) PTE_RELOAD(k1, k0) @@ -10245,7 +10245,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .set mips3 eret .set mips0 -@@ -496,13 +489,9 @@ +@@ -496,13 +489,9 @@ nopage_tlbl: PTE_WRITABLE(k0, k1, nopage_tlbs) PTE_MAKEWRITE(k0, k1) PTE_RELOAD(k1, k0) @@ -10262,7 +10262,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .set mips3 eret .set mips0 -@@ -529,13 +518,9 @@ +@@ -529,13 +518,9 @@ nopage_tlbs: /* Now reload the entry into the tlb. */ PTE_RELOAD(k1, k0) @@ -10281,8 +10281,8 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .set mips0 Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/mm/tlb-r4k.c 2007-12-15 05:19:43.582904686 +0100 -+++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c 2007-12-15 05:19:44.874978317 +0100 +--- linux-2.4.35.4.orig/arch/mips/mm/tlb-r4k.c ++++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c @@ -3,17 +3,12 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -10314,7 +10314,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c extern char except_vec0_nevada, except_vec0_r4000, except_vec0_r4600; /* CP0 hazard avoidance. */ -@@ -41,33 +33,23 @@ +@@ -41,33 +33,23 @@ void local_flush_tlb_all(void) unsigned long old_ctx; int entry; @@ -10350,7 +10350,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(old_ctx); local_irq_restore(flags); } -@@ -76,12 +58,8 @@ +@@ -76,12 +58,8 @@ void local_flush_tlb_mm(struct mm_struct { int cpu = smp_processor_id(); @@ -10364,7 +10364,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c } void local_flush_tlb_range(struct mm_struct *mm, unsigned long start, -@@ -93,10 +71,6 @@ +@@ -93,10 +71,6 @@ void local_flush_tlb_range(struct mm_str unsigned long flags; int size; @@ -10375,7 +10375,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c local_irq_save(flags); size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; size = (size + 1) >> 1; -@@ -112,7 +86,7 @@ +@@ -112,7 +86,7 @@ void local_flush_tlb_range(struct mm_str write_c0_entryhi(start | newpid); start += (PAGE_SIZE << 1); @@ -10384,7 +10384,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c tlb_probe(); BARRIER; idx = read_c0_index(); -@@ -122,10 +96,10 @@ +@@ -122,10 +96,10 @@ void local_flush_tlb_range(struct mm_str continue; /* Make sure all entries differ. */ write_c0_entryhi(KSEG0 + idx*0x2000); @@ -10397,7 +10397,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(oldpid); } else { drop_mmu_context(mm, cpu); -@@ -138,34 +112,30 @@ +@@ -138,34 +112,30 @@ void local_flush_tlb_page(struct vm_area { int cpu = smp_processor_id(); @@ -10438,7 +10438,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(oldpid); local_irq_restore(flags); } -@@ -185,7 +155,7 @@ +@@ -185,7 +155,7 @@ void local_flush_tlb_one(unsigned long p local_irq_save(flags); write_c0_entryhi(page); @@ -10447,7 +10447,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c tlb_probe(); BARRIER; idx = read_c0_index(); -@@ -194,18 +164,19 @@ +@@ -194,18 +164,19 @@ void local_flush_tlb_one(unsigned long p if (idx >= 0) { /* Make sure all entries differ. */ write_c0_entryhi(KSEG0+idx*0x2000); @@ -10471,7 +10471,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c */ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) { -@@ -223,25 +194,16 @@ +@@ -223,25 +194,16 @@ void __update_tlb(struct vm_area_struct pid = read_c0_entryhi() & ASID_MASK; @@ -10498,7 +10498,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) write_c0_entrylo0(ptep->pte_high); ptep++; -@@ -251,15 +213,13 @@ +@@ -251,15 +213,13 @@ void __update_tlb(struct vm_area_struct write_c0_entrylo1(pte_val(*ptep) >> 6); #endif write_c0_entryhi(address | pid); @@ -10518,7 +10518,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c local_irq_restore(flags); } -@@ -279,24 +239,26 @@ +@@ -279,24 +239,26 @@ static void r4k_update_mmu_cache_hwbug(s asid = read_c0_entryhi() & ASID_MASK; write_c0_entryhi(address | asid); pgdp = pgd_offset(vma->vm_mm, address); @@ -10548,7 +10548,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c { unsigned long flags; unsigned long wired; -@@ -315,9 +277,9 @@ +@@ -315,9 +277,9 @@ void __init add_wired_entry(unsigned lon write_c0_entryhi(entryhi); write_c0_entrylo0(entrylo0); write_c0_entrylo1(entrylo1); @@ -10560,7 +10560,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(old_ctx); BARRIER; -@@ -355,17 +317,15 @@ +@@ -355,17 +317,15 @@ __init int add_temporary_entry(unsigned } write_c0_index(temp_tlb_entry); @@ -10580,7 +10580,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_pagemask(old_pagemask); out: local_irq_restore(flags); -@@ -375,7 +335,7 @@ +@@ -375,7 +335,7 @@ out: static void __init probe_tlb(unsigned long config) { struct cpuinfo_mips *c = ¤t_cpu_data; @@ -10589,7 +10589,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c /* * If this isn't a MIPS32 / MIPS64 compliant CPU. Config 1 register -@@ -385,16 +345,16 @@ +@@ -385,16 +345,16 @@ static void __init probe_tlb(unsigned lo if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY) return; @@ -10611,9 +10611,9 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c * You should never change this register: Index: linux-2.4.35.4/arch/mips64/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig 2007-12-15 05:19:43.590905141 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig 2007-12-15 05:19:44.874978317 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig ++++ linux-2.4.35.4/arch/mips64/defconfig +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10623,7 +10623,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -470,9 +470,11 @@ +@@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10635,7 +10635,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -658,7 +660,6 @@ +@@ -658,7 +660,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -10645,9 +10645,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig Index: linux-2.4.35.4/arch/mips64/defconfig-atlas =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas 2007-12-15 05:19:43.598905599 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-atlas 2007-12-15 05:19:44.878978546 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas ++++ linux-2.4.35.4/arch/mips64/defconfig-atlas +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10657,7 +10657,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -232,11 +232,6 @@ +@@ -232,11 +232,6 @@ CONFIG_IP_PNP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10669,7 +10669,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -314,9 +309,11 @@ +@@ -314,9 +309,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10681,7 +10681,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -474,7 +471,6 @@ +@@ -474,7 +471,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -10691,9 +10691,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas Index: linux-2.4.35.4/arch/mips64/defconfig-decstation =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation 2007-12-15 05:19:43.606906055 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-decstation 2007-12-15 05:19:44.878978546 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation ++++ linux-2.4.35.4/arch/mips64/defconfig-decstation +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10703,7 +10703,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -224,11 +224,6 @@ +@@ -224,11 +224,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10715,7 +10715,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -307,9 +302,11 @@ +@@ -307,9 +302,11 @@ CONFIG_SCSI_DECNCR=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10727,7 +10727,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +474,6 @@ +@@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y CONFIG_SERIAL_DEC_CONSOLE=y # CONFIG_DZ is not set CONFIG_ZS=y @@ -10737,9 +10737,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22 2007-12-15 05:19:43.610906281 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-ip22 2007-12-15 05:19:44.878978546 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22 ++++ linux-2.4.35.4/arch/mips64/defconfig-ip22 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10749,7 +10749,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10761,7 +10761,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -319,9 +314,11 @@ +@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10773,7 +10773,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -488,7 +485,6 @@ +@@ -488,7 +485,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set CONFIG_IP22_SERIAL=y @@ -10783,9 +10783,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27 2007-12-15 05:19:43.618906739 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-ip27 2007-12-15 05:19:44.878978546 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27 ++++ linux-2.4.35.4/arch/mips64/defconfig-ip27 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10795,7 +10795,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -470,9 +470,11 @@ +@@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10807,7 +10807,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -658,7 +660,6 @@ +@@ -658,7 +660,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -10817,9 +10817,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar 2007-12-15 05:19:43.626907195 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-jaguar 2007-12-15 05:19:44.882978773 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar ++++ linux-2.4.35.4/arch/mips64/defconfig-jaguar +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10829,7 +10829,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -227,11 +227,6 @@ +@@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10841,7 +10841,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -403,7 +398,6 @@ +@@ -403,7 +398,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -10851,9 +10851,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar Index: linux-2.4.35.4/arch/mips64/defconfig-malta =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-malta 2007-12-15 05:19:43.634907650 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-malta 2007-12-15 05:19:44.882978773 +0100 -@@ -22,16 +22,19 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-malta ++++ linux-2.4.35.4/arch/mips64/defconfig-malta +@@ -22,16 +22,19 @@ CONFIG_KMOD=y # # CONFIG_ACER_PICA_61 is not set # CONFIG_MIPS_BOSPORUS is not set @@ -10874,7 +10874,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -146,9 +149,9 @@ +@@ -146,9 +149,9 @@ CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y @@ -10886,7 +10886,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_OOM_KILLER is not set # CONFIG_CMDLINE_BOOL is not set -@@ -235,11 +238,6 @@ +@@ -235,11 +238,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10898,7 +10898,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -271,8 +269,83 @@ +@@ -271,8 +269,83 @@ CONFIG_IP_PNP_BOOTP=y # # ATA/IDE/MFM/RLL support # @@ -10983,7 +10983,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # # SCSI support -@@ -317,9 +390,11 @@ +@@ -317,9 +390,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10995,7 +10995,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +552,6 @@ +@@ -477,7 +552,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -11005,9 +11005,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc 2007-12-15 05:19:43.638907879 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc 2007-12-15 05:19:44.882978773 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc ++++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -11017,7 +11017,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -231,11 +231,6 @@ +@@ -231,11 +231,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -11029,7 +11029,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -453,7 +448,6 @@ +@@ -453,7 +448,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -11039,9 +11039,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm 2007-12-15 05:19:43.646908334 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm 2007-12-15 05:19:44.882978773 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm ++++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -11051,7 +11051,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -90,6 +90,7 @@ +@@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_TBPROF is not set CONFIG_SIBYTE_GENBUS_IDE=y CONFIG_SMP_CAPABLE=y @@ -11059,7 +11059,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm # CONFIG_SNI_RM200_PCI is not set # CONFIG_TANBAC_TB0226 is not set # CONFIG_TANBAC_TB0229 is not set -@@ -253,11 +254,6 @@ +@@ -253,11 +254,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -11071,7 +11071,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -432,7 +428,6 @@ +@@ -432,7 +428,6 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SIBYTE_SB1250_DUART=y CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y CONFIG_SERIAL_CONSOLE=y @@ -11081,9 +11081,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm Index: linux-2.4.35.4/arch/mips64/defconfig-sead =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-sead 2007-12-15 05:19:43.654908790 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-sead 2007-12-15 05:19:44.886979002 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-sead ++++ linux-2.4.35.4/arch/mips64/defconfig-sead +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -11093,7 +11093,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sead # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -242,7 +242,6 @@ +@@ -242,7 +242,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -11103,9 +11103,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sead # Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c 2007-12-15 05:19:43.662909245 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c 2007-12-15 05:19:44.894979457 +0100 -@@ -116,4 +116,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c ++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c +@@ -116,4 +116,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux- #undef MODULE_DESCRIPTION #undef MODULE_AUTHOR @@ -11115,9 +11115,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c #include "../../../fs/binfmt_elf.c" Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfo32.c 2007-12-15 05:19:43.670909700 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c 2007-12-15 05:19:44.898979686 +0100 -@@ -137,4 +137,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfo32.c ++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c +@@ -137,4 +137,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux- #undef MODULE_DESCRIPTION #undef MODULE_AUTHOR @@ -11127,9 +11127,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c #include "../../../fs/binfmt_elf.c" Index: linux-2.4.35.4/arch/mips64/kernel/head.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/head.S 2007-12-15 05:19:43.674909929 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/head.S 2007-12-15 05:19:44.898979686 +0100 -@@ -91,6 +91,21 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/head.S ++++ linux-2.4.35.4/arch/mips64/kernel/head.S +@@ -91,6 +91,21 @@ EXPORT(_stext) __INIT NESTED(kernel_entry, 16, sp) # kernel entry point @@ -11151,7 +11151,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S ori sp, 0xf # align stack on 16 byte. xori sp, 0xf -@@ -103,8 +118,6 @@ +@@ -103,8 +118,6 @@ NESTED(kernel_entry, 16, sp) # kernel ARC64_TWIDDLE_PC @@ -11160,7 +11160,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S /* * The firmware/bootloader passes argc/argp/envp * to us as arguments. But clear bss first because -@@ -125,6 +138,7 @@ +@@ -125,6 +138,7 @@ NESTED(kernel_entry, 16, sp) # kernel dsubu sp, 4*SZREG # init stack pointer j init_arch @@ -11168,7 +11168,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S END(kernel_entry) #ifdef CONFIG_SMP -@@ -133,6 +147,23 @@ +@@ -133,6 +147,23 @@ NESTED(kernel_entry, 16, sp) # kernel * function after setting up the stack and gp registers. */ NESTED(smp_bootstrap, 16, sp) @@ -11192,7 +11192,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S #ifdef CONFIG_SGI_IP27 GET_NASID_ASM t1 dli t0, KLDIR_OFFSET + (KLI_KERN_VARS * KLDIR_ENT_SIZE) + \ -@@ -146,19 +177,8 @@ +@@ -146,19 +177,8 @@ NESTED(smp_bootstrap, 16, sp) ARC64_TWIDDLE_PC #endif /* CONFIG_SGI_IP27 */ @@ -11215,9 +11215,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c 2007-12-15 05:19:43.682910385 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c 2007-12-15 05:19:44.898979686 +0100 -@@ -2352,7 +2352,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c ++++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c +@@ -2352,7 +2352,7 @@ static struct ioctl32_list ioctl32_handl IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout), IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE), IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE_MULTI), @@ -11228,9 +11228,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c IOCTL32_DEFAULT(AUTOFS_IOC_ASKUMOUNT), Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/linux32.c 2007-12-15 05:19:43.690910840 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/linux32.c 2007-12-15 05:19:44.902979912 +0100 -@@ -1101,6 +1101,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/linux32.c ++++ linux-2.4.35.4/arch/mips64/kernel/linux32.c +@@ -1101,6 +1101,7 @@ do_readv_writev32(int type, struct file * specially as they have atomicity guarantees and can handle * iovec's natively */ @@ -11238,7 +11238,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c if (inode->i_sock) { int err; err = sock_readv_writev(type, inode, file, iov, count, tot_len); -@@ -1187,72 +1188,19 @@ +@@ -1187,72 +1188,19 @@ bad_file: lseek back to original location. They fail just like lseek does on non-seekable files. */ @@ -11318,9 +11318,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c * 64-bit unsigned longs. Index: linux-2.4.35.4/arch/mips64/kernel/process.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/process.c 2007-12-15 05:19:43.698911298 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/process.c 2007-12-15 05:19:44.902979912 +0100 -@@ -125,6 +125,25 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/process.c ++++ linux-2.4.35.4/arch/mips64/kernel/process.c +@@ -125,6 +125,25 @@ int dump_fpu(struct pt_regs *regs, elf_f return 1; } @@ -11348,9 +11348,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/process.c */ Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S 2007-12-15 05:19:43.702911525 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S 2007-12-15 05:19:44.902979912 +0100 -@@ -102,15 +102,14 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S ++++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S +@@ -102,15 +102,14 @@ _64_reschedule: trace_a_syscall: SAVE_STATIC @@ -11370,9 +11370,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S sltu t0, t0, v0 Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_n32.S 2007-12-15 05:19:43.710911980 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S 2007-12-15 05:19:44.902979912 +0100 -@@ -106,15 +106,14 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_n32.S ++++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S +@@ -106,15 +106,14 @@ n32_reschedule: trace_a_syscall: SAVE_STATIC @@ -11392,9 +11392,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S sltu t0, t0, v0 Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_o32.S 2007-12-15 05:19:43.718912438 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S 2007-12-15 05:19:44.906980142 +0100 -@@ -118,9 +118,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_o32.S ++++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S +@@ -118,9 +118,8 @@ trace_a_syscall: sd a6, PT_R10(sp) sd a7, PT_R11(sp) @@ -11405,7 +11405,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S ld a0, PT_R4(sp) # Restore argument registers ld a1, PT_R5(sp) -@@ -129,7 +128,7 @@ +@@ -129,7 +128,7 @@ trace_a_syscall: ld a4, PT_R8(sp) ld a5, PT_R9(sp) @@ -11414,7 +11414,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S li t0, -EMAXERRNO - 1 # error? sltu t0, t0, v0 -@@ -576,6 +575,8 @@ +@@ -576,6 +575,8 @@ out: jr ra sys_call_table: syscalltable @@ -11425,9 +11425,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S .endm Index: linux-2.4.35.4/arch/mips64/kernel/setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c 2007-12-15 05:19:43.726912894 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/setup.c 2007-12-15 05:19:44.906980142 +0100 -@@ -129,14 +129,6 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c ++++ linux-2.4.35.4/arch/mips64/kernel/setup.c +@@ -129,14 +129,6 @@ asmlinkage void __init init_arch(int arg */ load_mmu(); @@ -11444,9 +11444,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/setup.c Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c 2007-12-15 05:19:43.730913120 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c 2007-12-15 05:19:44.906980142 +0100 -@@ -68,7 +68,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c ++++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c +@@ -68,7 +68,7 @@ struct rt_sigframe_n32 { }; extern asmlinkage int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc); @@ -11457,9 +11457,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c { Index: linux-2.4.35.4/arch/mips64/kernel/traps.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c 2007-12-15 05:19:43.738913578 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/traps.c 2007-12-15 05:19:44.906980142 +0100 -@@ -462,9 +462,10 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c ++++ linux-2.4.35.4/arch/mips64/kernel/traps.c +@@ -462,9 +462,10 @@ static inline void simulate_ll(struct pt } ll_task = current; @@ -11471,7 +11471,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c return; sig: -@@ -495,8 +496,8 @@ +@@ -495,8 +496,8 @@ static inline void simulate_sc(struct pt goto sig; } if (ll_bit == 0 || ll_task != current) { @@ -11481,7 +11481,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c return; } -@@ -505,9 +506,9 @@ +@@ -505,9 +506,9 @@ static inline void simulate_sc(struct pt goto sig; } @@ -11492,7 +11492,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c return; sig: -@@ -809,13 +810,18 @@ +@@ -809,13 +810,18 @@ extern asmlinkage int fpu_emulator_resto void __init per_cpu_trap_init(void) { unsigned int cpu = smp_processor_id(); @@ -11516,7 +11516,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c /* * Some MIPS CPUs have a dedicated interrupt vector which reduces the -@@ -825,13 +831,11 @@ +@@ -825,13 +831,11 @@ void __init per_cpu_trap_init(void) set_c0_cause(CAUSEF_IV); cpu_data[cpu].asid_cache = ASID_FIRST_VERSION; @@ -11532,7 +11532,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c enter_lazy_tlb(&init_mm, current, cpu); } -@@ -842,8 +846,6 @@ +@@ -842,8 +846,6 @@ void __init trap_init(void) extern char except_vec4; unsigned long i; @@ -11541,7 +11541,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c /* Copy the generic exception handlers to their final destination. */ memcpy((void *) KSEG0 , &except_vec0_generic, 0x80); memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80); -@@ -933,6 +935,5 @@ +@@ -933,6 +935,5 @@ void __init trap_init(void) flush_icache_range(KSEG0, KSEG0 + 0x400); @@ -11551,9 +11551,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c } Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c 2007-12-15 05:19:43.746914033 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c 2007-12-15 05:19:44.906980142 +0100 -@@ -252,14 +252,14 @@ +--- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c ++++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c +@@ -252,14 +252,14 @@ static const uint8_t parity[256] = { /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ static const uint64_t mask_72_64[8] = { @@ -11576,7 +11576,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c }; /* Calculate the parity on a range of bits */ -@@ -331,9 +331,9 @@ +@@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor ((lru >> 4) & 0x3), ((lru >> 6) & 0x3)); } @@ -11588,7 +11588,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c valid = ((taghi >> 29) & 1); if (valid) { tlo_tmp = taglo & 0xfff3ff; -@@ -474,7 +474,7 @@ +@@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor : "r" ((way << 13) | addr)); taglo = ((unsigned long long)taglohi << 32) | taglolo; @@ -11599,9 +11599,9 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n", Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/c-r4k.c 2007-12-15 05:19:43.754914488 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c 2007-12-15 05:19:44.910980368 +0100 -@@ -867,9 +867,16 @@ +--- linux-2.4.35.4.orig/arch/mips64/mm/c-r4k.c ++++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c +@@ -867,9 +867,16 @@ static void __init probe_pcache(void) * normally they'd suffer from aliases but magic in the hardware deals * with that for us so we don't need to take care ourselves. */ @@ -11621,7 +11621,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c switch (c->cputype) { case CPU_20KC: -@@ -1070,9 +1077,6 @@ +@@ -1070,9 +1077,6 @@ void __init ld_mmu_r4xx0(void) setup_scache(); coherency_setup(); @@ -11633,9 +11633,9 @@ Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c r4k_blast_dcache_setup(); Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/tlbex-r4k.S 2007-12-15 05:19:43.762914944 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S 2007-12-15 05:19:44.910980368 +0100 -@@ -125,6 +125,33 @@ +--- linux-2.4.35.4.orig/arch/mips64/mm/tlbex-r4k.S ++++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S +@@ -125,6 +125,33 @@ LEAF(except_vec1_r4k) nop END(except_vec1_r4k) @@ -11669,7 +11669,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S LEAF(except_vec1_sb1) #if BCM1250_M3_WAR dmfc0 k0, CP0_BADVADDR -@@ -134,28 +161,24 @@ +@@ -134,28 +161,24 @@ LEAF(except_vec1_sb1) bnez k0, 1f #endif .set noat @@ -11702,7 +11702,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S eret 9: # handle the vmalloc range -@@ -163,13 +186,10 @@ +@@ -163,13 +186,10 @@ LEAF(handle_vec1_r4k) ld k0, 0(k1) # get even pte ld k1, 8(k1) # get odd pte PTE_RELOAD k0 k1 @@ -11719,7 +11719,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S __INIT -@@ -195,10 +215,8 @@ +@@ -195,10 +215,8 @@ LEAF(handle_vec1_r10k) ld k0, 0(k1) # get even pte ld k1, 8(k1) # get odd pte PTE_RELOAD k0 k1 @@ -11731,7 +11731,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S eret 9: # handle the vmalloc range -@@ -206,10 +224,8 @@ +@@ -206,10 +224,8 @@ LEAF(handle_vec1_r10k) ld k0, 0(k1) # get even pte ld k1, 8(k1) # get odd pte PTE_RELOAD k0 k1 @@ -11745,8 +11745,8 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c 2007-12-15 05:19:43.770915399 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c 2007-12-15 05:19:44.910980368 +0100 +--- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c ++++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c @@ -1,24 +1,12 @@ /* - * Carsten Langgaard, carstenl@mips.com @@ -11788,7 +11788,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c extern void except_vec1_r4k(void); /* CP0 hazard avoidance. */ -@@ -46,31 +31,23 @@ +@@ -46,31 +31,23 @@ void local_flush_tlb_all(void) unsigned long old_ctx; int entry; @@ -11824,7 +11824,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_entryhi(old_ctx); local_irq_restore(flags); } -@@ -79,12 +56,8 @@ +@@ -79,12 +56,8 @@ void local_flush_tlb_mm(struct mm_struct { int cpu = smp_processor_id(); @@ -11838,7 +11838,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c } void local_flush_tlb_range(struct mm_struct *mm, unsigned long start, -@@ -96,10 +69,6 @@ +@@ -96,10 +69,6 @@ void local_flush_tlb_range(struct mm_str unsigned long flags; int size; @@ -11849,7 +11849,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c local_irq_save(flags); size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; size = (size + 1) >> 1; -@@ -110,25 +79,25 @@ +@@ -110,25 +79,25 @@ void local_flush_tlb_range(struct mm_str start &= (PAGE_MASK << 1); end += ((PAGE_SIZE << 1) - 1); end &= (PAGE_MASK << 1); @@ -11880,7 +11880,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_entryhi(oldpid); } else { drop_mmu_context(mm, cpu); -@@ -145,28 +114,26 @@ +@@ -145,28 +114,26 @@ void local_flush_tlb_page(struct vm_area unsigned long flags; unsigned long oldpid, newpid, idx; @@ -11914,7 +11914,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_entryhi(oldpid); local_irq_restore(flags); } -@@ -186,7 +153,7 @@ +@@ -186,7 +153,7 @@ void local_flush_tlb_one(unsigned long p local_irq_save(flags); write_c0_entryhi(page); @@ -11923,7 +11923,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c tlb_probe(); BARRIER; idx = read_c0_index(); -@@ -195,10 +162,12 @@ +@@ -195,10 +162,12 @@ void local_flush_tlb_one(unsigned long p if (idx >= 0) { /* Make sure all entries differ. */ write_c0_entryhi(KSEG0+idx*0x2000); @@ -11937,7 +11937,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c local_irq_restore(flags); } -@@ -208,7 +177,6 @@ +@@ -208,7 +177,6 @@ void local_flush_tlb_one(unsigned long p void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) { unsigned long flags; @@ -11945,7 +11945,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c pgd_t *pgdp; pmd_t *pmdp; pte_t *ptep; -@@ -222,70 +190,58 @@ +@@ -222,70 +190,58 @@ void __update_tlb(struct vm_area_struct pid = read_c0_entryhi() & ASID_MASK; @@ -12051,7 +12051,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c } /* -@@ -317,17 +273,15 @@ +@@ -317,17 +273,15 @@ __init int add_temporary_entry(unsigned } write_c0_index(temp_tlb_entry); @@ -12071,7 +12071,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_pagemask(old_pagemask); out: local_irq_restore(flags); -@@ -348,15 +302,23 @@ +@@ -348,15 +302,23 @@ static void __init probe_tlb(unsigned lo return; config1 = read_c0_config1(); @@ -12100,9 +12100,9 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_wired(0); Index: linux-2.4.35.4/drivers/char/au1000_gpio.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/au1000_gpio.c 2007-12-15 05:19:43.778915857 +0100 -+++ linux-2.4.35.4/drivers/char/au1000_gpio.c 2007-12-15 05:19:44.910980368 +0100 -@@ -246,7 +246,7 @@ +--- linux-2.4.35.4.orig/drivers/char/au1000_gpio.c ++++ linux-2.4.35.4/drivers/char/au1000_gpio.c +@@ -246,7 +246,7 @@ static struct file_operations au1000gpio static struct miscdevice au1000gpio_miscdev = { @@ -12113,8 +12113,8 @@ Index: linux-2.4.35.4/drivers/char/au1000_gpio.c }; Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c 2007-12-15 05:19:44.914980597 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c @@ -0,0 +1,466 @@ +/* + * Driver for Alchemy Au1550 SPI on the PSC. @@ -12584,9 +12584,9 @@ Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c +module_exit(au1550spi_exit); Index: linux-2.4.35.4/drivers/char/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/char/Config.in 2007-12-15 05:19:43.790916539 +0100 -+++ linux-2.4.35.4/drivers/char/Config.in 2007-12-15 05:19:44.914980597 +0100 -@@ -314,14 +314,11 @@ +--- linux-2.4.35.4.orig/drivers/char/Config.in ++++ linux-2.4.35.4/drivers/char/Config.in +@@ -314,14 +314,11 @@ fi if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then bool 'Tadpole ANA H8 Support (OBSOLETE)' CONFIG_H8 fi @@ -12603,7 +12603,7 @@ Index: linux-2.4.35.4/drivers/char/Config.in fi if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then tristate 'Dallas DS1742 RTC support' CONFIG_DS1742 -@@ -384,6 +381,11 @@ +@@ -384,6 +381,11 @@ if [ "$CONFIG_DRM" = "y" ]; then source drivers/char/drm/Config.in fi fi @@ -12615,7 +12615,7 @@ Index: linux-2.4.35.4/drivers/char/Config.in endmenu if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then -@@ -392,6 +394,7 @@ +@@ -392,6 +394,7 @@ fi if [ "$CONFIG_SOC_AU1X00" = "y" ]; then tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846 @@ -12625,8 +12625,8 @@ Index: linux-2.4.35.4/drivers/char/Config.in tristate ' ITE GPIO' CONFIG_ITE_GPIO Index: linux-2.4.35.4/drivers/char/decserial.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/decserial.c 2007-12-15 05:19:43.798916997 +0100 -+++ linux-2.4.35.4/drivers/char/decserial.c 2007-12-15 05:19:44.914980597 +0100 +--- linux-2.4.35.4.orig/drivers/char/decserial.c ++++ linux-2.4.35.4/drivers/char/decserial.c @@ -3,95 +3,105 @@ * choose the right serial device at boot time * @@ -12779,8 +12779,8 @@ Index: linux-2.4.35.4/drivers/char/decserial.c Index: linux-2.4.35.4/drivers/char/ds1286.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/ds1286.c 2007-12-15 05:19:43.806917453 +0100 -+++ linux-2.4.35.4/drivers/char/ds1286.c 2007-12-15 05:19:44.914980597 +0100 +--- linux-2.4.35.4.orig/drivers/char/ds1286.c ++++ linux-2.4.35.4/drivers/char/ds1286.c @@ -1,6 +1,10 @@ /* * DS1286 Real Time Clock interface for Linux @@ -12800,7 +12800,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c #include <linux/slab.h> #include <linux/ioport.h> #include <linux/fcntl.h> -@@ -95,6 +100,12 @@ +@@ -95,6 +100,12 @@ static ssize_t ds1286_read(struct file * return -EIO; } @@ -12813,7 +12813,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c static int ds1286_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { -@@ -249,23 +260,22 @@ +@@ -249,23 +260,22 @@ static int ds1286_open(struct inode *ino { spin_lock_irq(&ds1286_lock); @@ -12844,7 +12844,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c return 0; } -@@ -276,32 +286,6 @@ +@@ -276,32 +286,6 @@ static unsigned int ds1286_poll(struct f return 0; } @@ -12877,7 +12877,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c static char *days[] = { "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; -@@ -528,3 +512,38 @@ +@@ -528,3 +512,38 @@ void ds1286_get_alm_time(struct rtc_time BCD_TO_BIN(alm_tm->tm_hour); alm_tm->tm_sec = 0; } @@ -12918,9 +12918,9 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/char/ds1742.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/ds1742.c 2007-12-15 05:19:43.814917908 +0100 -+++ linux-2.4.35.4/drivers/char/ds1742.c 2007-12-15 05:19:44.918980826 +0100 -@@ -142,6 +142,7 @@ +--- linux-2.4.35.4.orig/drivers/char/ds1742.c ++++ linux-2.4.35.4/drivers/char/ds1742.c +@@ -142,6 +142,7 @@ static int rtc_ds1742_set_time(unsigned CMOS_WRITE(RTC_WRITE, RTC_CONTROL); /* convert */ @@ -12928,7 +12928,7 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c to_tm(t, &tm); /* check each field one by one */ -@@ -216,6 +217,7 @@ +@@ -216,6 +217,7 @@ static int get_ds1742_status(char *buf) unsigned long curr_time; curr_time = rtc_ds1742_get_time(); @@ -12936,7 +12936,7 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c to_tm(curr_time, &tm); p = buf; -@@ -251,8 +253,8 @@ +@@ -251,8 +253,8 @@ static int ds1742_read_proc(char *page, void rtc_ds1742_wait(void) { @@ -12947,7 +12947,7 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c } static int ds1742_ioctl(struct inode *inode, struct file *file, -@@ -264,6 +266,7 @@ +@@ -264,6 +266,7 @@ static int ds1742_ioctl(struct inode *in switch (cmd) { case RTC_RD_TIME: /* Read the time/date from RTC */ curr_time = rtc_ds1742_get_time(); @@ -12957,9 +12957,9 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c return copy_to_user((void *) arg, &rtc_tm, sizeof(rtc_tm)) ? Index: linux-2.4.35.4/drivers/char/dummy_keyb.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/dummy_keyb.c 2007-12-15 05:19:43.822918363 +0100 -+++ linux-2.4.35.4/drivers/char/dummy_keyb.c 2007-12-15 05:19:44.918980826 +0100 -@@ -141,3 +141,7 @@ +--- linux-2.4.35.4.orig/drivers/char/dummy_keyb.c ++++ linux-2.4.35.4/drivers/char/dummy_keyb.c +@@ -141,3 +141,7 @@ void __init kbd_init_hw(void) { printk("Dummy keyboard driver installed.\n"); } @@ -12969,8 +12969,8 @@ Index: linux-2.4.35.4/drivers/char/dummy_keyb.c +#endif Index: linux-2.4.35.4/drivers/char/dz.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/dz.c 2007-12-15 05:19:43.826918593 +0100 -+++ linux-2.4.35.4/drivers/char/dz.c 2007-12-15 05:19:44.918980826 +0100 +--- linux-2.4.35.4.orig/drivers/char/dz.c ++++ linux-2.4.35.4/drivers/char/dz.c @@ -1,11 +1,13 @@ /* - * dz.c: Serial port driver for DECStations equiped @@ -13067,7 +13067,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c /* * ------------------------------------------------------------ * dz_in () and dz_out () -@@ -94,15 +120,16 @@ +@@ -94,15 +120,16 @@ static inline unsigned short dz_in(struc { volatile unsigned short *addr = (volatile unsigned short *) (info->port + offset); @@ -13085,7 +13085,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c *addr = value; } -@@ -143,25 +170,24 @@ +@@ -143,25 +170,24 @@ static void dz_start(struct tty_struct * tmp |= mask; /* set the TX flag */ dz_out(info, DZ_TCR, tmp); @@ -13118,7 +13118,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c * * ------------------------------------------------------------ */ -@@ -188,101 +214,97 @@ +@@ -188,101 +214,97 @@ static inline void dz_sched_event(struct * This routine deals with inputs from any lines. * ------------------------------------------------------------ */ @@ -13295,7 +13295,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c } /* -@@ -292,20 +314,34 @@ +@@ -292,20 +314,34 @@ static inline void receive_chars(struct * This routine deals with outputs to any lines. * ------------------------------------------------------------ */ @@ -13333,7 +13333,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c dz_stop(info->tty); return; } -@@ -359,15 +395,14 @@ +@@ -359,15 +395,14 @@ static inline void check_modem_status(st */ static void dz_interrupt(int irq, void *dev, struct pt_regs *regs) { @@ -13352,7 +13352,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (status & DZ_TRDY) transmit_chars(info); -@@ -514,7 +549,7 @@ +@@ -514,7 +549,7 @@ static void shutdown(struct dz_serial *i info->cflags &= ~DZ_CREAD; /* turn off receive enable flag */ @@ -13361,7 +13361,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (info->xmit_buf) { /* free Tx buffer */ free_page((unsigned long) info->xmit_buf); -@@ -545,18 +580,21 @@ +@@ -545,18 +580,21 @@ static void change_speed(struct dz_seria { unsigned long flags; unsigned cflag; @@ -13388,7 +13388,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c switch (cflag & CSIZE) { case CS5: info->cflags |= DZ_CS5; -@@ -579,7 +617,16 @@ +@@ -579,7 +617,16 @@ static void change_speed(struct dz_seria if (cflag & PARODD) info->cflags |= DZ_PARODD; @@ -13406,7 +13406,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c switch (baud) { case 50: info->cflags |= DZ_B50; -@@ -629,16 +676,16 @@ +@@ -629,16 +676,16 @@ static void change_speed(struct dz_seria } info->cflags |= DZ_RXENAB; @@ -13426,7 +13426,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c info->ignore_status_mask |= (DZ_FERR | DZ_PERR); restore_flags(flags); -@@ -694,7 +741,7 @@ +@@ -694,7 +741,7 @@ static int dz_write(struct tty_struct *t down(&tmp_buf_sem); while (1) { @@ -13435,7 +13435,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (c <= 0) break; -@@ -707,7 +754,7 @@ +@@ -707,7 +754,7 @@ static int dz_write(struct tty_struct *t save_flags(flags); cli(); @@ -13444,7 +13444,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); info->xmit_head = ((info->xmit_head + c) & (DZ_XMIT_SIZE - 1)); info->xmit_cnt += c; -@@ -727,7 +774,7 @@ +@@ -727,7 +774,7 @@ static int dz_write(struct tty_struct *t save_flags(flags); cli(); @@ -13453,7 +13453,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (c <= 0) { restore_flags(flags); break; -@@ -845,7 +892,7 @@ +@@ -845,7 +892,7 @@ static void dz_send_xchar(struct tty_str /* * ------------------------------------------------------------ @@ -13462,7 +13462,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c * ------------------------------------------------------------ */ static int get_serial_info(struct dz_serial *info, -@@ -958,6 +1005,9 @@ +@@ -958,6 +1005,9 @@ static int dz_ioctl(struct tty_struct *t struct dz_serial *info = (struct dz_serial *) tty->driver_data; int retval; @@ -13472,7 +13472,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) && (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) { -@@ -1252,19 +1302,14 @@ +@@ -1252,19 +1302,14 @@ static int dz_open(struct tty_struct *tt int retval, line; line = MINOR(tty->device) - tty->driver.minor_start; @@ -13494,7 +13494,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c tty->driver_data = info; info->tty = tty; -@@ -1285,14 +1330,21 @@ +@@ -1285,14 +1330,21 @@ static int dz_open(struct tty_struct *tt else *tty->termios = info->callout_termios; change_speed(info); @@ -13518,7 +13518,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c { printk("%s%s\n", dz_name, dz_version); } -@@ -1300,7 +1352,6 @@ +@@ -1300,7 +1352,6 @@ static void show_serial_version(void) int __init dz_init(void) { int i; @@ -13526,7 +13526,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c struct dz_serial *info; /* Setup base handler, and timer table. */ -@@ -1311,9 +1362,9 @@ +@@ -1311,9 +1362,9 @@ int __init dz_init(void) memset(&serial_driver, 0, sizeof(struct tty_driver)); serial_driver.magic = TTY_DRIVER_MAGIC; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) @@ -13538,7 +13538,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c #endif serial_driver.major = TTY_MAJOR; serial_driver.minor_start = 64; -@@ -1352,9 +1403,9 @@ +@@ -1352,9 +1403,9 @@ int __init dz_init(void) */ callout_driver = serial_driver; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) @@ -13550,7 +13550,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c #endif callout_driver.major = TTYAUX_MAJOR; callout_driver.subtype = SERIAL_TYPE_CALLOUT; -@@ -1363,25 +1414,27 @@ +@@ -1363,25 +1414,27 @@ int __init dz_init(void) panic("Couldn't register serial driver"); if (tty_register_driver(&callout_driver)) panic("Couldn't register callout driver"); @@ -13585,7 +13585,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c info->event = 0; info->count = 0; info->blocked_open = 0; -@@ -1393,25 +1446,16 @@ +@@ -1393,25 +1446,16 @@ int __init dz_init(void) info->normal_termios = serial_driver.init_termios; init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->close_wait); @@ -13616,7 +13616,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c dz_out(info, DZ_CSR, DZ_CLR); while (dz_in(info, DZ_CSR) & DZ_CLR); iob(); -@@ -1420,43 +1464,104 @@ +@@ -1420,43 +1464,104 @@ int __init dz_init(void) dz_out(info, DZ_CSR, DZ_MSE); #endif @@ -13743,7 +13743,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c /* * ------------------------------------------------------------------- * dz_console_print () -@@ -1465,17 +1570,19 @@ +@@ -1465,17 +1570,19 @@ static void dz_console_put_char(unsigned * The console must be locked when we get here. * ------------------------------------------------------------------- */ @@ -13766,7 +13766,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c } } -@@ -1486,12 +1593,12 @@ +@@ -1486,12 +1593,12 @@ static kdev_t dz_console_device(struct c static int __init dz_console_setup(struct console *co, char *options) { @@ -13780,7 +13780,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (options) { baud = simple_strtoul(options, NULL, 10); -@@ -1542,44 +1649,31 @@ +@@ -1542,44 +1649,31 @@ static int __init dz_console_setup(struc } co->cflag = cflag; @@ -13842,8 +13842,8 @@ Index: linux-2.4.35.4/drivers/char/dz.c void __init dz_serial_console_init(void) Index: linux-2.4.35.4/drivers/char/dz.h =================================================================== ---- linux-2.4.35.4.orig/drivers/char/dz.h 2007-12-15 05:19:43.834919048 +0100 -+++ linux-2.4.35.4/drivers/char/dz.h 2007-12-15 05:19:44.918980826 +0100 +--- linux-2.4.35.4.orig/drivers/char/dz.h ++++ linux-2.4.35.4/drivers/char/dz.h @@ -10,6 +10,8 @@ #ifndef DZ_SERIAL_H #define DZ_SERIAL_H @@ -13911,7 +13911,7 @@ Index: linux-2.4.35.4/drivers/char/dz.h #define DZ_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */ #define DZ_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */ #define DZ_PGRP_LOCKOUT 0x0200 /* Lock out cua opens based on pgrp */ -@@ -166,79 +178,9 @@ +@@ -166,79 +178,9 @@ struct dz_serial { long session; /* Session of opening process */ long pgrp; /* pgrp of opening process */ @@ -13994,8 +13994,8 @@ Index: linux-2.4.35.4/drivers/char/dz.h #endif /* DZ_SERIAL_H */ Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map 2007-12-15 05:19:44.922981052 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map @@ -0,0 +1,343 @@ +# Keymap for IBM Workpad z50 +# US Mapping @@ -14342,8 +14342,8 @@ Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map + shift keycode 94 = Caps_Lock Index: linux-2.4.35.4/drivers/char/indydog.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/indydog.c 2007-12-15 05:19:43.846919732 +0100 -+++ linux-2.4.35.4/drivers/char/indydog.c 2007-12-15 05:19:44.922981052 +0100 +--- linux-2.4.35.4.orig/drivers/char/indydog.c ++++ linux-2.4.35.4/drivers/char/indydog.c @@ -1,5 +1,5 @@ /* - * IndyDog 0.2 A Hardware Watchdog Device for SGI IP22 @@ -14380,7 +14380,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c #ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = 1; -@@ -33,10 +32,30 @@ +@@ -33,10 +32,30 @@ static int nowayout = 1; static int nowayout = 0; #endif @@ -14412,7 +14412,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c { sgimc->watchdogt = 0; } -@@ -46,18 +65,14 @@ +@@ -46,18 +65,14 @@ static inline void indydog_ping(void) */ static int indydog_open(struct inode *inode, struct file *file) { @@ -14434,7 +14434,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c indydog_ping(); indydog_alive = 1; -@@ -69,63 +84,48 @@ +@@ -69,63 +84,48 @@ static int indydog_open(struct inode *in static int indydog_release(struct inode *inode, struct file *file) { /* Shut off the timer. @@ -14514,7 +14514,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c return -EFAULT; return 0; case WDIOC_GETSTATUS: -@@ -134,31 +134,53 @@ +@@ -134,31 +134,53 @@ static int indydog_ioctl(struct inode *i case WDIOC_KEEPALIVE: indydog_ping(); return 0; @@ -14579,7 +14579,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c printk(banner); -@@ -172,4 +194,7 @@ +@@ -172,4 +194,7 @@ static void __exit watchdog_exit(void) module_init(watchdog_init); module_exit(watchdog_exit); @@ -14589,8 +14589,8 @@ Index: linux-2.4.35.4/drivers/char/indydog.c MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/char/ip27-rtc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/ip27-rtc.c 2007-12-15 05:19:43.854920187 +0100 -+++ linux-2.4.35.4/drivers/char/ip27-rtc.c 2007-12-15 05:19:44.922981052 +0100 +--- linux-2.4.35.4.orig/drivers/char/ip27-rtc.c ++++ linux-2.4.35.4/drivers/char/ip27-rtc.c @@ -44,6 +44,7 @@ #include <asm/sn/klconfig.h> #include <asm/sn/sn0/ip27.h> @@ -14599,7 +14599,7 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); -@@ -209,11 +210,8 @@ +@@ -209,11 +210,8 @@ static struct miscdevice rtc_dev= static int __init rtc_init(void) { @@ -14612,7 +14612,7 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION); if (misc_register(&rtc_dev)) { -@@ -325,3 +323,7 @@ +@@ -325,3 +323,7 @@ static void get_rtc_time(struct rtc_time rtc_tm->tm_mon--; } @@ -14622,9 +14622,9 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/char/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/char/Makefile 2007-12-15 05:19:43.862920643 +0100 -+++ linux-2.4.35.4/drivers/char/Makefile 2007-12-15 05:19:44.922981052 +0100 -@@ -48,7 +48,12 @@ +--- linux-2.4.35.4.orig/drivers/char/Makefile ++++ linux-2.4.35.4/drivers/char/Makefile +@@ -48,7 +48,12 @@ ifeq ($(ARCH),mips) KEYBD = endif ifeq ($(CONFIG_VR41XX_KIU),y) @@ -14638,7 +14638,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile KEYBD = vr41xx_keyb.o endif endif -@@ -251,7 +256,6 @@ +@@ -251,7 +256,6 @@ obj-$(CONFIG_MK712_MOUSE) += mk712.o obj-$(CONFIG_RTC) += rtc.o obj-$(CONFIG_GEN_RTC) += genrtc.o obj-$(CONFIG_EFI_RTC) += efirtc.o @@ -14646,7 +14646,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile obj-$(CONFIG_MIPS_RTC) += mips_rtc.o obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o ifeq ($(CONFIG_PPC),) -@@ -259,6 +263,7 @@ +@@ -259,6 +263,7 @@ ifeq ($(CONFIG_PPC),) endif obj-$(CONFIG_TOSHIBA) += toshiba.o obj-$(CONFIG_I8K) += i8k.o @@ -14654,7 +14654,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile obj-$(CONFIG_DS1620) += ds1620.o obj-$(CONFIG_DS1742) += ds1742.o obj-$(CONFIG_INTEL_RNG) += i810_rng.o -@@ -269,6 +274,7 @@ +@@ -269,6 +274,7 @@ obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o obj-$(CONFIG_ITE_GPIO) += ite_gpio.o obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o @@ -14662,7 +14662,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o obj-$(CONFIG_COBALT_LCD) += lcd.o -@@ -355,3 +361,9 @@ +@@ -355,3 +361,9 @@ defkeymap.c: defkeymap.map qtronixmap.c: qtronixmap.map set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ @@ -14674,8 +14674,8 @@ Index: linux-2.4.35.4/drivers/char/Makefile + set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ Index: linux-2.4.35.4/drivers/char/mips_rtc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/mips_rtc.c 2007-12-15 05:19:43.870921098 +0100 -+++ linux-2.4.35.4/drivers/char/mips_rtc.c 2007-12-15 05:19:44.926981281 +0100 +--- linux-2.4.35.4.orig/drivers/char/mips_rtc.c ++++ linux-2.4.35.4/drivers/char/mips_rtc.c @@ -53,14 +53,6 @@ #include <asm/io.h> #include <asm/uaccess.h> @@ -14693,9 +14693,9 @@ Index: linux-2.4.35.4/drivers/char/mips_rtc.c static unsigned long rtc_status = 0; /* bitmapped status byte. */ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/sb1250_duart.c 2007-12-15 05:19:43.874921327 +0100 -+++ linux-2.4.35.4/drivers/char/sb1250_duart.c 2007-12-15 05:19:44.930981508 +0100 -@@ -328,10 +328,11 @@ +--- linux-2.4.35.4.orig/drivers/char/sb1250_duart.c ++++ linux-2.4.35.4/drivers/char/sb1250_duart.c +@@ -328,10 +328,11 @@ static int duart_write(struct tty_struct if (c <= 0) break; if (from_user) { @@ -14708,7 +14708,7 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c } else { memcpy(us->outp_buf + us->outp_tail, buf, c); } -@@ -498,9 +499,31 @@ +@@ -498,9 +499,31 @@ static void duart_set_termios(struct tty duart_set_cflag(us->line, tty->termios->c_cflag); } @@ -14740,7 +14740,7 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c /* if (serial_paranoia_check(info, tty->device, "rs_ioctl")) return -ENODEV;*/ switch (cmd) { -@@ -517,7 +540,7 @@ +@@ -517,7 +540,7 @@ static int duart_ioctl(struct tty_struct printk("Ignoring TIOCMSET\n"); break; case TIOCGSERIAL: @@ -14751,8 +14751,8 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c printk("Ignoring TIOCSSERIAL\n"); Index: linux-2.4.35.4/drivers/char/serial.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/serial.c 2007-12-15 05:19:43.882921783 +0100 -+++ linux-2.4.35.4/drivers/char/serial.c 2007-12-15 05:19:44.934981737 +0100 +--- linux-2.4.35.4.orig/drivers/char/serial.c ++++ linux-2.4.35.4/drivers/char/serial.c @@ -62,6 +62,12 @@ * Robert Schwebel <robert@schwebel.de>, * Juergen Beisert <jbeisert@eurodsn.de>, @@ -14766,7 +14766,7 @@ Index: linux-2.4.35.4/drivers/char/serial.c */ static char *serial_version = "5.05c"; -@@ -413,6 +419,22 @@ +@@ -413,6 +419,22 @@ static inline int serial_paranoia_check( return 0; } @@ -14789,7 +14789,7 @@ Index: linux-2.4.35.4/drivers/char/serial.c static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset) { switch (info->io_type) { -@@ -447,6 +469,8 @@ +@@ -447,6 +469,8 @@ static _INLINE_ void serial_out(struct a outb(value, info->port+offset); } } @@ -14800,8 +14800,8 @@ Index: linux-2.4.35.4/drivers/char/serial.c * We used to support using pause I/O for certain machines. We Index: linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map 2007-12-15 05:19:44.934981737 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map @@ -0,0 +1,102 @@ +# Victor Interlink MP-C303/304 keyboard keymap +# @@ -14907,9 +14907,9 @@ Index: linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map + alt keycode 47 = End Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/vr41xx_keyb.c 2007-12-15 05:19:43.894922467 +0100 -+++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c 2007-12-15 05:19:44.938981966 +0100 -@@ -308,7 +308,7 @@ +--- linux-2.4.35.4.orig/drivers/char/vr41xx_keyb.c ++++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c +@@ -308,7 +308,7 @@ void __devinit kbd_init_hw(void) if (found != 0) { kiu_base = VRC4173_KIU_OFFSET; mkiuintreg = VRC4173_MKIUINTREG_OFFSET; @@ -14918,7 +14918,7 @@ Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c } } #endif -@@ -325,7 +325,7 @@ +@@ -325,7 +325,7 @@ void __devinit kbd_init_hw(void) if (current_cpu_data.cputype == CPU_VR4111 || current_cpu_data.cputype == CPU_VR4121) @@ -14929,9 +14929,9 @@ Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c Index: linux-2.4.35.4/drivers/i2c/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/Config.in 2007-12-15 05:19:43.902922923 +0100 -+++ linux-2.4.35.4/drivers/i2c/Config.in 2007-12-15 05:19:44.938981966 +0100 -@@ -57,6 +57,10 @@ +--- linux-2.4.35.4.orig/drivers/i2c/Config.in ++++ linux-2.4.35.4/drivers/i2c/Config.in +@@ -57,6 +57,10 @@ if [ "$CONFIG_I2C" != "n" ]; then if [ "$CONFIG_SGI_IP22" = "y" ]; then dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C fi @@ -14944,8 +14944,8 @@ Index: linux-2.4.35.4/drivers/i2c/Config.in # This is needed for automatic patch generation: sensors code ends here Index: linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c 2007-12-15 05:19:44.938981966 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c @@ -0,0 +1,340 @@ +/* + * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface @@ -15289,8 +15289,8 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c 2007-12-15 05:19:44.938981966 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c @@ -0,0 +1,154 @@ +/* + * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface @@ -15448,9 +15448,9 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c +} Index: linux-2.4.35.4/drivers/i2c/i2c-core.c =================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c 2007-12-15 05:19:43.922924062 +0100 -+++ linux-2.4.35.4/drivers/i2c/i2c-core.c 2007-12-15 05:19:44.938981966 +0100 -@@ -1277,6 +1277,9 @@ +--- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c ++++ linux-2.4.35.4/drivers/i2c/i2c-core.c +@@ -1277,6 +1277,9 @@ static int __init i2c_init(void) #ifdef CONFIG_I2C_MAX1617 extern int i2c_max1617_init(void); #endif @@ -15460,7 +15460,7 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-core.c #ifdef CONFIG_I2C_PROC extern int sensors_init(void); -@@ -1332,6 +1335,10 @@ +@@ -1332,6 +1335,10 @@ int __init i2c_init_all(void) i2c_max1617_init(); #endif @@ -15473,9 +15473,9 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-core.c sensors_init(); Index: linux-2.4.35.4/drivers/i2c/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/Makefile 2007-12-15 05:19:43.930924518 +0100 -+++ linux-2.4.35.4/drivers/i2c/Makefile 2007-12-15 05:19:44.942982192 +0100 -@@ -6,7 +6,7 @@ +--- linux-2.4.35.4.orig/drivers/i2c/Makefile ++++ linux-2.4.35.4/drivers/i2c/Makefile +@@ -6,7 +6,7 @@ O_TARGET := i2c.o export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \ i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \ @@ -15484,7 +15484,7 @@ Index: linux-2.4.35.4/drivers/i2c/Makefile obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o -@@ -25,6 +25,7 @@ +@@ -25,6 +25,7 @@ obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest obj-$(CONFIG_I2C_ALGO_SIBYTE) += i2c-algo-sibyte.o i2c-sibyte.o obj-$(CONFIG_I2C_MAX1617) += i2c-max1617.o obj-$(CONFIG_I2C_ALGO_SGI) += i2c-algo-sgi.o @@ -15494,9 +15494,9 @@ Index: linux-2.4.35.4/drivers/i2c/Makefile # This is needed for automatic patch generation: sensors code ends here Index: linux-2.4.35.4/drivers/media/video/indycam.c =================================================================== ---- linux-2.4.35.4.orig/drivers/media/video/indycam.c 2007-12-15 05:19:43.934924747 +0100 -+++ linux-2.4.35.4/drivers/media/video/indycam.c 2007-12-15 05:19:44.942982192 +0100 -@@ -50,13 +50,14 @@ +--- linux-2.4.35.4.orig/drivers/media/video/indycam.c ++++ linux-2.4.35.4/drivers/media/video/indycam.c +@@ -50,13 +50,14 @@ static int indycam_attach(struct i2c_ada 0x80, /* INDYCAM_GAMMA */ }; @@ -15513,7 +15513,7 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c camera = kmalloc(sizeof(*camera), GFP_KERNEL); if (!camera) { err = -ENOMEM; -@@ -67,7 +68,7 @@ +@@ -67,7 +68,7 @@ static int indycam_attach(struct i2c_ada client->adapter = adap; client->addr = addr; client->driver = &i2c_driver_indycam; @@ -15522,7 +15522,7 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c camera->client = client; err = i2c_attach_client(client); -@@ -75,18 +76,18 @@ +@@ -75,18 +76,18 @@ static int indycam_attach(struct i2c_ada goto out_free_camera; camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION); @@ -15547,8 +15547,8 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c return 0; Index: linux-2.4.35.4/drivers/media/video/vino.c =================================================================== ---- linux-2.4.35.4.orig/drivers/media/video/vino.c 2007-12-15 05:19:43.946925431 +0100 -+++ linux-2.4.35.4/drivers/media/video/vino.c 2007-12-15 05:19:44.950982647 +0100 +--- linux-2.4.35.4.orig/drivers/media/video/vino.c ++++ linux-2.4.35.4/drivers/media/video/vino.c @@ -5,6 +5,8 @@ * License version 2 as published by the Free Software Foundation. * @@ -15583,7 +15583,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c #define VINO_MIN_WIDTH 32 #define VINO_MIN_HEIGHT 32 -@@ -64,9 +76,7 @@ +@@ -64,9 +76,7 @@ static int threshold_b = 512; struct vino_device { struct video_device vdev; @@ -15594,7 +15594,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c int alpha; /* clipping... */ unsigned int left, right, top, bottom; -@@ -106,7 +116,7 @@ +@@ -106,7 +116,7 @@ struct vino_device { struct vino_client { struct i2c_client *driver; @@ -15603,7 +15603,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c }; struct vino_video { -@@ -362,6 +372,7 @@ +@@ -362,6 +372,7 @@ static int set_scaling(struct vino_devic static int dma_setup(struct vino_device *v) { u32 ctrl, intr; @@ -15611,7 +15611,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c struct sgi_vino_channel *ch; ch = (v->chan == VINO_CHAN_A) ? &vino->a : &vino->b; -@@ -377,14 +388,24 @@ +@@ -377,14 +388,24 @@ static int dma_setup(struct vino_device ch->line_size = v->line_size - 8; /* set the alpha register */ ch->alpha = v->alpha; @@ -15642,7 +15642,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c /* init the frame rate and norm (full frame rate only for now...) */ ch->frame_rate = VINO_FRAMERT_RT(0x1fff) | (get_capture_norm(v) == VIDEO_MODE_PAL ? -@@ -510,6 +531,7 @@ +@@ -510,6 +531,7 @@ static void field_done(struct vino_devic static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs) { u32 intr, ctrl; @@ -15650,7 +15650,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c spin_lock(&Vino->vino_lock); ctrl = vino->control; -@@ -525,12 +547,14 @@ +@@ -525,12 +547,14 @@ static void vino_interrupt(int irq, void vino->control = ctrl; clear_eod(&Vino->chB); } @@ -15671,9 +15671,9 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c static int vino_grab(struct vino_device *v, int frame) Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/devices/docprobe.c 2007-12-15 05:19:43.954925886 +0100 -+++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c 2007-12-15 05:19:44.950982647 +0100 -@@ -89,10 +89,10 @@ +--- linux-2.4.35.4.orig/drivers/mtd/devices/docprobe.c ++++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c +@@ -89,10 +89,10 @@ static unsigned long __initdata doc_loca 0xe4000000, #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, @@ -15689,8 +15689,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c 0 }; Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.c 2007-12-15 05:19:43.958926116 +0100 -+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c 2007-12-15 05:19:44.950982647 +0100 +--- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.c ++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c @@ -1,10 +1,10 @@ /* - * Copyright (c) 2001 Maciej W. Rozycki @@ -15731,7 +15731,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c */ static ulong ms02nv_addrs[] __initdata = { 0x07000000, 0x06800000, 0x06000000, 0x05800000, 0x05000000, -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ static int __init ms02nv_init_one(ulong int ret = -ENODEV; @@ -15740,7 +15740,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL); if (!mod_res) return -ENOMEM; -@@ -233,7 +233,7 @@ +@@ -233,7 +233,7 @@ static int __init ms02nv_init_one(ulong goto err_out_csr_res; } @@ -15749,7 +15749,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c mtd->index, ms02nv_name, addr, size >> 20); mp->next = root_ms02nv_mtd; -@@ -293,12 +293,12 @@ +@@ -293,12 +293,12 @@ static int __init ms02nv_init(void) switch (mips_machtype) { case MACH_DS5000_200: @@ -15766,8 +15766,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c stride = 2; Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.h 2007-12-15 05:19:43.966926571 +0100 -+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h 2007-12-15 05:19:44.950982647 +0100 +--- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.h ++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h @@ -1,32 +1,96 @@ /* - * Copyright (c) 2001 Maciej W. Rozycki @@ -15876,9 +15876,9 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h struct ms02nv_private { Index: linux-2.4.35.4/drivers/mtd/maps/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in 2007-12-15 05:19:43.974927026 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/Config.in 2007-12-15 05:19:44.950982647 +0100 -@@ -51,11 +51,26 @@ +--- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in ++++ linux-2.4.35.4/drivers/mtd/maps/Config.in +@@ -51,11 +51,26 @@ if [ "$CONFIG_MIPS" = "y" ]; then dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000 dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500 dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100 @@ -15907,8 +15907,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Config.in hex ' Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000 Index: linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c 2007-12-15 05:19:44.950982647 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c @@ -0,0 +1,283 @@ +/* + * Flash memory access on Alchemy Db1xxx boards @@ -16195,8 +16195,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c 2007-12-15 05:19:44.954982876 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c @@ -0,0 +1,189 @@ +/* + * Flash memory access on Alchemy HydrogenIII boards @@ -16389,8 +16389,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/maps/lasat.c 2007-12-15 05:19:43.994928166 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/lasat.c 2007-12-15 05:19:44.954982876 +0100 +--- linux-2.4.35.4.orig/drivers/mtd/maps/lasat.c ++++ linux-2.4.35.4/drivers/mtd/maps/lasat.c @@ -1,15 +1,6 @@ /* * Flash device on lasat 100 and 200 boards @@ -16415,7 +16415,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c static struct mtd_info *mymtd; -@@ -69,30 +59,33 @@ +@@ -69,30 +59,33 @@ static void sp_copy_to(struct map_info * } static struct map_info sp_map = { @@ -16461,7 +16461,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c sp_map.size = lasat_board_info.li_flash_size; printk(KERN_NOTICE "sp flash device: %lx at %lx\n", -@@ -109,12 +102,15 @@ +@@ -109,12 +102,15 @@ static int __init init_sp(void) for (i=0; i < LASAT_MTD_LAST; i++) { size = lasat_flash_partition_size(i); @@ -16481,7 +16481,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c return 0; } -@@ -124,11 +120,11 @@ +@@ -124,11 +120,11 @@ static int __init init_sp(void) static void __exit cleanup_sp(void) { if (mymtd) { @@ -16498,9 +16498,9 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c Index: linux-2.4.35.4/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile 2007-12-15 05:19:43.998928395 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/Makefile 2007-12-15 05:19:44.954982876 +0100 -@@ -52,7 +52,13 @@ +--- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile ++++ linux-2.4.35.4/drivers/mtd/maps/Makefile +@@ -52,7 +52,13 @@ obj-$(CONFIG_MTD_PCI) += pci.o obj-$(CONFIG_MTD_PB1000) += pb1xxx-flash.o obj-$(CONFIG_MTD_PB1100) += pb1xxx-flash.o obj-$(CONFIG_MTD_PB1500) += pb1xxx-flash.o @@ -16514,7 +16514,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Makefile obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o obj-$(CONFIG_MTD_EDB7312) += edb7312.o obj-$(CONFIG_MTD_IMPA7) += impa7.o -@@ -61,5 +67,6 @@ +@@ -61,5 +67,6 @@ obj-$(CONFIG_MTD_REDWOOD) += redwood.o obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o @@ -16523,8 +16523,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c 2007-12-15 05:19:44.954982876 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c @@ -0,0 +1,194 @@ +/* + * Flash memory access on AMD Mirage board. @@ -16722,8 +16722,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c 2007-12-15 05:19:44.954982876 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c @@ -0,0 +1,181 @@ +/* + * Flash memory access on 4G Systems MTX-1 board @@ -16908,8 +16908,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c 2007-12-15 05:19:44.958983106 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c @@ -0,0 +1,270 @@ +/* + * Flash memory access on Alchemy Pb1550 board @@ -17183,9 +17183,9 @@ Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/maps/pb1xxx-flash.c 2007-12-15 05:19:44.026929991 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c 2007-12-15 05:19:44.958983106 +0100 -@@ -192,6 +192,34 @@ +--- linux-2.4.35.4.orig/drivers/mtd/maps/pb1xxx-flash.c ++++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c +@@ -192,6 +192,34 @@ static struct mtd_partition pb1xxx_parti #else #error MTD_PB1500 define combo error /* should never happen */ #endif @@ -17222,8 +17222,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c #endif Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c 2007-12-15 05:19:44.958983106 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c @@ -0,0 +1,186 @@ +/* + * Flash memory access on MyCable XXS1500 board @@ -17413,8 +17413,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/net/defxx.c =================================================================== ---- linux-2.4.35.4.orig/drivers/net/defxx.c 2007-12-15 05:19:44.042930901 +0100 -+++ linux-2.4.35.4/drivers/net/defxx.c 2007-12-15 05:19:44.962983332 +0100 +--- linux-2.4.35.4.orig/drivers/net/defxx.c ++++ linux-2.4.35.4/drivers/net/defxx.c @@ -10,24 +10,18 @@ * * Abstract: @@ -17507,7 +17507,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c #define DYNAMIC_BUFFERS 1 -@@ -243,7 +251,7 @@ +@@ -243,7 +251,7 @@ static char version[] __devinitdata = static void dfx_bus_init(struct net_device *dev); static void dfx_bus_config_check(DFX_board_t *bp); @@ -17516,7 +17516,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c static int dfx_adap_init(DFX_board_t *bp, int get_buffers); static int dfx_open(struct net_device *dev); -@@ -337,48 +345,84 @@ +@@ -337,48 +345,84 @@ static inline void dfx_port_write_byte( int offset, u8 data ) @@ -17601,7 +17601,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* -@@ -393,8 +437,9 @@ +@@ -393,8 +437,9 @@ static inline void dfx_port_read_long( * Condition code * * Arguments: @@ -17613,7 +17613,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c * * Functional Description: * -@@ -410,54 +455,68 @@ +@@ -410,54 +455,68 @@ static inline void dfx_port_read_long( * initialized and the board resources are read and stored in * the device structure. */ @@ -17701,7 +17701,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c dev->get_stats = dfx_ctl_get_stats; dev->open = dfx_open; dev->stop = dfx_close; -@@ -465,37 +524,54 @@ +@@ -465,37 +524,54 @@ static int __devinit dfx_init_one_pci_or dev->set_multicast_list = dfx_ctl_set_multicast_list; dev->set_mac_address = dfx_ctl_set_mac_address; @@ -17765,7 +17765,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } static int __init dfx_eisa_init(void) -@@ -507,6 +583,7 @@ +@@ -507,6 +583,7 @@ static int __init dfx_eisa_init(void) DBG_printk("In dfx_eisa_init...\n"); @@ -17773,7 +17773,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* Scan for FDDI EISA controllers */ for (i=0; i < DFX_MAX_EISA_SLOTS; i++) /* only scan for up to 16 EISA slots */ -@@ -517,9 +594,27 @@ +@@ -517,9 +594,27 @@ static int __init dfx_eisa_init(void) { port = (i << 12); /* recalc base addr */ @@ -17802,7 +17802,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c return rc; } -@@ -583,8 +678,9 @@ +@@ -583,8 +678,9 @@ static void __devinit dfx_bus_init(struc /* Initialize adapter based on bus type */ @@ -17814,7 +17814,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* Get the interrupt level from the ESIC chip */ dfx_port_read_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, &val); -@@ -766,6 +862,7 @@ +@@ -766,6 +862,7 @@ static void __devinit dfx_bus_config_che * * Arguments: * dev - pointer to device information @@ -17822,7 +17822,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c * * Functional Description: * This function allocates additional resources such as the host memory -@@ -780,20 +877,21 @@ +@@ -780,20 +877,21 @@ static void __devinit dfx_bus_config_che * or read adapter MAC address * * Assumptions: @@ -17848,7 +17848,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c u32 data; /* host data register value */ DBG_printk("In dfx_driver_init...\n"); -@@ -837,26 +935,20 @@ +@@ -837,26 +935,20 @@ static int __devinit dfx_driver_init(str /* Read the factory MAC address from the adapter then save it */ @@ -17885,7 +17885,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c memcpy(&bp->factory_mac_addr[4], &data, sizeof(u16)); /* -@@ -867,28 +959,27 @@ +@@ -867,28 +959,27 @@ static int __devinit dfx_driver_init(str */ memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN); @@ -17934,7 +17934,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * Get memory for descriptor block, consumer block, and other buffers -@@ -903,14 +994,15 @@ +@@ -903,14 +994,15 @@ static int __devinit dfx_driver_init(str #endif sizeof(PI_CONSUMER_BLOCK) + (PI_ALIGN_K_DESC_BLK - 1); @@ -17956,7 +17956,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * To guarantee the 8K alignment required for the descriptor block, 8K - 1 -@@ -924,7 +1016,7 @@ +@@ -924,7 +1016,7 @@ static int __devinit dfx_driver_init(str * for allocating the needed memory. */ @@ -17965,7 +17965,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c curr_v = top_v + (curr_p - top_p); /* Reserve space for descriptor block */ -@@ -965,14 +1057,20 @@ +@@ -965,14 +1057,20 @@ static int __devinit dfx_driver_init(str /* Display virtual and physical addresses if debug driver */ @@ -17992,7 +17992,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* -@@ -1218,7 +1316,9 @@ +@@ -1218,7 +1316,9 @@ static int dfx_open(struct net_device *d /* Register IRQ - support shared interrupts by passing device ptr */ @@ -18003,7 +18003,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c if (ret) { printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq); return ret; -@@ -1737,7 +1837,7 @@ +@@ -1737,7 +1837,7 @@ static void dfx_interrupt(int irq, void dfx_port_write_long(bp, PFI_K_REG_MODE_CTRL, (PFI_MODE_M_PDQ_INT_ENB + PFI_MODE_M_DMA_ENB)); } @@ -18012,7 +18012,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c { /* Disable interrupts at the ESIC */ -@@ -1755,6 +1855,13 @@ +@@ -1755,6 +1855,13 @@ static void dfx_interrupt(int irq, void tmp |= PI_CONFIG_STAT_0_M_INT_ENB; dfx_port_write_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, tmp); } @@ -18026,7 +18026,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c spin_unlock(&bp->lock); } -@@ -2663,12 +2770,12 @@ +@@ -2663,12 +2770,12 @@ static int dfx_hw_dma_uninit(DFX_board_t static void my_skb_align(struct sk_buff *skb, int n) { @@ -18043,7 +18043,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } -@@ -2745,7 +2852,10 @@ +@@ -2745,7 +2852,10 @@ static int dfx_rcv_init(DFX_board_t *bp, */ my_skb_align(newskb, 128); @@ -18055,7 +18055,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * p_rcv_buff_va is only used inside the * kernel so we put the skb pointer here. -@@ -2859,9 +2969,17 @@ +@@ -2859,9 +2969,17 @@ static void dfx_rcv_queue_process( my_skb_align(newskb, 128); skb = (struct sk_buff *)bp->p_rcv_buff_va[entry]; @@ -18074,7 +18074,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } else skb = NULL; } else -@@ -2934,7 +3052,7 @@ +@@ -2934,7 +3052,7 @@ static void dfx_rcv_queue_process( * is contained in a single physically contiguous buffer * in which the virtual address of the start of packet * (skb->data) can be converted to a physical address @@ -18083,7 +18083,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c * * Since the adapter architecture requires a three byte * packet request header to prepend the start of packet, -@@ -3082,12 +3200,13 @@ +@@ -3082,12 +3200,13 @@ static int dfx_xmt_queue_pkt( * skb->data. * 6. The physical address of the start of packet * can be determined from the virtual address @@ -18099,7 +18099,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * Verify that descriptor is actually available -@@ -3171,6 +3290,7 @@ +@@ -3171,6 +3290,7 @@ static int dfx_xmt_done(DFX_board_t *bp) { XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ PI_TYPE_2_CONSUMER *p_type_2_cons; /* ptr to rcv/xmt consumer block register */ @@ -18107,7 +18107,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c int freed = 0; /* buffers freed */ /* Service all consumed transmit frames */ -@@ -3188,7 +3308,11 @@ +@@ -3188,7 +3308,11 @@ static int dfx_xmt_done(DFX_board_t *bp) bp->xmt_total_bytes += p_xmt_drv_descr->p_skb->len; /* Return skb to operating system */ @@ -18120,7 +18120,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c dev_kfree_skb_irq(p_xmt_drv_descr->p_skb); /* -@@ -3297,6 +3421,7 @@ +@@ -3297,6 +3421,7 @@ static void dfx_xmt_flush( DFX_board_t * { u32 prod_cons; /* rcv/xmt consumer block longword */ XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ @@ -18128,7 +18128,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* Flush all outstanding transmit frames */ -@@ -3307,7 +3432,11 @@ +@@ -3307,7 +3432,11 @@ static void dfx_xmt_flush( DFX_board_t * p_xmt_drv_descr = &(bp->xmt_drv_descr_blk[bp->rcv_xmt_reg.index.xmt_comp]); /* Return skb to operating system */ @@ -18141,7 +18141,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c dev_kfree_skb(p_xmt_drv_descr->p_skb); /* Increment transmit error counter */ -@@ -3337,12 +3466,36 @@ +@@ -3337,12 +3466,36 @@ static void dfx_xmt_flush( DFX_board_t * static void __devexit dfx_remove_one_pci_or_eisa(struct pci_dev *pdev, struct net_device *dev) { @@ -18182,7 +18182,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } static void __devexit dfx_remove_one (struct pci_dev *pdev) -@@ -3353,21 +3506,22 @@ +@@ -3353,21 +3506,22 @@ static void __devexit dfx_remove_one (st pci_set_drvdata(pdev, NULL); } @@ -18210,7 +18210,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c static void __exit dfx_eisa_cleanup(void) -@@ -3388,12 +3542,7 @@ +@@ -3388,12 +3542,7 @@ static void __exit dfx_eisa_cleanup(void static int __init dfx_init(void) { @@ -18224,7 +18224,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c rc_pci = pci_module_init(&dfx_driver); if (rc_pci >= 0) dfx_have_pci = 1; -@@ -3401,20 +3550,27 @@ +@@ -3401,20 +3550,27 @@ static int __init dfx_init(void) rc_eisa = dfx_eisa_init(); if (rc_eisa >= 0) dfx_have_eisa = 1; @@ -18257,8 +18257,8 @@ Index: linux-2.4.35.4/drivers/net/defxx.c Index: linux-2.4.35.4/drivers/net/defxx.h =================================================================== ---- linux-2.4.35.4.orig/drivers/net/defxx.h 2007-12-15 05:19:44.050931357 +0100 -+++ linux-2.4.35.4/drivers/net/defxx.h 2007-12-15 05:19:44.962983332 +0100 +--- linux-2.4.35.4.orig/drivers/net/defxx.h ++++ linux-2.4.35.4/drivers/net/defxx.h @@ -12,17 +12,11 @@ * Contains all definitions specified by port specification and required * by the defxx.c driver. @@ -18289,7 +18289,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h */ #ifndef _DEFXX_H_ -@@ -1467,6 +1462,11 @@ +@@ -1467,6 +1462,11 @@ typedef union #endif /* #ifndef BIG_ENDIAN */ @@ -18301,7 +18301,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h /* Define EISA controller register offsets */ #define PI_ESIC_K_BURST_HOLDOFF 0x040 -@@ -1634,6 +1634,7 @@ +@@ -1634,6 +1634,7 @@ typedef union #define DFX_BUS_TYPE_PCI 0 /* type code for DEC FDDIcontroller/PCI */ #define DFX_BUS_TYPE_EISA 1 /* type code for DEC FDDIcontroller/EISA */ @@ -18309,7 +18309,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h #define DFX_FC_PRH2_PRH1_PRH0 0x54003820 /* Packet Request Header bytes + FC */ #define DFX_PRH0_BYTE 0x20 /* Packet Request Header byte 0 */ -@@ -1704,17 +1705,19 @@ +@@ -1704,17 +1705,19 @@ typedef struct DFX_board_tag { /* Keep virtual and physical pointers to locked, physically contiguous memory */ @@ -18335,7 +18335,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h /* Keep local copies of Type 1 and Type 2 register data */ -@@ -1758,8 +1761,9 @@ +@@ -1758,8 +1761,9 @@ typedef struct DFX_board_tag struct net_device *dev; /* pointer to device structure */ struct net_device *next; @@ -18349,9 +18349,9 @@ Index: linux-2.4.35.4/drivers/net/defxx.h u32 req_ttrt; /* requested TTRT value (in 80ns units) */ Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c =================================================================== ---- linux-2.4.35.4.orig/drivers/net/hamradio/hdlcdrv.c 2007-12-15 05:19:44.058931815 +0100 -+++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c 2007-12-15 05:19:44.962983332 +0100 -@@ -587,6 +587,8 @@ +--- linux-2.4.35.4.orig/drivers/net/hamradio/hdlcdrv.c ++++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c +@@ -587,6 +587,8 @@ static int hdlcdrv_close(struct net_devi return -EINVAL; s = (struct hdlcdrv_state *)dev->priv; @@ -18362,9 +18362,9 @@ Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c if (s->skb) Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c =================================================================== ---- linux-2.4.35.4.orig/drivers/net/irda/au1k_ir.c 2007-12-15 05:19:44.066932270 +0100 -+++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c 2007-12-15 05:19:44.966983561 +0100 -@@ -81,10 +81,6 @@ +--- linux-2.4.35.4.orig/drivers/net/irda/au1k_ir.c ++++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c +@@ -81,10 +81,6 @@ static char version[] __devinitdata = #define RUN_AT(x) (jiffies + (x)) @@ -18377,8 +18377,8 @@ Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c /* Index: linux-2.4.35.4/drivers/net/sgiseeq.c =================================================================== ---- linux-2.4.35.4.orig/drivers/net/sgiseeq.c 2007-12-15 05:19:44.074932725 +0100 -+++ linux-2.4.35.4/drivers/net/sgiseeq.c 2007-12-15 05:19:44.966983561 +0100 +--- linux-2.4.35.4.orig/drivers/net/sgiseeq.c ++++ linux-2.4.35.4/drivers/net/sgiseeq.c @@ -24,16 +24,16 @@ #include <asm/io.h> #include <asm/system.h> @@ -18398,7 +18398,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c static char *sgiseeqstr = "SGI Seeq8003"; /* -@@ -113,9 +113,9 @@ +@@ -113,9 +113,9 @@ static struct net_device *root_sgiseeq_d static inline void hpc3_eth_reset(struct hpc3_ethregs *hregs) { @@ -18410,7 +18410,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c } static inline void reset_hpc3_and_seeq(struct hpc3_ethregs *hregs, -@@ -238,7 +238,6 @@ +@@ -238,7 +238,6 @@ void sgiseeq_dump_rings(void) #define TSTAT_INIT_SEEQ (SEEQ_TCMD_IPT|SEEQ_TCMD_I16|SEEQ_TCMD_IC|SEEQ_TCMD_IUF) #define TSTAT_INIT_EDLC ((TSTAT_INIT_SEEQ) | SEEQ_TCMD_RB2) @@ -18418,7 +18418,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c static int init_seeq(struct net_device *dev, struct sgiseeq_private *sp, struct sgiseeq_regs *sregs) -@@ -260,8 +259,6 @@ +@@ -260,8 +259,6 @@ static int init_seeq(struct net_device * sregs->tstat = TSTAT_INIT_SEEQ; } @@ -18427,7 +18427,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c hregs->rx_ndptr = PHYSADDR(&sp->srings.rx_desc[0]); hregs->tx_ndptr = PHYSADDR(&sp->srings.tx_desc[0]); -@@ -432,7 +429,7 @@ +@@ -432,7 +429,7 @@ static void sgiseeq_interrupt(int irq, v spin_lock(&sp->tx_lock); /* Ack the IRQ and set software state. */ @@ -18436,7 +18436,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c /* Always check for received packets. */ sgiseeq_rx(dev, sp, hregs, sregs); -@@ -616,7 +613,7 @@ +@@ -616,7 +613,7 @@ static inline void setup_rx_ring(struct #define ALIGNED(x) ((((unsigned long)(x)) + 0xf) & ~(0xf)) @@ -18445,7 +18445,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c { struct net_device *dev; struct sgiseeq_private *sp; -@@ -629,7 +626,7 @@ +@@ -629,7 +626,7 @@ int sgiseeq_init(struct hpc3_regs* regs, goto err_out; } /* Make private data page aligned */ @@ -18454,7 +18454,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c if (!sp) { printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n"); err = -ENOMEM; -@@ -644,7 +641,9 @@ +@@ -644,7 +641,9 @@ int sgiseeq_init(struct hpc3_regs* regs, #define EADDR_NVOFS 250 for (i = 0; i < 3; i++) { @@ -18465,7 +18465,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c dev->dev_addr[2 * i] = tmp >> 8; dev->dev_addr[2 * i + 1] = tmp & 0xff; -@@ -654,8 +653,8 @@ +@@ -654,8 +653,8 @@ int sgiseeq_init(struct hpc3_regs* regs, gpriv = sp; gdev = dev; #endif @@ -18476,7 +18476,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c sp->name = sgiseeqstr; sp->mode = SEEQ_RCMD_RBCAST; -@@ -672,6 +671,11 @@ +@@ -672,6 +671,11 @@ int sgiseeq_init(struct hpc3_regs* regs, setup_rx_ring(sp->srings.rx_desc, SEEQ_RX_BUFFERS); setup_tx_ring(sp->srings.tx_desc, SEEQ_TX_BUFFERS); @@ -18488,7 +18488,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c /* Reset the chip. */ hpc3_eth_reset(sp->hregs); -@@ -699,7 +703,7 @@ +@@ -699,7 +703,7 @@ int sgiseeq_init(struct hpc3_regs* regs, goto err_out_free_irq; } @@ -18497,7 +18497,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c for (i = 0; i < 6; i++) printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':'); -@@ -721,10 +725,22 @@ +@@ -721,10 +725,22 @@ err_out: static int __init sgiseeq_probe(void) { @@ -18522,7 +18522,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c } static void __exit sgiseeq_exit(void) -@@ -747,4 +763,6 @@ +@@ -747,4 +763,6 @@ static void __exit sgiseeq_exit(void) module_init(sgiseeq_probe); module_exit(sgiseeq_exit); @@ -18531,9 +18531,9 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/pci/pci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/pci/pci.c 2007-12-15 05:19:44.082933181 +0100 -+++ linux-2.4.35.4/drivers/pci/pci.c 2007-12-15 05:19:44.966983561 +0100 -@@ -1281,11 +1281,17 @@ +--- linux-2.4.35.4.orig/drivers/pci/pci.c ++++ linux-2.4.35.4/drivers/pci/pci.c +@@ -1281,11 +1281,17 @@ static int __devinit pci_scan_bridge(str { unsigned int buses; unsigned short cr; @@ -18551,7 +18551,7 @@ Index: linux-2.4.35.4/drivers/pci/pci.c if ((buses & 0xffff00) && !pcibios_assign_all_busses()) { /* * Bus already configured by firmware, process it in the first -@@ -1351,6 +1357,7 @@ +@@ -1351,6 +1357,7 @@ static int __devinit pci_scan_bridge(str pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); pci_write_config_word(dev, PCI_COMMAND, cr); } @@ -18561,8 +18561,8 @@ Index: linux-2.4.35.4/drivers/pci/pci.c } Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c =================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c 2007-12-15 05:19:44.090933636 +0100 -+++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c 2007-12-15 05:19:44.970983787 +0100 +--- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c ++++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c @@ -1,6 +1,6 @@ /* * @@ -18593,7 +18593,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c static int db1x00_pcmcia_init(struct pcmcia_init *init) { -@@ -76,7 +87,7 @@ +@@ -76,7 +87,7 @@ static int db1x00_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state) { u32 inserted; @@ -18602,7 +18602,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c if(sock > PCMCIA_MAX_SOCK) return -1; -@@ -87,11 +98,11 @@ +@@ -87,11 +98,11 @@ db1x00_pcmcia_socket_state(unsigned sock if (sock == 0) { vs = bcsr->status & 0x3; @@ -18616,7 +18616,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c } DEBUG(KERN_DEBUG "db1x00 socket %d: inserted %d, vs %d\n", -@@ -144,16 +155,9 @@ +@@ -144,16 +155,9 @@ static int db1x00_pcmcia_get_irq_info(st if(info->sock > PCMCIA_MAX_SOCK) return -1; if(info->sock == 0) @@ -18637,9 +18637,9 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c Index: linux-2.4.35.4/drivers/pcmcia/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/Config.in 2007-12-15 05:19:44.098934094 +0100 -+++ linux-2.4.35.4/drivers/pcmcia/Config.in 2007-12-15 05:19:44.974984016 +0100 -@@ -30,16 +30,14 @@ +--- linux-2.4.35.4.orig/drivers/pcmcia/Config.in ++++ linux-2.4.35.4/drivers/pcmcia/Config.in +@@ -30,16 +30,14 @@ if [ "$CONFIG_PCMCIA" != "n" ]; then dep_tristate ' M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA fi if [ "$CONFIG_SOC_AU1X00" = "y" ]; then @@ -18662,9 +18662,9 @@ Index: linux-2.4.35.4/drivers/pcmcia/Config.in fi Index: linux-2.4.35.4/drivers/pcmcia/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/Makefile 2007-12-15 05:19:44.106934550 +0100 -+++ linux-2.4.35.4/drivers/pcmcia/Makefile 2007-12-15 05:19:44.974984016 +0100 -@@ -61,9 +61,18 @@ +--- linux-2.4.35.4.orig/drivers/pcmcia/Makefile ++++ linux-2.4.35.4/drivers/pcmcia/Makefile +@@ -61,9 +61,18 @@ endif obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o au1000_ss-objs-y := au1000_generic.o @@ -18686,7 +18686,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/Makefile obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o -@@ -89,6 +98,7 @@ +@@ -89,6 +98,7 @@ sa1100_cs-objs-$(CONFIG_SA1100_STORK) + sa1100_cs-objs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o sa1111_generic.o sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o @@ -18696,8 +18696,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c 2007-12-15 05:19:44.978984245 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c @@ -0,0 +1,886 @@ +/* + * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services. @@ -19587,8 +19587,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c +module_exit(vrc4171_card_exit); Index: linux-2.4.35.4/drivers/scsi/NCR53C9x.h =================================================================== ---- linux-2.4.35.4.orig/drivers/scsi/NCR53C9x.h 2007-12-15 05:19:44.122935460 +0100 -+++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h 2007-12-15 05:19:44.978984245 +0100 +--- linux-2.4.35.4.orig/drivers/scsi/NCR53C9x.h ++++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h @@ -144,12 +144,7 @@ #ifndef MULTIPLE_PAD_SIZES @@ -19605,8 +19605,8 @@ Index: linux-2.4.35.4/drivers/scsi/NCR53C9x.h struct ESP_regs { Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c =================================================================== ---- linux-2.4.35.4.orig/drivers/sound/au1550_i2s.c 2007-12-15 05:19:44.126935690 +0100 -+++ linux-2.4.35.4/drivers/sound/au1550_i2s.c 2007-12-15 05:19:44.982984472 +0100 +--- linux-2.4.35.4.orig/drivers/sound/au1550_i2s.c ++++ linux-2.4.35.4/drivers/sound/au1550_i2s.c @@ -41,6 +41,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * @@ -19713,7 +19713,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c spinlock_t lock; struct semaphore open_sem; -@@ -114,6 +191,11 @@ +@@ -114,6 +191,11 @@ static struct au1550_state { int no_vra; volatile psc_i2s_t *psc_addr; @@ -19725,7 +19725,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c struct dmabuf { u32 dmanr; unsigned sample_rate; -@@ -195,60 +277,224 @@ +@@ -195,60 +277,224 @@ au1550_delay(int msec) } } @@ -19988,7 +19988,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } /* stop the ADC before calling */ -@@ -256,27 +502,16 @@ +@@ -256,27 +502,16 @@ static void set_adc_rate(struct au1550_state *s, unsigned rate) { struct dmabuf *adc = &s->dma_adc; @@ -20020,7 +20020,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } /* stop the DAC before calling */ -@@ -284,26 +519,89 @@ +@@ -284,26 +519,89 @@ static void set_dac_rate(struct au1550_state *s, unsigned rate) { struct dmabuf *dac = &s->dma_dac; @@ -20123,7 +20123,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } static void -@@ -354,8 +652,7 @@ +@@ -354,8 +652,7 @@ stop_adc(struct au1550_state *s) ip->psc_i2spcr = PSC_I2SPCR_RP; au_sync(); @@ -20133,7 +20133,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c do { stat = ip->psc_i2sstat; au_sync(); -@@ -463,7 +760,6 @@ +@@ -463,7 +760,6 @@ prog_dmabuf(struct au1550_state *s, stru if (db->num_channels == 1) db->cnt_factor *= 2; db->cnt_factor *= db->src_factor; @@ -20141,7 +20141,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c db->count = 0; db->dma_qcount = 0; db->nextIn = db->nextOut = db->rawbuf; -@@ -546,12 +842,13 @@ +@@ -546,12 +842,13 @@ dac_dma_interrupt(int irq, void *dev_id, if (i2s_stat & (PSC_I2SSTAT_TF | PSC_I2SSTAT_TR | PSC_I2SSTAT_TF)) dbg("I2S status = 0x%08x", i2s_stat); #endif @@ -20158,7 +20158,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } db->nextOut += db->fragsize; if (db->nextOut >= db->rawbuf + db->dmasize) -@@ -606,65 +903,43 @@ +@@ -606,65 +903,43 @@ adc_dma_interrupt(int irq, void *dev_id, } @@ -20250,7 +20250,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c spin_unlock_irqrestore(&s->lock, flags); if (count <= 0) break; -@@ -672,9 +947,9 @@ +@@ -672,9 +947,9 @@ drain_dac(struct au1550_state *s, int no break; if (nonblock) return -EBUSY; @@ -20262,7 +20262,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c au1550_delay(tmo); } if (signal_pending(current)) -@@ -698,8 +973,7 @@ +@@ -698,8 +973,7 @@ static inline s16 U8_TO_S16(u8 ch) * If interpolating (no VRA), duplicate every audio frame src_factor times. */ static int @@ -20272,7 +20272,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c { int sample, i; int interp_bytes_per_sample; -@@ -737,11 +1011,12 @@ +@@ -737,11 +1011,12 @@ translate_from_user(struct dmabuf *db, c /* duplicate every audio frame src_factor times */ @@ -20287,7 +20287,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } return num_samples * interp_bytes_per_sample; -@@ -996,15 +1271,14 @@ +@@ -996,15 +1271,14 @@ au1550_write(struct file *file, const ch * on the dma queue. If the queue count reaches zero, * we know the dma has stopped. */ @@ -20305,7 +20305,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c db->total_bytes += db->dma_fragsize; if (db->dma_qcount == 0) start_dac(s); -@@ -1017,7 +1291,6 @@ +@@ -1017,7 +1291,6 @@ au1550_write(struct file *file, const ch buffer += usercnt; ret += usercnt; } /* while (count > 0) */ @@ -20313,7 +20313,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c out: up(&s->sem); out2: -@@ -1371,9 +1644,6 @@ +@@ -1371,9 +1644,6 @@ au1550_ioctl(struct inode *inode, struct s->dma_dac.cnt_factor; abinfo.fragstotal = s->dma_dac.numfrag; abinfo.fragments = abinfo.bytes >> s->dma_dac.fragshift; @@ -20323,7 +20323,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c return copy_to_user((void *) arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0; -@@ -1536,13 +1806,9 @@ +@@ -1536,13 +1806,9 @@ au1550_ioctl(struct inode *inode, struct case SNDCTL_DSP_SETSYNCRO: case SOUND_PCM_READ_FILTER: return -EINVAL; @@ -20338,7 +20338,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } -@@ -1664,15 +1930,15 @@ +@@ -1664,15 +1930,15 @@ static /*const */ struct file_operations MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); MODULE_DESCRIPTION("Au1550 Audio Driver"); @@ -20357,7 +20357,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c * We know SMBus uses Freq3. * By making changes to this rate, plus the word strobe * size, we can make fine adjustments to the actual data rate. -@@ -1700,11 +1966,17 @@ +@@ -1700,11 +1966,17 @@ intclk_setup(void) */ clk = au_readl(SYS_CLKSRC); au_sync(); @@ -20375,7 +20375,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c static int __devinit au1550_probe(void) -@@ -1724,6 +1996,11 @@ +@@ -1724,6 +1996,11 @@ au1550_probe(void) init_MUTEX(&s->open_sem); spin_lock_init(&s->lock); @@ -20387,7 +20387,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c s->psc_addr = (volatile psc_i2s_t *)I2S_PSC_BASE; ip = s->psc_addr; -@@ -1765,9 +2042,8 @@ +@@ -1765,9 +2042,8 @@ au1550_probe(void) if ((s->dev_audio = register_sound_dsp(&au1550_audio_fops, -1)) < 0) goto err_dev1; @@ -20399,7 +20399,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c goto err_dev2; #endif -@@ -1777,7 +2053,6 @@ +@@ -1777,7 +2053,6 @@ au1550_probe(void) proc_au1550_dump, NULL); #endif /* AU1550_DEBUG */ @@ -20407,7 +20407,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c /* The GPIO for the appropriate PSC was configured by the * board specific start up. -@@ -1786,7 +2061,12 @@ +@@ -1786,7 +2061,12 @@ au1550_probe(void) */ ip->psc_ctrl = PSC_CTRL_DISABLE; /* Disable PSC */ au_sync(); @@ -20420,7 +20420,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c au_sync(); /* Enable PSC -@@ -1806,42 +2086,18 @@ +@@ -1806,42 +2086,18 @@ au1550_probe(void) * Actual I2S mode (first bit delayed by one clock). * Master mode (We provide the clock from the PSC). */ @@ -20469,7 +20469,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c if (s->no_vra) info("no VRA, interpolating and decimating"); -@@ -1866,6 +2122,8 @@ +@@ -1866,6 +2122,8 @@ au1550_probe(void) err_dev2: unregister_sound_dsp(s->dev_audio); #endif @@ -20480,8 +20480,8 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c err_dma2: Index: linux-2.4.35.4/drivers/sound/au1550_psc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c 2007-12-15 05:19:44.134936145 +0100 -+++ linux-2.4.35.4/drivers/sound/au1550_psc.c 2007-12-15 05:19:44.982984472 +0100 +--- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c ++++ linux-2.4.35.4/drivers/sound/au1550_psc.c @@ -30,6 +30,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * @@ -20505,7 +20505,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c #undef OSS_DOCUMENTED_MIXER_SEMANTICS #define AU1550_MODULE_NAME "Au1550 psc audio" -@@ -521,7 +530,14 @@ +@@ -521,7 +530,14 @@ stop_adc(struct au1550_state *s) spin_unlock_irqrestore(&s->lock, flags); } @@ -20521,7 +20521,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c static void set_xmit_slots(int num_channels) { -@@ -565,6 +581,14 @@ +@@ -565,6 +581,14 @@ set_xmit_slots(int num_channels) } while ((stat & PSC_AC97STAT_DR) == 0); } @@ -20536,7 +20536,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c static void set_recv_slots(int num_channels) { -@@ -608,7 +632,6 @@ +@@ -608,7 +632,6 @@ start_dac(struct au1550_state *s) spin_lock_irqsave(&s->lock, flags); @@ -20544,7 +20544,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c au_writel(PSC_AC97PCR_TC, PSC_AC97PCR); au_sync(); au_writel(PSC_AC97PCR_TS, PSC_AC97PCR); -@@ -640,7 +663,6 @@ +@@ -640,7 +663,6 @@ start_adc(struct au1550_state *s) db->nextIn -= db->dmasize; } @@ -20552,7 +20552,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c au1xxx_dbdma_start(db->dmanr); au_writel(PSC_AC97PCR_RC, PSC_AC97PCR); au_sync(); -@@ -752,12 +774,16 @@ +@@ -752,12 +774,16 @@ dac_dma_interrupt(int irq, void *dev_id, if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE)) dbg("AC97C status = 0x%08x", ac97c_stat); #endif @@ -20570,7 +20570,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c } db->nextOut += db->fragsize; if (db->nextOut >= db->rawbuf + db->dmasize) -@@ -941,11 +967,12 @@ +@@ -941,11 +967,12 @@ translate_from_user(struct dmabuf *db, c /* duplicate every audio frame src_factor times */ @@ -20585,7 +20585,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c } return num_samples * interp_bytes_per_sample; -@@ -1203,7 +1230,7 @@ +@@ -1203,7 +1230,7 @@ au1550_write(struct file *file, const ch while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, db->fragsize) == 0) { @@ -20594,7 +20594,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c } db->nextOut += db->fragsize; if (db->nextOut >= db->rawbuf + db->dmasize) -@@ -1481,6 +1508,7 @@ +@@ -1481,6 +1508,7 @@ au1550_ioctl(struct inode *inode, struct return -EINVAL; stop_adc(s); s->dma_adc.num_channels = val; @@ -20602,7 +20602,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c if ((ret = prog_dmabuf_adc(s))) return ret; } -@@ -1538,6 +1566,7 @@ +@@ -1538,6 +1566,7 @@ au1550_ioctl(struct inode *inode, struct } s->dma_dac.num_channels = val; @@ -20610,7 +20610,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c if ((ret = prog_dmabuf_dac(s))) return ret; } -@@ -1832,10 +1861,8 @@ +@@ -1832,10 +1861,8 @@ au1550_open(struct inode *inode, struct down(&s->open_sem); } @@ -20622,7 +20622,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c s->dma_adc.ossfragshift = s->dma_adc.ossmaxfrags = s->dma_adc.subdivision = s->dma_adc.total_bytes = 0; s->dma_adc.num_channels = 1; -@@ -1846,6 +1873,7 @@ +@@ -1846,6 +1873,7 @@ au1550_open(struct inode *inode, struct } if (file->f_mode & FMODE_WRITE) { @@ -20630,7 +20630,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c s->dma_dac.ossfragshift = s->dma_dac.ossmaxfrags = s->dma_dac.subdivision = s->dma_dac.total_bytes = 0; s->dma_dac.num_channels = 1; -@@ -2091,6 +2119,9 @@ +@@ -2091,6 +2119,9 @@ au1550_probe(void) ac97_read_proc, &s->codec); #endif @@ -20642,9 +20642,9 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c err_dev3: Index: linux-2.4.35.4/drivers/sound/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/sound/Config.in 2007-12-15 05:19:44.142936600 +0100 -+++ linux-2.4.35.4/drivers/sound/Config.in 2007-12-15 05:19:44.982984472 +0100 -@@ -72,10 +72,15 @@ +--- linux-2.4.35.4.orig/drivers/sound/Config.in ++++ linux-2.4.35.4/drivers/sound/Config.in +@@ -72,10 +72,15 @@ fi if [ "$CONFIG_DDB5477" = "y" ]; then dep_tristate ' NEC Vrc5477 AC97 sound' CONFIG_SOUND_VRC5477 $CONFIG_SOUND fi @@ -20666,8 +20666,8 @@ Index: linux-2.4.35.4/drivers/sound/Config.in dep_tristate ' Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI Index: linux-2.4.35.4/drivers/tc/lk201.c =================================================================== ---- linux-2.4.35.4.orig/drivers/tc/lk201.c 2007-12-15 05:19:44.150937056 +0100 -+++ linux-2.4.35.4/drivers/tc/lk201.c 2007-12-15 05:19:44.986984701 +0100 +--- linux-2.4.35.4.orig/drivers/tc/lk201.c ++++ linux-2.4.35.4/drivers/tc/lk201.c @@ -5,7 +5,7 @@ * for more details. * @@ -20687,7 +20687,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c #include "lk201.h" /* -@@ -55,19 +55,20 @@ +@@ -55,19 +55,20 @@ unsigned char *kbd_sysrq_xlate = lk201_s unsigned char kbd_sysrq_key = -1; #endif @@ -20714,7 +20714,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c }; /* -@@ -93,28 +94,28 @@ +@@ -93,28 +94,28 @@ static unsigned char lk201_reset_string[ LK_CMD_ENB_BELL, LK_PARAM_VOLUME(4), }; @@ -20750,7 +20750,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c if (r < 0) return r; } -@@ -203,24 +204,26 @@ +@@ -203,24 +204,26 @@ static void parse_kbd_rate(struct kbd_re static int write_kbd_rate(struct kbd_repeat *rep) { @@ -20782,7 +20782,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c { if (rep == NULL) return -EINVAL; -@@ -237,10 +240,8 @@ +@@ -237,10 +240,8 @@ static int lk201kbd_rate(struct kbd_repe return 0; } @@ -20794,7 +20794,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c if (!ticks) return; -@@ -253,20 +254,19 @@ +@@ -253,20 +254,19 @@ static void lk201kd_mksound(unsigned int ticks = 7; ticks = 7 - ticks; @@ -20819,7 +20819,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c return; /* FIXME -- Only Hold and Lock LEDs for now. --macro */ -@@ -275,13 +275,13 @@ +@@ -275,13 +275,13 @@ void kbd_leds(unsigned char leds) if (leds & LED_CAP) l |= LK_LED_LOCK; @@ -20837,7 +20837,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c return; } -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ char kbd_unexpected_up(unsigned char key return 0x80; } @@ -20846,7 +20846,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c { static unsigned char id[6]; static int id_i; -@@ -316,9 +316,8 @@ +@@ -316,9 +316,8 @@ static void lk201_kbd_rx_char(unsigned c static int prev_scancode; unsigned char c = scancodeRemap[ch]; @@ -20858,7 +20858,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c return; } -@@ -335,7 +334,7 @@ +@@ -335,7 +334,7 @@ static void lk201_kbd_rx_char(unsigned c /* OK, the power-up concluded. */ lk201_report(id); if (id[2] == LK_STAT_PWRUP_OK) @@ -20867,7 +20867,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c else { id_i = 0; printk(KERN_ERR "lk201: keyboard power-up " -@@ -345,7 +344,7 @@ +@@ -345,7 +344,7 @@ static void lk201_kbd_rx_char(unsigned c /* We got the ID; report it and start operation. */ id_i = 0; lk201_id(id); @@ -20876,7 +20876,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c } return; } -@@ -398,29 +397,28 @@ +@@ -398,29 +397,28 @@ static void lk201_kbd_rx_char(unsigned c tasklet_schedule(&keyboard_tasklet); } @@ -20914,7 +20914,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c /* Maxine uses LK501 at the Access.Bus. */ if (!LK_IFACE) -@@ -428,19 +426,15 @@ +@@ -428,19 +426,15 @@ void __init kbd_init_hw(void) printk(KERN_INFO "lk201: DECstation LK keyboard driver v0.05.\n"); @@ -20947,8 +20947,8 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c } Index: linux-2.4.35.4/drivers/tc/zs.c =================================================================== ---- linux-2.4.35.4.orig/drivers/tc/zs.c 2007-12-15 05:19:44.158937514 +0100 -+++ linux-2.4.35.4/drivers/tc/zs.c 2007-12-15 05:19:44.986984701 +0100 +--- linux-2.4.35.4.orig/drivers/tc/zs.c ++++ linux-2.4.35.4/drivers/tc/zs.c @@ -68,6 +68,8 @@ #include <asm/bitops.h> #include <asm/uaccess.h> @@ -20958,7 +20958,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c #ifdef CONFIG_DECSTATION #include <asm/dec/interrupts.h> #include <asm/dec/machtype.h> -@@ -160,8 +162,8 @@ +@@ -160,8 +162,8 @@ struct tty_struct zs_ttys[NUM_CHANNELS]; #ifdef CONFIG_SERIAL_DEC_CONSOLE static struct console sercons; #endif @@ -20969,7 +20969,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c static unsigned long break_pressed; /* break, really ... */ #endif -@@ -196,7 +198,6 @@ +@@ -196,7 +198,6 @@ static int serial_refcount; /* * Debugging. */ @@ -20977,7 +20977,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c #undef SERIAL_DEBUG_OPEN #undef SERIAL_DEBUG_FLOW #undef SERIAL_DEBUG_THROTTLE -@@ -221,10 +222,6 @@ +@@ -221,10 +222,6 @@ static struct tty_struct *serial_table[N static struct termios *serial_termios[NUM_CHANNELS]; static struct termios *serial_termios_locked[NUM_CHANNELS]; @@ -20988,7 +20988,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c /* * tmp_buf is used as a temporary buffer by serial_write. We need to * lock it in case the copy_from_user blocks while swapping in a page, -@@ -386,8 +383,6 @@ +@@ -386,8 +383,6 @@ static inline void rs_recv_clear(struct * ----------------------------------------------------------------------- */ @@ -20997,7 +20997,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c /* * This routine is used by the interrupt handler to schedule * processing in the software interrupt portion of the driver. -@@ -414,20 +409,15 @@ +@@ -414,20 +409,15 @@ static _INLINE_ void receive_chars(struc if (!tty && (!info->hook || !info->hook->rx_char)) continue; @@ -21024,7 +21024,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } else { if (stat & Rx_OVR) { flag = TTY_OVERRUN; -@@ -435,20 +425,22 @@ +@@ -435,20 +425,22 @@ static _INLINE_ void receive_chars(struc flag = TTY_FRAME; } else if (stat & PAR_ERR) { flag = TTY_PARITY; @@ -21054,7 +21054,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } break_pressed = 0; } -@@ -459,23 +451,7 @@ +@@ -459,23 +451,7 @@ static _INLINE_ void receive_chars(struc return; } @@ -21079,7 +21079,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } if (tty) tty_flip_buffer_push(tty); -@@ -517,11 +493,15 @@ +@@ -517,11 +493,15 @@ static _INLINE_ void status_handle(struc /* Get status from Read Register 0 */ stat = read_zsreg(info->zs_channel, R0); @@ -21099,7 +21099,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } if (info->zs_channel != info->zs_chan_a) { -@@ -957,7 +937,7 @@ +@@ -957,7 +937,7 @@ static int rs_write(struct tty_struct * save_flags(flags); while (1) { cli(); @@ -21108,7 +21108,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c SERIAL_XMIT_SIZE - info->xmit_head)); if (c <= 0) break; -@@ -965,7 +945,7 @@ +@@ -965,7 +945,7 @@ static int rs_write(struct tty_struct * if (from_user) { down(&tmp_buf_sem); copy_from_user(tmp_buf, buf, c); @@ -21117,7 +21117,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c SERIAL_XMIT_SIZE - info->xmit_head)); memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); up(&tmp_buf_sem); -@@ -1282,46 +1262,48 @@ +@@ -1282,46 +1262,48 @@ static int rs_ioctl(struct tty_struct *t } switch (cmd) { @@ -21204,7 +21204,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c return 0; } -@@ -1446,7 +1428,8 @@ +@@ -1446,7 +1428,8 @@ static void rs_close(struct tty_struct * static void rs_wait_until_sent(struct tty_struct *tty, int timeout) { struct dec_serial *info = (struct dec_serial *) tty->driver_data; @@ -21214,7 +21214,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c if (serial_paranoia_check(info, tty->device, "rs_wait_until_sent")) return; -@@ -1462,7 +1445,7 @@ +@@ -1462,7 +1445,7 @@ static void rs_wait_until_sent(struct tt if (char_time == 0) char_time = 1; if (timeout) @@ -21223,7 +21223,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c while ((read_zsreg(info->zs_channel, 1) & Tx_BUF_EMP) == 0) { current->state = TASK_INTERRUPTIBLE; schedule_timeout(char_time); -@@ -1714,7 +1697,7 @@ +@@ -1714,7 +1697,7 @@ int rs_open(struct tty_struct *tty, stru static void __init show_serial_version(void) { @@ -21232,7 +21232,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } /* Initialize Z8530s zs_channels -@@ -1994,8 +1977,9 @@ +@@ -1994,8 +1977,9 @@ int __init zs_init(void) * polling I/O routines */ static int @@ -21243,7 +21243,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c struct dec_zschannel *chan = info->zs_channel; int ret; -@@ -2017,8 +2001,9 @@ +@@ -2017,8 +2001,9 @@ zs_poll_tx_char(struct dec_serial *info, } static int @@ -21254,7 +21254,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c struct dec_zschannel *chan = info->zs_channel; int ret; -@@ -2038,12 +2023,13 @@ +@@ -2038,12 +2023,13 @@ zs_poll_rx_char(struct dec_serial *info) return -ENODEV; } @@ -21270,7 +21270,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c return 0; } else { -@@ -2055,7 +2041,7 @@ +@@ -2055,7 +2041,7 @@ unsigned int register_zs_hook(unsigned i } } @@ -21279,7 +21279,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c { struct dec_serial *info = &zs_soft[channel]; -@@ -2063,8 +2049,8 @@ +@@ -2063,8 +2049,8 @@ unsigned int unregister_zs_hook(unsigned info->hook = NULL; return 1; } else { @@ -21290,7 +21290,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c return 0; } } -@@ -2319,22 +2305,23 @@ +@@ -2319,22 +2305,23 @@ void kgdb_interruptible(int yes) write_zsreg(chan, 9, nine); } @@ -21320,7 +21320,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } /* This sets up the serial port we're using, and turns on -@@ -2360,11 +2347,11 @@ +@@ -2360,11 +2347,11 @@ static inline void kgdb_chaninit(struct * for /dev/ttyb which is determined in setup_arch() from the * boot command line flags. */ @@ -21339,8 +21339,8 @@ Index: linux-2.4.35.4/drivers/tc/zs.c void __init zs_kgdb_hook(int tty_num) Index: linux-2.4.35.4/drivers/tc/zs.h =================================================================== ---- linux-2.4.35.4.orig/drivers/tc/zs.h 2007-12-15 05:19:44.166937969 +0100 -+++ linux-2.4.35.4/drivers/tc/zs.h 2007-12-15 05:19:44.986984701 +0100 +--- linux-2.4.35.4.orig/drivers/tc/zs.h ++++ linux-2.4.35.4/drivers/tc/zs.h @@ -1,14 +1,18 @@ /* - * macserial.h: Definitions for the Macintosh Z8530 serial driver. @@ -21361,7 +21361,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.h #define NUM_ZSREGS 16 struct serial_struct { -@@ -89,63 +93,50 @@ +@@ -89,63 +93,50 @@ struct dec_zschannel { unsigned char curregs[NUM_ZSREGS]; }; @@ -21451,8 +21451,8 @@ Index: linux-2.4.35.4/drivers/tc/zs.h int xmit_tail; Index: linux-2.4.35.4/drivers/video/au1200fb.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/video/au1200fb.c 2007-12-15 05:19:44.990984927 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/video/au1200fb.c @@ -0,0 +1,1564 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -23020,8 +23020,8 @@ Index: linux-2.4.35.4/drivers/video/au1200fb.c + Index: linux-2.4.35.4/drivers/video/au1200fb.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/video/au1200fb.h 2007-12-15 05:19:44.990984927 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/video/au1200fb.h @@ -0,0 +1,288 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -23313,9 +23313,9 @@ Index: linux-2.4.35.4/drivers/video/au1200fb.h +#endif /* _AU1200LCD_H */ Index: linux-2.4.35.4/drivers/video/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/video/Config.in 2007-12-15 05:19:44.186939109 +0100 -+++ linux-2.4.35.4/drivers/video/Config.in 2007-12-15 05:19:44.990984927 +0100 -@@ -87,8 +87,8 @@ +--- linux-2.4.35.4.orig/drivers/video/Config.in ++++ linux-2.4.35.4/drivers/video/Config.in +@@ -87,8 +87,8 @@ if [ "$CONFIG_FB" = "y" ]; then if [ "$CONFIG_HP300" = "y" ]; then define_bool CONFIG_FB_HP300 y fi @@ -23326,7 +23326,7 @@ Index: linux-2.4.35.4/drivers/video/Config.in fi if [ "$CONFIG_X86" = "y" ]; then bool ' VESA VGA graphics console' CONFIG_FB_VESA -@@ -121,6 +121,17 @@ +@@ -121,6 +121,17 @@ if [ "$CONFIG_FB" = "y" ]; then hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000 fi fi @@ -23344,7 +23344,7 @@ Index: linux-2.4.35.4/drivers/video/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_PCI" != "n" ]; then tristate ' Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX -@@ -178,9 +189,6 @@ +@@ -178,9 +189,6 @@ if [ "$CONFIG_FB" = "y" ]; then bool ' Use CRT on Pb1100 ' CONFIG_PB1500_CRT bool ' Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT fi @@ -23356,9 +23356,9 @@ Index: linux-2.4.35.4/drivers/video/Config.in fi Index: linux-2.4.35.4/drivers/video/fbmem.c =================================================================== ---- linux-2.4.35.4.orig/drivers/video/fbmem.c 2007-12-15 05:19:44.194939564 +0100 -+++ linux-2.4.35.4/drivers/video/fbmem.c 2007-12-15 05:19:44.994985156 +0100 -@@ -139,6 +139,8 @@ +--- linux-2.4.35.4.orig/drivers/video/fbmem.c ++++ linux-2.4.35.4/drivers/video/fbmem.c +@@ -139,6 +139,8 @@ extern int e1356fb_init(void); extern int e1356fb_setup(char*); extern int au1100fb_init(void); extern int au1100fb_setup(char*); @@ -23367,7 +23367,7 @@ Index: linux-2.4.35.4/drivers/video/fbmem.c extern int pvr2fb_init(void); extern int pvr2fb_setup(char*); extern int sstfb_init(void); -@@ -331,6 +333,9 @@ +@@ -331,6 +333,9 @@ static struct { #ifdef CONFIG_FB_AU1100 { "au1100fb", au1100fb_init, au1100fb_setup }, #endif @@ -23379,8 +23379,8 @@ Index: linux-2.4.35.4/drivers/video/fbmem.c #endif Index: linux-2.4.35.4/drivers/video/ims332.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/video/ims332.h 2007-12-15 05:19:44.994985156 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/video/ims332.h @@ -0,0 +1,275 @@ +/* + * linux/drivers/video/ims332.h @@ -23659,9 +23659,9 @@ Index: linux-2.4.35.4/drivers/video/ims332.h +} Index: linux-2.4.35.4/drivers/video/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/video/Makefile 2007-12-15 05:19:44.206940249 +0100 -+++ linux-2.4.35.4/drivers/video/Makefile 2007-12-15 05:19:44.994985156 +0100 -@@ -87,6 +87,7 @@ +--- linux-2.4.35.4.orig/drivers/video/Makefile ++++ linux-2.4.35.4/drivers/video/Makefile +@@ -87,6 +87,7 @@ obj-$(CONFIG_FB_PMAGB_B) += pma obj-$(CONFIG_FB_MAXINE) += maxinefb.o obj-$(CONFIG_FB_TX3912) += tx3912fb.o obj-$(CONFIG_FB_AU1100) += au1100fb.o fbgen.o @@ -23671,8 +23671,8 @@ Index: linux-2.4.35.4/drivers/video/Makefile subdir-$(CONFIG_STI_CONSOLE) += sti Index: linux-2.4.35.4/drivers/video/maxinefb.h =================================================================== ---- linux-2.4.35.4.orig/drivers/video/maxinefb.h 2007-12-15 05:19:44.214940704 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- linux-2.4.35.4.orig/drivers/video/maxinefb.h ++++ /dev/null @@ -1,38 +0,0 @@ -/* - * linux/drivers/video/maxinefb.h @@ -23714,8 +23714,8 @@ Index: linux-2.4.35.4/drivers/video/maxinefb.h - /* 3 entries */ Index: linux-2.4.35.4/drivers/video/newport_con.c =================================================================== ---- linux-2.4.35.4.orig/drivers/video/newport_con.c 2007-12-15 05:19:44.222941159 +0100 -+++ linux-2.4.35.4/drivers/video/newport_con.c 2007-12-15 05:19:45.002985611 +0100 +--- linux-2.4.35.4.orig/drivers/video/newport_con.c ++++ linux-2.4.35.4/drivers/video/newport_con.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -23724,7 +23724,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c #include <asm/uaccess.h> #include <asm/system.h> #include <asm/page.h> -@@ -77,7 +78,7 @@ +@@ -77,7 +78,7 @@ static int newport_set_def_font(int unit static inline void newport_render_background(int xstart, int ystart, int xend, int yend, int ci) { @@ -23733,7 +23733,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.wrmask = 0xffffffff; npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX -@@ -94,7 +95,7 @@ +@@ -94,7 +95,7 @@ static inline void newport_init_cmap(voi unsigned short i; for (i = 0; i < 16; i++) { @@ -23742,7 +23742,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c newport_cmap_setaddr(npregs, color_table[i]); newport_cmap_setrgb(npregs, default_red[i], -@@ -107,7 +108,7 @@ +@@ -107,7 +108,7 @@ static inline void newport_show_logo(voi unsigned long i; for (i = 0; i < LINUX_LOGO_COLORS; i++) { @@ -23751,7 +23751,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c newport_cmap_setaddr(npregs, i + 0x20); newport_cmap_setrgb(npregs, linux_logo_red[i], -@@ -115,13 +116,13 @@ +@@ -115,13 +116,13 @@ static inline void newport_show_logo(voi linux_logo_blue[i]); } @@ -23767,7 +23767,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c for (i = 0; i < LOGO_W * LOGO_H; i++) npregs->go.hostrw0 = linux_logo[i] << 24; -@@ -133,7 +134,7 @@ +@@ -133,7 +134,7 @@ static inline void newport_clear_screen( if (logo_active) return; @@ -23776,7 +23776,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.wrmask = 0xffffffff; npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX -@@ -155,7 +156,7 @@ +@@ -155,7 +156,7 @@ void newport_reset(void) unsigned short treg; int i; @@ -23785,7 +23785,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c treg = newport_vc2_get(npregs, VC2_IREG_CONTROL); newport_vc2_set(npregs, VC2_IREG_CONTROL, (treg | VC2_CTRL_EVIDEO)); -@@ -165,7 +166,7 @@ +@@ -165,7 +166,7 @@ void newport_reset(void) npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | NPORT_DMODE_W2 | VC2_PROTOCOL); for (i = 0; i < 128; i++) { @@ -23794,7 +23794,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c if (i == 92 || i == 94) npregs->set.dcbdata0.byshort.s1 = 0xff00; else -@@ -205,7 +206,7 @@ +@@ -205,7 +206,7 @@ void newport_get_screensize(void) npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | NPORT_DMODE_W2 | VC2_PROTOCOL); for (i = 0; i < 128; i++) { @@ -23803,7 +23803,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c linetable[i] = npregs->set.dcbdata0.byshort.s1; } -@@ -216,12 +217,12 @@ +@@ -216,12 +217,12 @@ void newport_get_screensize(void) npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | NPORT_DMODE_W2 | VC2_PROTOCOL); do { @@ -23818,7 +23818,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c treg = npregs->set.dcbdata0.byshort.s1; } } while ((treg & 0x8000) == 0); -@@ -291,16 +292,16 @@ +@@ -291,16 +292,16 @@ static const char *newport_startup(void) if (!sgi_gfxaddr) return NULL; @@ -23840,7 +23840,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c for (i = 0; i < MAX_NR_CONSOLES; i++) font_data[i] = FONT_DATA; -@@ -310,6 +311,10 @@ +@@ -310,6 +311,10 @@ static const char *newport_startup(void) newport_get_screensize(); return "SGI Newport"; @@ -23851,7 +23851,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c } static void newport_init(struct vc_data *vc, int init) -@@ -363,7 +368,7 @@ +@@ -363,7 +368,7 @@ static void newport_putc(struct vc_data (charattr & 0xf0) >> 4); /* Set the color and drawing mode. */ @@ -23860,7 +23860,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.colori = charattr & 0xf; npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | NPORT_DMODE0_STOPX | NPORT_DMODE0_ZPENAB | -@@ -372,7 +377,7 @@ +@@ -372,7 +377,7 @@ static void newport_putc(struct vc_data /* Set coordinates for bitmap operation. */ npregs->set.xystarti = (xpos << 16) | ((ypos + topscan) & 0x3ff); npregs->set.xyendi = ((xpos + 7) << 16); @@ -23869,7 +23869,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c /* Go, baby, go... */ RENDER(npregs, p); -@@ -396,7 +401,7 @@ +@@ -396,7 +401,7 @@ static void newport_putcs(struct vc_data xpos + ((count - 1) << 3), ypos, (charattr & 0xf0) >> 4); @@ -23878,7 +23878,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c /* Set the color and drawing mode. */ npregs->set.colori = charattr & 0xf; -@@ -407,7 +412,7 @@ +@@ -407,7 +412,7 @@ static void newport_putcs(struct vc_data for (i = 0; i < count; i++, xpos += 8) { p = &font_data[vc->vc_num][(scr_readw(s++) & 0xff) << 4]; @@ -23887,7 +23887,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c /* Set coordinates for bitmap operation. */ npregs->set.xystarti = -@@ -689,7 +694,7 @@ +@@ -689,7 +694,7 @@ static void newport_bmove(struct vc_data xe = xs; xs = tmp; } @@ -23896,7 +23896,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.drawmode0 = (NPORT_DMODE0_S2S | NPORT_DMODE0_BLOCK | NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX | NPORT_DMODE0_STOPY); -@@ -706,35 +711,35 @@ +@@ -706,35 +711,35 @@ static int newport_dummy(struct vc_data #define DUMMY (void *) newport_dummy const struct consw newport_con = { @@ -23951,8 +23951,8 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c module_init(newport_console_init); Index: linux-2.4.35.4/drivers/video/tgafb.c =================================================================== ---- linux-2.4.35.4.orig/drivers/video/tgafb.c 2007-12-15 05:19:44.230941615 +0100 -+++ linux-2.4.35.4/drivers/video/tgafb.c 2007-12-15 05:19:45.002985611 +0100 +--- linux-2.4.35.4.orig/drivers/video/tgafb.c ++++ linux-2.4.35.4/drivers/video/tgafb.c @@ -45,6 +45,15 @@ #include <linux/console.h> #include <asm/io.h> @@ -23969,7 +23969,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c #include <video/fbcon.h> #include <video/fbcon-cfb8.h> #include <video/fbcon-cfb32.h> -@@ -84,10 +93,10 @@ +@@ -84,10 +93,10 @@ static unsigned int fb_offset_presets[4] }; static unsigned int deep_presets[4] = { @@ -23983,7 +23983,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c }; static unsigned int rasterop_presets[4] = { -@@ -131,6 +140,13 @@ +@@ -131,6 +140,13 @@ static struct { 0, FB_VMODE_NONINTERLACED }}, @@ -23997,7 +23997,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c { "800x600-56", { 800, 600, 800, 600, 0, 0, 0, 0, {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0}, -@@ -488,7 +504,8 @@ +@@ -488,7 +504,8 @@ static void tgafb_set_par(const void *fb continue; mb(); @@ -24007,7 +24007,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c while (TGA_READ_REG(TGA_CMD_STAT_REG) & 1) /* wait for not busy */ continue; mb(); -@@ -548,7 +565,7 @@ +@@ -548,7 +565,7 @@ static void tgafb_set_par(const void *fb BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_0, 0x40); BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_1, 0x08); BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_2, @@ -24016,7 +24016,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_0, 0xff); BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_1, 0xff); -@@ -921,19 +938,34 @@ +@@ -921,19 +938,34 @@ int __init tgafb_setup(char *options) { int __init tgafb_init(void) { struct pci_dev *pdev; @@ -24056,7 +24056,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c /* setup framebuffer */ -@@ -950,40 +982,62 @@ +@@ -950,40 +982,62 @@ int __init tgafb_init(void) fb_info.gen.fbhw = &tgafb_hwswitch; fb_info.gen.fbhw->detect(); @@ -24131,8 +24131,8 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c Index: linux-2.4.35.4/drivers/video/tgafb.h =================================================================== ---- linux-2.4.35.4.orig/drivers/video/tgafb.h 2007-12-15 05:19:44.238942073 +0100 -+++ linux-2.4.35.4/drivers/video/tgafb.h 2007-12-15 05:19:45.002985611 +0100 +--- linux-2.4.35.4.orig/drivers/video/tgafb.h ++++ linux-2.4.35.4/drivers/video/tgafb.h @@ -36,6 +36,7 @@ #define TGA_RASTEROP_REG 0x0034 #define TGA_PIXELSHIFT_REG 0x0038 @@ -24143,9 +24143,9 @@ Index: linux-2.4.35.4/drivers/video/tgafb.h #define TGA_HORIZ_REG 0x0064 Index: linux-2.4.35.4/fs/binfmt_elf.c =================================================================== ---- linux-2.4.35.4.orig/fs/binfmt_elf.c 2007-12-15 05:19:44.246942528 +0100 -+++ linux-2.4.35.4/fs/binfmt_elf.c 2007-12-15 05:19:45.006985841 +0100 -@@ -665,6 +665,9 @@ +--- linux-2.4.35.4.orig/fs/binfmt_elf.c ++++ linux-2.4.35.4/fs/binfmt_elf.c +@@ -665,6 +665,9 @@ static int load_elf_binary(struct linux_ bprm->argc++; } } @@ -24155,7 +24155,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c } /* Flush all traces of the currently running executable */ -@@ -1225,7 +1228,11 @@ +@@ -1225,7 +1228,11 @@ static int elf_core_dump(long signr, str elf.e_entry = 0; elf.e_phoff = sizeof(elf); elf.e_shoff = 0; @@ -24169,8 +24169,8 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c elf.e_phnum = segs+1; /* Include notes */ Index: linux-2.4.35.4/fs/partitions/sgi.c =================================================================== ---- linux-2.4.35.4.orig/fs/partitions/sgi.c 2007-12-15 05:19:44.254942983 +0100 -+++ linux-2.4.35.4/fs/partitions/sgi.c 2007-12-15 05:19:45.006985841 +0100 +--- linux-2.4.35.4.orig/fs/partitions/sgi.c ++++ linux-2.4.35.4/fs/partitions/sgi.c @@ -17,6 +17,11 @@ #include "check.h" #include "sgi.h" @@ -24183,7 +24183,7 @@ Index: linux-2.4.35.4/fs/partitions/sgi.c int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long first_sector, int current_minor) { int i, csum, magic; -@@ -77,6 +82,10 @@ +@@ -77,6 +82,10 @@ int sgi_partition(struct gendisk *hd, st if(!blocks) continue; add_gd_partition(hd, current_minor, start, blocks); @@ -24196,9 +24196,9 @@ Index: linux-2.4.35.4/fs/partitions/sgi.c printk("\n"); Index: linux-2.4.35.4/fs/proc/array.c =================================================================== ---- linux-2.4.35.4.orig/fs/proc/array.c 2007-12-15 05:19:44.262943439 +0100 -+++ linux-2.4.35.4/fs/proc/array.c 2007-12-15 05:19:45.006985841 +0100 -@@ -368,15 +368,15 @@ +--- linux-2.4.35.4.orig/fs/proc/array.c ++++ linux-2.4.35.4/fs/proc/array.c +@@ -368,15 +368,15 @@ int proc_pid_stat(struct task_struct *ta task->cmin_flt, task->maj_flt, task->cmaj_flt, @@ -24219,7 +24219,7 @@ Index: linux-2.4.35.4/fs/proc/array.c vsize, mm ? mm->rss : 0, /* you might want to shift this left 3 */ task->rlim[RLIMIT_RSS].rlim_cur, -@@ -615,14 +615,14 @@ +@@ -615,14 +615,14 @@ int proc_pid_cpu(struct task_struct *tas len = sprintf(buffer, "cpu %lu %lu\n", @@ -24240,9 +24240,9 @@ Index: linux-2.4.35.4/fs/proc/array.c } Index: linux-2.4.35.4/fs/proc/proc_misc.c =================================================================== ---- linux-2.4.35.4.orig/fs/proc/proc_misc.c 2007-12-15 05:19:44.270943894 +0100 -+++ linux-2.4.35.4/fs/proc/proc_misc.c 2007-12-15 05:19:45.006985841 +0100 -@@ -308,16 +308,16 @@ +--- linux-2.4.35.4.orig/fs/proc/proc_misc.c ++++ linux-2.4.35.4/fs/proc/proc_misc.c +@@ -308,16 +308,16 @@ static int kstat_read_proc(char *page, c { int i, len = 0; extern unsigned long total_forks; @@ -24263,7 +24263,7 @@ Index: linux-2.4.35.4/fs/proc/proc_misc.c #if !defined(CONFIG_ARCH_S390) for (j = 0 ; j < NR_IRQS ; j++) sum += kstat.irqs[cpu][j]; -@@ -331,10 +331,10 @@ +@@ -331,10 +331,10 @@ static int kstat_read_proc(char *page, c proc_sprintf(page, &off, &len, "cpu%d %u %u %u %lu\n", i, @@ -24280,8 +24280,8 @@ Index: linux-2.4.35.4/fs/proc/proc_misc.c proc_sprintf(page, &off, &len, Index: linux-2.4.35.4/include/asm-alpha/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-alpha/param.h 2007-12-15 05:19:44.278944352 +0100 -+++ linux-2.4.35.4/include/asm-alpha/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-alpha/param.h ++++ linux-2.4.35.4/include/asm-alpha/param.h @@ -13,6 +13,9 @@ # else # define HZ 1200 @@ -24294,8 +24294,8 @@ Index: linux-2.4.35.4/include/asm-alpha/param.h #define EXEC_PAGESIZE 8192 Index: linux-2.4.35.4/include/asm-i386/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-i386/param.h 2007-12-15 05:19:44.290945034 +0100 -+++ linux-2.4.35.4/include/asm-i386/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-i386/param.h ++++ linux-2.4.35.4/include/asm-i386/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -24308,8 +24308,8 @@ Index: linux-2.4.35.4/include/asm-i386/param.h #define EXEC_PAGESIZE 4096 Index: linux-2.4.35.4/include/asm-ia64/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-ia64/param.h 2007-12-15 05:19:44.298945492 +0100 -+++ linux-2.4.35.4/include/asm-ia64/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-ia64/param.h ++++ linux-2.4.35.4/include/asm-ia64/param.h @@ -7,9 +7,15 @@ * Based on <asm-i386/param.h>. * @@ -24329,8 +24329,8 @@ Index: linux-2.4.35.4/include/asm-ia64/param.h #ifndef NGROUPS Index: linux-2.4.35.4/include/asm-m68k/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-m68k/param.h 2007-12-15 05:19:44.306945948 +0100 -+++ linux-2.4.35.4/include/asm-m68k/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-m68k/param.h ++++ linux-2.4.35.4/include/asm-m68k/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -24343,8 +24343,8 @@ Index: linux-2.4.35.4/include/asm-m68k/param.h #define EXEC_PAGESIZE 8192 Index: linux-2.4.35.4/include/asm-mips/au1000_gpio.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000_gpio.h 2007-12-15 05:19:44.314946403 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h 2007-12-15 05:19:45.014986296 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1000_gpio.h ++++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h @@ -30,6 +30,13 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -24462,9 +24462,9 @@ Index: linux-2.4.35.4/include/asm-mips/au1000_gpio.h #endif Index: linux-2.4.35.4/include/asm-mips/au1000.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000.h 2007-12-15 05:19:44.322946858 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1000.h 2007-12-15 05:19:45.018986525 +0100 -@@ -160,28 +160,356 @@ +--- linux-2.4.35.4.orig/include/asm-mips/au1000.h ++++ linux-2.4.35.4/include/asm-mips/au1000.h +@@ -160,28 +160,356 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5) #endif @@ -24839,7 +24839,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Static Bus Controller */ #define MEM_STCFG0 0xB4001000 #define MEM_STTIME0 0xB4001004 -@@ -367,7 +695,7 @@ +@@ -367,7 +695,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1000_MAC0_ENABLE 0xB0520000 #define AU1000_MAC1_ENABLE 0xB0520004 #define NUM_ETH_INTERFACES 2 @@ -24848,7 +24848,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Au1500 */ #ifdef CONFIG_SOC_AU1500 -@@ -438,7 +766,7 @@ +@@ -438,7 +766,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1500_MAC0_ENABLE 0xB1520000 #define AU1500_MAC1_ENABLE 0xB1520004 #define NUM_ETH_INTERFACES 2 @@ -24857,7 +24857,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Au1100 */ #ifdef CONFIG_SOC_AU1100 -@@ -483,6 +811,22 @@ +@@ -483,6 +811,22 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1000_GPIO_13 45 #define AU1000_GPIO_14 46 #define AU1000_GPIO_15 47 @@ -24880,7 +24880,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define UART0_ADDR 0xB1100000 #define UART1_ADDR 0xB1200000 -@@ -494,7 +838,7 @@ +@@ -494,7 +838,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1100_ETH0_BASE 0xB0500000 #define AU1100_MAC0_ENABLE 0xB0520000 #define NUM_ETH_INTERFACES 1 @@ -24889,7 +24889,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #ifdef CONFIG_SOC_AU1550 #define AU1550_UART0_INT 0 -@@ -511,14 +855,14 @@ +@@ -511,14 +855,14 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1550_PSC1_INT 11 #define AU1550_PSC2_INT 12 #define AU1550_PSC3_INT 13 @@ -24912,7 +24912,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define AU1550_NAND_INT 23 #define AU1550_USB_DEV_REQ_INT 24 #define AU1550_USB_DEV_SUS_INT 25 -@@ -573,7 +917,7 @@ +@@ -573,7 +917,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1550_MAC0_ENABLE 0xB0520000 #define AU1550_MAC1_ENABLE 0xB0520004 #define NUM_ETH_INTERFACES 2 @@ -24921,7 +24921,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #ifdef CONFIG_SOC_AU1200 #define AU1200_UART0_INT 0 -@@ -590,14 +934,14 @@ +@@ -590,14 +934,14 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1200_PSC1_INT 11 #define AU1200_AES_INT 12 #define AU1200_CAMERA_INT 13 @@ -24944,7 +24944,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define AU1200_NAND_INT 23 #define AU1200_GPIO_204 24 #define AU1200_GPIO_205 25 -@@ -605,6 +949,7 @@ +@@ -605,6 +949,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1200_GPIO_207 27 #define AU1200_GPIO_208_215 28 // Logical OR of 208:215 #define AU1200_USB_INT 29 @@ -24952,7 +24952,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define AU1200_LCD_INT 30 #define AU1200_MAE_BOTH_INT 31 #define AU1000_GPIO_0 32 -@@ -643,21 +988,36 @@ +@@ -643,21 +988,36 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define UART0_ADDR 0xB1100000 #define UART1_ADDR 0xB1200000 @@ -24999,7 +24999,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Programmable Counters 0 and 1 */ #define SYS_BASE 0xB1900000 #define SYS_COUNTER_CNTRL (SYS_BASE + 0x14) -@@ -728,6 +1088,8 @@ +@@ -728,6 +1088,8 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define I2S_CONTROL_D (1<<1) #define I2S_CONTROL_CE (1<<0) @@ -25008,7 +25008,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* USB Host Controller */ #define USB_OHCI_LEN 0x00100000 -@@ -773,6 +1135,8 @@ +@@ -773,6 +1135,8 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define USBDEV_ENABLE (1<<1) #define USBDEV_CE (1<<0) @@ -25017,7 +25017,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Ethernet Controllers */ /* 4 byte offsets from AU1000_ETH_BASE */ -@@ -1171,6 +1535,37 @@ +@@ -1171,6 +1535,37 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define SYS_PF_PSC1_S1 (1 << 1) #define SYS_PF_MUST_BE_SET ((1 << 5) | (1 << 2)) @@ -25055,7 +25055,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define SYS_TRIOUTRD 0xB1900100 #define SYS_TRIOUTCLR 0xB1900100 #define SYS_OUTPUTRD 0xB1900108 -@@ -1298,7 +1693,6 @@ +@@ -1298,7 +1693,6 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define SD1_XMIT_FIFO 0xB0680000 #define SD1_RECV_FIFO 0xB0680004 @@ -25063,7 +25063,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #if defined (CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) /* Au1500 PCI Controller */ #define Au1500_CFG_BASE 0xB4005000 // virtual, kseg0 addr -@@ -1388,9 +1782,60 @@ +@@ -1388,9 +1782,60 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #endif @@ -25124,7 +25124,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h struct cpu_spec { /* CPU is matched via (PRID & prid_mask) == prid_value */ unsigned int prid_mask; -@@ -1404,3 +1849,6 @@ +@@ -1404,3 +1849,6 @@ struct cpu_spec { extern struct cpu_spec cpu_specs[]; extern struct cpu_spec *cur_cpu_spec[]; #endif @@ -25133,8 +25133,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h + Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h 2007-12-15 05:19:44.330947314 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h ++++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h @@ -38,16 +38,41 @@ #define AU1X_SOCK0_PHYS_MEM 0xF80000000 @@ -25188,8 +25188,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h struct pcmcia_state { Index: linux-2.4.35.4/include/asm-mips/au1100_mmc.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1100_mmc.h 2007-12-15 05:19:44.338947772 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1100_mmc.h ++++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h @@ -39,16 +39,22 @@ #define __ASM_AU1100_MMC_H @@ -25233,8 +25233,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1100_mmc.h Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1xxx_dbdma.h 2007-12-15 05:19:44.342947998 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1xxx_dbdma.h ++++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h @@ -43,7 +43,7 @@ #define DDMA_GLOBAL_BASE 0xb4003000 #define DDMA_CHANNEL_BASE 0xb4002000 @@ -25244,7 +25244,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h u32 ddma_config; u32 ddma_intstat; u32 ddma_throttle; -@@ -60,7 +60,7 @@ +@@ -60,7 +60,7 @@ typedef struct dbdma_global { /* The structure of a DMA Channel. */ @@ -25253,7 +25253,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h u32 ddma_cfg; /* See below */ u32 ddma_desptr; /* 32-byte aligned pointer to descriptor */ u32 ddma_statptr; /* word aligned pointer to status word */ -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ typedef struct au1xxx_dma_channel { /* "Standard" DDMA Descriptor. * Must be 32-byte aligned. */ @@ -25262,7 +25262,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h u32 dscr_cmd0; /* See below */ u32 dscr_cmd1; /* See below */ u32 dscr_source0; /* source phys address */ -@@ -105,6 +105,12 @@ +@@ -105,6 +105,12 @@ typedef struct au1xxx_ddma_desc { u32 dscr_dest1; /* See below */ u32 dscr_stat; /* completion status */ u32 dscr_nxtptr; /* Next descriptor pointer (mostly) */ @@ -25275,7 +25275,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h } au1x_ddma_desc_t; #define DSCR_CMD0_V (1 << 31) /* Descriptor valid */ -@@ -123,6 +129,8 @@ +@@ -123,6 +129,8 @@ typedef struct au1xxx_ddma_desc { #define DSCR_CMD0_CV (0x1 << 2) /* Clear Valid when done */ #define DSCR_CMD0_ST_MASK (0x3 << 0) /* Status instruction */ @@ -25284,7 +25284,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h /* Command 0 device IDs. */ #ifdef CONFIG_SOC_AU1550 -@@ -169,8 +177,8 @@ +@@ -169,8 +177,8 @@ typedef struct au1xxx_ddma_desc { #define DSCR_CMD0_SDMS_RX0 9 #define DSCR_CMD0_SDMS_TX1 10 #define DSCR_CMD0_SDMS_RX1 11 @@ -25295,7 +25295,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h #define DSCR_CMD0_PSC0_TX 14 #define DSCR_CMD0_PSC0_RX 15 #define DSCR_CMD0_PSC1_TX 16 -@@ -189,6 +197,10 @@ +@@ -189,6 +197,10 @@ typedef struct au1xxx_ddma_desc { #define DSCR_CMD0_THROTTLE 30 #define DSCR_CMD0_ALWAYS 31 #define DSCR_NDEV_IDS 32 @@ -25306,7 +25306,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h #define DSCR_CMD0_SID(x) (((x) & 0x1f) << 25) #define DSCR_CMD0_DID(x) (((x) & 0x1f) << 20) -@@ -277,6 +289,43 @@ +@@ -277,6 +289,43 @@ typedef struct au1xxx_ddma_desc { */ #define NUM_DBDMA_CHANS 16 @@ -25350,7 +25350,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h /* External functions for drivers to use. */ /* Use this to allocate a dbdma channel. The device ids are one of the -@@ -299,8 +348,8 @@ +@@ -299,8 +348,8 @@ u32 au1xxx_dbdma_ring_alloc(u32 chanid, /* Put buffers on source/destination descriptors. */ @@ -25361,7 +25361,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h /* Get a buffer from the destination descriptor. */ -@@ -314,5 +363,25 @@ +@@ -314,5 +363,25 @@ u32 au1xxx_get_dma_residue(u32 chanid); void au1xxx_dbdma_chan_free(u32 chanid); void au1xxx_dbdma_dump(u32 chanid); @@ -25389,8 +25389,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h #endif /* _AU1000_DBDMA_H_ */ Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h 2007-12-15 05:19:45.022986751 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h @@ -0,0 +1,22 @@ + + @@ -25416,8 +25416,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h +#endif //__AU1XXX_GPIO_H Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1xxx_psc.h 2007-12-15 05:19:44.358948912 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1xxx_psc.h ++++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h @@ -41,6 +41,11 @@ #define PSC3_BASE_ADDR 0xb0d00000 #endif @@ -25430,7 +25430,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h /* The PSC select and control registers are common to * all protocols. */ -@@ -226,6 +231,8 @@ +@@ -226,6 +231,8 @@ typedef struct psc_i2s { #define PSC_I2SCFG_DD_DISABLE (1 << 27) #define PSC_I2SCFG_DE_ENABLE (1 << 26) #define PSC_I2SCFG_SET_WS(x) (((((x) / 2) - 1) & 0x7f) << 16) @@ -25441,8 +25441,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h #define PSC_I2SCFG_DIV_MASK (3 << 13) Index: linux-2.4.35.4/include/asm-mips/bootinfo.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/bootinfo.h 2007-12-15 05:19:44.366949367 +0100 -+++ linux-2.4.35.4/include/asm-mips/bootinfo.h 2007-12-15 05:19:45.026986980 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/bootinfo.h ++++ linux-2.4.35.4/include/asm-mips/bootinfo.h @@ -180,6 +180,9 @@ #define MACH_MTX1 7 /* 4G MTX-1 Au1500-based board */ #define MACH_CSB250 8 /* Cogent Au1500 */ @@ -25455,8 +25455,8 @@ Index: linux-2.4.35.4/include/asm-mips/bootinfo.h * Valid machtype for group NEC_VR41XX Index: linux-2.4.35.4/include/asm-mips/db1200.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/db1200.h 2007-12-15 05:19:45.026986980 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/db1200.h @@ -0,0 +1,214 @@ +/* + * AMD Alchemy DB1200 Referrence Board @@ -25674,8 +25674,8 @@ Index: linux-2.4.35.4/include/asm-mips/db1200.h + Index: linux-2.4.35.4/include/asm-mips/db1x00.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/db1x00.h 2007-12-15 05:19:44.378950051 +0100 -+++ linux-2.4.35.4/include/asm-mips/db1x00.h 2007-12-15 05:19:45.026986980 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/db1x00.h ++++ linux-2.4.35.4/include/asm-mips/db1x00.h @@ -1,5 +1,5 @@ /* - * AMD Alchemy DB1x00 Reference Boards @@ -25702,7 +25702,7 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h #endif /* -@@ -66,6 +75,7 @@ +@@ -66,6 +75,7 @@ typedef volatile struct } BCSR; @@ -25710,7 +25710,7 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h /* * Register/mask bit definitions for the BCSRs -@@ -130,14 +140,6 @@ +@@ -130,14 +140,6 @@ typedef volatile struct #define BCSR_SWRESET_RESET 0x0080 @@ -25725,7 +25725,7 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h /* MTD CONFIG OPTIONS */ #if defined(CONFIG_MTD_DB1X00_BOOT) && defined(CONFIG_MTD_DB1X00_USER) #define DB1X00_BOTH_BANKS -@@ -147,48 +149,15 @@ +@@ -147,48 +149,15 @@ typedef volatile struct #define DB1X00_USER_ONLY #endif @@ -25783,9 +25783,9 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h Index: linux-2.4.35.4/include/asm-mips/elf.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/elf.h 2007-12-15 05:19:44.386950507 +0100 -+++ linux-2.4.35.4/include/asm-mips/elf.h 2007-12-15 05:19:45.026986980 +0100 -@@ -66,9 +66,10 @@ +--- linux-2.4.35.4.orig/include/asm-mips/elf.h ++++ linux-2.4.35.4/include/asm-mips/elf.h +@@ -66,9 +66,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE PAGE_SIZE @@ -25801,8 +25801,8 @@ Index: linux-2.4.35.4/include/asm-mips/elf.h instruction set this cpu supports. This could be done in userspace, Index: linux-2.4.35.4/include/asm-mips/ficmmp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/ficmmp.h 2007-12-15 05:19:45.026986980 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/ficmmp.h @@ -0,0 +1,156 @@ +/* + * FIC MMP @@ -25962,8 +25962,8 @@ Index: linux-2.4.35.4/include/asm-mips/ficmmp.h + Index: linux-2.4.35.4/include/asm-mips/hazards.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/hazards.h 2007-12-15 05:19:44.398951191 +0100 -+++ linux-2.4.35.4/include/asm-mips/hazards.h 2007-12-15 05:19:45.030987207 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/hazards.h ++++ linux-2.4.35.4/include/asm-mips/hazards.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -26182,9 +26182,9 @@ Index: linux-2.4.35.4/include/asm-mips/hazards.h #endif /* _ASM_HAZARDS_H */ Index: linux-2.4.35.4/include/asm-mips/ide.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/ide.h 2007-12-15 05:19:44.406951647 +0100 -+++ linux-2.4.35.4/include/asm-mips/ide.h 2007-12-15 05:19:45.030987207 +0100 -@@ -32,12 +32,12 @@ +--- linux-2.4.35.4.orig/include/asm-mips/ide.h ++++ linux-2.4.35.4/include/asm-mips/ide.h +@@ -32,12 +32,12 @@ struct ide_ops { extern struct ide_ops *ide_ops; @@ -26199,7 +26199,7 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h { return ide_ops->ide_default_io_base(index); } -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ static inline void ide_init_hwif_ports(h ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq); } @@ -26208,7 +26208,7 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h { #ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; -@@ -68,7 +68,89 @@ +@@ -68,7 +68,89 @@ static __inline__ void ide_init_default_ #define ide_ack_intr(hwif) ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1) #endif @@ -26301,9 +26301,9 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h Index: linux-2.4.35.4/include/asm-mips/io.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/io.h 2007-12-15 05:19:44.414952102 +0100 -+++ linux-2.4.35.4/include/asm-mips/io.h 2007-12-15 05:19:45.030987207 +0100 -@@ -392,7 +392,8 @@ +--- linux-2.4.35.4.orig/include/asm-mips/io.h ++++ linux-2.4.35.4/include/asm-mips/io.h +@@ -392,7 +392,8 @@ static inline unsigned int inl_p(unsigne return __ioswab32(__val); } @@ -26313,7 +26313,7 @@ Index: linux-2.4.35.4/include/asm-mips/io.h { while (count--) { outb(*(u8 *)addr, port); -@@ -408,7 +409,8 @@ +@@ -408,7 +409,8 @@ static inline void __insb(unsigned long } } @@ -26323,7 +26323,7 @@ Index: linux-2.4.35.4/include/asm-mips/io.h { while (count--) { outw(*(u16 *)addr, port); -@@ -424,7 +426,8 @@ +@@ -424,7 +426,8 @@ static inline void __insw(unsigned long } } @@ -26335,9 +26335,9 @@ Index: linux-2.4.35.4/include/asm-mips/io.h outl(*(u32 *)addr, port); Index: linux-2.4.35.4/include/asm-mips/mipsregs.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/mipsregs.h 2007-12-15 05:19:44.422952557 +0100 -+++ linux-2.4.35.4/include/asm-mips/mipsregs.h 2007-12-15 05:19:45.038987665 +0100 -@@ -757,10 +757,18 @@ +--- linux-2.4.35.4.orig/include/asm-mips/mipsregs.h ++++ linux-2.4.35.4/include/asm-mips/mipsregs.h +@@ -757,10 +757,18 @@ do { \ #define read_c0_config1() __read_32bit_c0_register($16, 1) #define read_c0_config2() __read_32bit_c0_register($16, 2) #define read_c0_config3() __read_32bit_c0_register($16, 3) @@ -26356,7 +26356,7 @@ Index: linux-2.4.35.4/include/asm-mips/mipsregs.h /* * The WatchLo register. There may be upto 8 of them. -@@ -874,42 +882,34 @@ +@@ -874,42 +882,34 @@ do { \ */ static inline void tlb_probe(void) { @@ -26401,8 +26401,8 @@ Index: linux-2.4.35.4/include/asm-mips/mipsregs.h /* Index: linux-2.4.35.4/include/asm-mips/mmu_context.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/mmu_context.h 2007-12-15 05:19:44.430953013 +0100 -+++ linux-2.4.35.4/include/asm-mips/mmu_context.h 2007-12-15 05:19:45.038987665 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/mmu_context.h ++++ linux-2.4.35.4/include/asm-mips/mmu_context.h @@ -27,7 +27,7 @@ #define TLBMISS_HANDLER_SETUP_PGD(pgd) \ pgd_current[smp_processor_id()] = (unsigned long)(pgd) @@ -26414,8 +26414,8 @@ Index: linux-2.4.35.4/include/asm-mips/mmu_context.h Index: linux-2.4.35.4/include/asm-mips/pb1100.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/pb1100.h 2007-12-15 05:19:44.438953471 +0100 -+++ linux-2.4.35.4/include/asm-mips/pb1100.h 2007-12-15 05:19:45.038987665 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/pb1100.h ++++ linux-2.4.35.4/include/asm-mips/pb1100.h @@ -1,5 +1,5 @@ /* - * Alchemy Semi PB1100 Referrence Board @@ -26584,8 +26584,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1100.h + Index: linux-2.4.35.4/include/asm-mips/pb1200.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/pb1200.h 2007-12-15 05:19:45.038987665 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/pb1200.h @@ -0,0 +1,244 @@ +/* + * AMD Alchemy PB1200 Referrence Board @@ -26833,8 +26833,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1200.h + Index: linux-2.4.35.4/include/asm-mips/pb1550.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/pb1550.h 2007-12-15 05:19:44.450954152 +0100 -+++ linux-2.4.35.4/include/asm-mips/pb1550.h 2007-12-15 05:19:45.042987891 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/pb1550.h ++++ linux-2.4.35.4/include/asm-mips/pb1550.h @@ -30,13 +30,11 @@ #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX @@ -26850,7 +26850,7 @@ Index: linux-2.4.35.4/include/asm-mips/pb1550.h #define BCSR_PHYS_ADDR 0xAF000000 -@@ -160,9 +158,23 @@ +@@ -160,9 +158,23 @@ static BCSR * const bcsr = (BCSR *)BCSR_ #define NAND_T_SU_SHIFT 8 #define NAND_T_WH_SHIFT 12 @@ -26880,8 +26880,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1550.h #endif /* __ASM_PB1550_H */ Index: linux-2.4.35.4/include/asm-mips/reg.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/reg.h 2007-12-15 05:19:44.458954611 +0100 -+++ linux-2.4.35.4/include/asm-mips/reg.h 2007-12-15 05:19:45.042987891 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/reg.h ++++ linux-2.4.35.4/include/asm-mips/reg.h @@ -45,6 +45,9 @@ /* * k0/k1 unsaved @@ -26902,9 +26902,9 @@ Index: linux-2.4.35.4/include/asm-mips/reg.h Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h 2007-12-15 05:19:44.466955066 +0100 -+++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h 2007-12-15 05:19:45.042987891 +0100 -@@ -128,26 +128,26 @@ +--- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h ++++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h +@@ -128,26 +128,26 @@ struct hpc3_ethregs { volatile u32 rx_gfptr; /* current GIO fifo ptr */ volatile u32 rx_dfptr; /* current device fifo ptr */ u32 _unused1; /* padding */ @@ -26951,7 +26951,7 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h u32 _unused2[0x1000/4 - 8]; /* padding */ -@@ -221,7 +221,7 @@ +@@ -221,7 +221,7 @@ struct hpc3_regs { #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */ u32 _unused1[0x14000/4 - 5]; /* padding */ @@ -26960,7 +26960,7 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h /* Now direct PIO per-HPC3 peripheral access to external regs. */ volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */ u32 _unused2[0x7c00/4]; -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ struct hpc3_regs { volatile u32 bbram[8192-50-14]; /* Battery backed ram */ }; @@ -26971,8 +26971,8 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h */ Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h 2007-12-15 05:19:44.474955521 +0100 -+++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h 2007-12-15 05:19:45.042987891 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h ++++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h @@ -88,8 +88,8 @@ @@ -27043,9 +27043,9 @@ Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h #define TX4927_ACLC_ACGPODAT 0xf744 Index: linux-2.4.35.4/include/asm-mips/unistd.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/unistd.h 2007-12-15 05:19:44.482955977 +0100 -+++ linux-2.4.35.4/include/asm-mips/unistd.h 2007-12-15 05:19:45.046988120 +0100 -@@ -760,7 +760,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips/unistd.h ++++ linux-2.4.35.4/include/asm-mips/unistd.h +@@ -760,7 +760,7 @@ type name(void) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27054,7 +27054,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } /* -@@ -788,7 +788,7 @@ +@@ -788,7 +788,7 @@ type name(atype a) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27063,7 +27063,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall2(type,name,atype,a,btype,b) \ -@@ -813,7 +813,7 @@ +@@ -813,7 +813,7 @@ type name(atype a, btype b) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27072,7 +27072,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall3(type,name,atype,a,btype,b,ctype,c) \ -@@ -839,7 +839,7 @@ +@@ -839,7 +839,7 @@ type name(atype a, btype b, ctype c) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27081,7 +27081,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ -@@ -865,7 +865,7 @@ +@@ -865,7 +865,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27090,7 +27090,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #if (_MIPS_SIM == _MIPS_SIM_ABI32) -@@ -902,7 +902,7 @@ +@@ -902,7 +902,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27099,7 +27099,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -935,7 +935,7 @@ +@@ -935,7 +935,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27108,7 +27108,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ -@@ -966,7 +966,7 @@ +@@ -966,7 +966,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27117,7 +27117,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -995,7 +995,7 @@ +@@ -995,7 +995,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27128,9 +27128,9 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ Index: linux-2.4.35.4/include/asm-mips64/checksum.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/checksum.h 2007-12-15 05:19:44.490956432 +0100 -+++ linux-2.4.35.4/include/asm-mips64/checksum.h 2007-12-15 05:19:45.046988120 +0100 -@@ -144,7 +144,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/checksum.h ++++ linux-2.4.35.4/include/asm-mips64/checksum.h +@@ -144,7 +144,7 @@ static inline unsigned long csum_tcpudp_ "daddu\t%0, %4\n\t" "dsll32\t$1, %0, 0\n\t" "daddu\t%0, $1\n\t" @@ -27141,9 +27141,9 @@ Index: linux-2.4.35.4/include/asm-mips64/checksum.h : "0" (daddr), "r"(saddr), Index: linux-2.4.35.4/include/asm-mips64/elf.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/elf.h 2007-12-15 05:19:44.498956890 +0100 -+++ linux-2.4.35.4/include/asm-mips64/elf.h 2007-12-15 05:19:45.046988120 +0100 -@@ -64,9 +64,10 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/elf.h ++++ linux-2.4.35.4/include/asm-mips64/elf.h +@@ -64,9 +64,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE PAGE_SIZE @@ -27159,8 +27159,8 @@ Index: linux-2.4.35.4/include/asm-mips64/elf.h instruction set this cpu supports. This could be done in userspace, Index: linux-2.4.35.4/include/asm-mips64/hazards.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/hazards.h 2007-12-15 05:19:44.506957346 +0100 -+++ linux-2.4.35.4/include/asm-mips64/hazards.h 2007-12-15 05:19:45.046988120 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/hazards.h ++++ linux-2.4.35.4/include/asm-mips64/hazards.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -27380,9 +27380,9 @@ Index: linux-2.4.35.4/include/asm-mips64/hazards.h #endif /* _ASM_HAZARDS_H */ Index: linux-2.4.35.4/include/asm-mips64/ide.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/ide.h 2007-12-15 05:19:44.514957801 +0100 -+++ linux-2.4.35.4/include/asm-mips64/ide.h 2007-12-15 05:19:45.050988346 +0100 -@@ -32,12 +32,12 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/ide.h ++++ linux-2.4.35.4/include/asm-mips64/ide.h +@@ -32,12 +32,12 @@ struct ide_ops { extern struct ide_ops *ide_ops; @@ -27397,7 +27397,7 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h { return ide_ops->ide_default_io_base(index); } -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ static inline void ide_init_hwif_ports(h ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq); } @@ -27406,7 +27406,7 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h { #ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; -@@ -68,7 +68,89 @@ +@@ -68,7 +68,89 @@ static __inline__ void ide_init_default_ #define ide_ack_intr(hwif) ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1) #endif @@ -27499,9 +27499,9 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h Index: linux-2.4.35.4/include/asm-mips64/io.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/io.h 2007-12-15 05:19:44.522958256 +0100 -+++ linux-2.4.35.4/include/asm-mips64/io.h 2007-12-15 05:19:45.050988346 +0100 -@@ -414,7 +414,8 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/io.h ++++ linux-2.4.35.4/include/asm-mips64/io.h +@@ -414,7 +414,8 @@ static inline unsigned int inl_p(unsigne return __ioswab32(__val); } @@ -27511,7 +27511,7 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h { while (count--) { outb(*(u8 *)addr, port); -@@ -430,7 +431,8 @@ +@@ -430,7 +431,8 @@ static inline void __insb(unsigned long } } @@ -27521,7 +27521,7 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h { while (count--) { outw(*(u16 *)addr, port); -@@ -446,7 +448,8 @@ +@@ -446,7 +448,8 @@ static inline void __insw(unsigned long } } @@ -27533,9 +27533,9 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h outl(*(u32 *)addr, port); Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/mipsregs.h 2007-12-15 05:19:44.530958712 +0100 -+++ linux-2.4.35.4/include/asm-mips64/mipsregs.h 2007-12-15 05:19:45.050988346 +0100 -@@ -757,10 +757,18 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/mipsregs.h ++++ linux-2.4.35.4/include/asm-mips64/mipsregs.h +@@ -757,10 +757,18 @@ do { \ #define read_c0_config1() __read_32bit_c0_register($16, 1) #define read_c0_config2() __read_32bit_c0_register($16, 2) #define read_c0_config3() __read_32bit_c0_register($16, 3) @@ -27554,7 +27554,7 @@ Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h /* * The WatchLo register. There may be upto 8 of them. -@@ -856,42 +864,34 @@ +@@ -856,42 +864,34 @@ do { \ */ static inline void tlb_probe(void) { @@ -27599,8 +27599,8 @@ Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h /* Index: linux-2.4.35.4/include/asm-mips64/reg.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/reg.h 2007-12-15 05:19:44.538959170 +0100 -+++ linux-2.4.35.4/include/asm-mips64/reg.h 2007-12-15 05:19:45.050988346 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/reg.h ++++ linux-2.4.35.4/include/asm-mips64/reg.h @@ -46,6 +46,9 @@ /* * k0/k1 unsaved @@ -27613,9 +27613,9 @@ Index: linux-2.4.35.4/include/asm-mips64/reg.h #define EF_REG30 30 Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/sgi/hpc3.h 2007-12-15 05:19:44.546959625 +0100 -+++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h 2007-12-15 05:19:45.050988346 +0100 -@@ -128,26 +128,26 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/sgi/hpc3.h ++++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h +@@ -128,26 +128,26 @@ struct hpc3_ethregs { volatile u32 rx_gfptr; /* current GIO fifo ptr */ volatile u32 rx_dfptr; /* current device fifo ptr */ u32 _unused1; /* padding */ @@ -27662,7 +27662,7 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h u32 _unused2[0x1000/4 - 8]; /* padding */ -@@ -221,7 +221,7 @@ +@@ -221,7 +221,7 @@ struct hpc3_regs { #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */ u32 _unused1[0x14000/4 - 5]; /* padding */ @@ -27671,7 +27671,7 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h /* Now direct PIO per-HPC3 peripheral access to external regs. */ volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */ u32 _unused2[0x7c00/4]; -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ struct hpc3_regs { volatile u32 bbram[8192-50-14]; /* Battery backed ram */ }; @@ -27682,8 +27682,8 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h */ Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h 2007-12-15 05:19:44.554960080 +0100 -+++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h ++++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h @@ -8,7 +8,7 @@ #ifndef __ASM_SN_NMI_H #define __ASM_SN_NMI_H @@ -27695,9 +27695,9 @@ Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h Index: linux-2.4.35.4/include/asm-mips64/unistd.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/unistd.h 2007-12-15 05:19:44.562960536 +0100 -+++ linux-2.4.35.4/include/asm-mips64/unistd.h 2007-12-15 05:19:45.054988575 +0100 -@@ -760,7 +760,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/unistd.h ++++ linux-2.4.35.4/include/asm-mips64/unistd.h +@@ -760,7 +760,7 @@ type name(void) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27706,7 +27706,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } /* -@@ -788,7 +788,7 @@ +@@ -788,7 +788,7 @@ type name(atype a) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27715,7 +27715,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall2(type,name,atype,a,btype,b) \ -@@ -813,7 +813,7 @@ +@@ -813,7 +813,7 @@ type name(atype a, btype b) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27724,7 +27724,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall3(type,name,atype,a,btype,b,ctype,c) \ -@@ -839,7 +839,7 @@ +@@ -839,7 +839,7 @@ type name(atype a, btype b, ctype c) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27733,7 +27733,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ -@@ -865,7 +865,7 @@ +@@ -865,7 +865,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27742,7 +27742,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #if (_MIPS_SIM == _MIPS_SIM_ABI32) -@@ -902,7 +902,7 @@ +@@ -902,7 +902,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27751,7 +27751,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -935,7 +935,7 @@ +@@ -935,7 +935,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27760,7 +27760,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ -@@ -966,7 +966,7 @@ +@@ -966,7 +966,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27769,7 +27769,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -995,7 +995,7 @@ +@@ -995,7 +995,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27780,8 +27780,8 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ Index: linux-2.4.35.4/include/asm-ppc/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-ppc/param.h 2007-12-15 05:19:44.570960991 +0100 -+++ linux-2.4.35.4/include/asm-ppc/param.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-ppc/param.h ++++ linux-2.4.35.4/include/asm-ppc/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -27794,8 +27794,8 @@ Index: linux-2.4.35.4/include/asm-ppc/param.h #define EXEC_PAGESIZE 4096 Index: linux-2.4.35.4/include/asm-s390/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-s390/param.h 2007-12-15 05:19:44.578961449 +0100 -+++ linux-2.4.35.4/include/asm-s390/param.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-s390/param.h ++++ linux-2.4.35.4/include/asm-s390/param.h @@ -11,6 +11,9 @@ #ifndef HZ @@ -27808,8 +27808,8 @@ Index: linux-2.4.35.4/include/asm-s390/param.h #define EXEC_PAGESIZE 4096 Index: linux-2.4.35.4/include/asm-sh/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-sh/param.h 2007-12-15 05:19:44.590962131 +0100 -+++ linux-2.4.35.4/include/asm-sh/param.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-sh/param.h ++++ linux-2.4.35.4/include/asm-sh/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -27822,8 +27822,8 @@ Index: linux-2.4.35.4/include/asm-sh/param.h #define EXEC_PAGESIZE 4096 Index: linux-2.4.35.4/include/asm-sparc/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-sparc/param.h 2007-12-15 05:19:44.598962589 +0100 -+++ linux-2.4.35.4/include/asm-sparc/param.h 2007-12-15 05:19:45.058988805 +0100 +--- linux-2.4.35.4.orig/include/asm-sparc/param.h ++++ linux-2.4.35.4/include/asm-sparc/param.h @@ -4,6 +4,9 @@ #ifndef HZ @@ -27836,8 +27836,8 @@ Index: linux-2.4.35.4/include/asm-sparc/param.h #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ Index: linux-2.4.35.4/include/asm-sparc64/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-sparc64/param.h 2007-12-15 05:19:44.606963045 +0100 -+++ linux-2.4.35.4/include/asm-sparc64/param.h 2007-12-15 05:19:45.058988805 +0100 +--- linux-2.4.35.4.orig/include/asm-sparc64/param.h ++++ linux-2.4.35.4/include/asm-sparc64/param.h @@ -4,6 +4,9 @@ #ifndef HZ @@ -27850,8 +27850,8 @@ Index: linux-2.4.35.4/include/asm-sparc64/param.h #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ Index: linux-2.4.35.4/include/linux/i2c-algo-au1550.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h 2007-12-15 05:19:45.058988805 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com> @@ -27886,8 +27886,8 @@ Index: linux-2.4.35.4/include/linux/i2c-algo-au1550.h +#endif /* I2C_ALGO_AU1550_H */ Index: linux-2.4.35.4/include/linux/i2c-id.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/i2c-id.h 2007-12-15 05:19:44.618963729 +0100 -+++ linux-2.4.35.4/include/linux/i2c-id.h 2007-12-15 05:19:45.062989031 +0100 +--- linux-2.4.35.4.orig/include/linux/i2c-id.h ++++ linux-2.4.35.4/include/linux/i2c-id.h @@ -155,6 +155,8 @@ #define I2C_ALGO_SIBYTE 0x150000 /* Broadcom SiByte SOCs */ #define I2C_ALGO_SGI 0x160000 /* SGI algorithm */ @@ -27909,9 +27909,9 @@ Index: linux-2.4.35.4/include/linux/i2c-id.h #define I2C_HW_SMBUS_ALI15X3 0x01 Index: linux-2.4.35.4/include/linux/sched.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/sched.h 2007-12-15 05:19:44.626964184 +0100 -+++ linux-2.4.35.4/include/linux/sched.h 2007-12-15 05:19:45.066989260 +0100 -@@ -617,6 +617,10 @@ +--- linux-2.4.35.4.orig/include/linux/sched.h ++++ linux-2.4.35.4/include/linux/sched.h +@@ -617,6 +617,10 @@ asmlinkage long sys_wait4(pid_t pid,unsi extern int in_group_p(gid_t); extern int in_egroup_p(gid_t); @@ -27924,9 +27924,9 @@ Index: linux-2.4.35.4/include/linux/sched.h extern void flush_signal_handlers(struct task_struct *); Index: linux-2.4.35.4/include/linux/serial.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/serial.h 2007-12-15 05:19:44.634964640 +0100 -+++ linux-2.4.35.4/include/linux/serial.h 2007-12-15 05:19:45.066989260 +0100 -@@ -75,7 +75,8 @@ +--- linux-2.4.35.4.orig/include/linux/serial.h ++++ linux-2.4.35.4/include/linux/serial.h +@@ -75,7 +75,8 @@ struct serial_struct { #define PORT_16654 11 #define PORT_16850 12 #define PORT_RSA 13 /* RSA-DV II/S card */ @@ -27938,8 +27938,8 @@ Index: linux-2.4.35.4/include/linux/serial.h #define SERIAL_IO_HUB6 1 Index: linux-2.4.35.4/include/linux/swap.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/swap.h 2007-12-15 05:19:44.642965095 +0100 -+++ linux-2.4.35.4/include/linux/swap.h 2007-12-15 05:19:45.066989260 +0100 +--- linux-2.4.35.4.orig/include/linux/swap.h ++++ linux-2.4.35.4/include/linux/swap.h @@ -1,6 +1,12 @@ #ifndef _LINUX_SWAP_H #define _LINUX_SWAP_H @@ -27962,7 +27962,7 @@ Index: linux-2.4.35.4/include/linux/swap.h /* * Magic header for a swap area. The first part of the union is * what the swap magic looks like for the old (limited to 128MB) -@@ -39,8 +43,6 @@ +@@ -39,8 +43,6 @@ union swap_header { } info; }; @@ -27973,9 +27973,9 @@ Index: linux-2.4.35.4/include/linux/swap.h */ Index: linux-2.4.35.4/include/video/newport.h =================================================================== ---- linux-2.4.35.4.orig/include/video/newport.h 2007-12-15 05:19:44.650965550 +0100 -+++ linux-2.4.35.4/include/video/newport.h 2007-12-15 05:19:45.066989260 +0100 -@@ -291,8 +291,6 @@ +--- linux-2.4.35.4.orig/include/video/newport.h ++++ linux-2.4.35.4/include/video/newport.h +@@ -291,8 +291,6 @@ struct newport_regs { unsigned int _unused2[0x1ef]; struct newport_cregs cgo; }; @@ -27984,7 +27984,7 @@ Index: linux-2.4.35.4/include/video/newport.h typedef struct { unsigned int drawmode1; -@@ -450,38 +448,26 @@ +@@ -450,38 +448,26 @@ static __inline__ void newport_cmap_setr /* Miscellaneous NEWPORT routines. */ #define BUSY_TIMEOUT 100000 @@ -28033,7 +28033,7 @@ Index: linux-2.4.35.4/include/video/newport.h /* * DCBMODE register defines: */ -@@ -564,7 +550,7 @@ +@@ -564,7 +550,7 @@ xmap9FIFOWait (struct newport_regs *rex) { rex->set.dcbmode = DCB_XMAP0 | XM9_CRS_FIFO_AVAIL | DCB_DATAWIDTH_1 | R_DCB_XMAP9_PROTOCOL; @@ -28044,9 +28044,9 @@ Index: linux-2.4.35.4/include/video/newport.h ; Index: linux-2.4.35.4/init/main.c =================================================================== ---- linux-2.4.35.4.orig/init/main.c 2007-12-15 05:19:44.662966235 +0100 -+++ linux-2.4.35.4/init/main.c 2007-12-15 05:19:45.070989486 +0100 -@@ -296,7 +296,6 @@ +--- linux-2.4.35.4.orig/init/main.c ++++ linux-2.4.35.4/init/main.c +@@ -296,7 +296,6 @@ static void __init parse_options(char *l extern void setup_arch(char **); @@ -28056,9 +28056,9 @@ Index: linux-2.4.35.4/init/main.c Index: linux-2.4.35.4/kernel/exit.c =================================================================== ---- linux-2.4.35.4.orig/kernel/exit.c 2007-12-15 05:19:44.666966464 +0100 -+++ linux-2.4.35.4/kernel/exit.c 2007-12-15 05:19:45.070989486 +0100 -@@ -26,7 +26,7 @@ +--- linux-2.4.35.4.orig/kernel/exit.c ++++ linux-2.4.35.4/kernel/exit.c +@@ -26,7 +26,7 @@ extern struct task_struct *child_reaper; int getrusage(struct task_struct *, int, struct rusage *); @@ -28069,8 +28069,8 @@ Index: linux-2.4.35.4/kernel/exit.c #ifdef CONFIG_SMP Index: linux-2.4.35.4/kernel/signal.c =================================================================== ---- linux-2.4.35.4.orig/kernel/signal.c 2007-12-15 05:19:44.674966919 +0100 -+++ linux-2.4.35.4/kernel/signal.c 2007-12-15 05:19:45.070989486 +0100 +--- linux-2.4.35.4.orig/kernel/signal.c ++++ linux-2.4.35.4/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/sched.h> @@ -28094,7 +28094,7 @@ Index: linux-2.4.35.4/kernel/signal.c static kmem_cache_t *sigqueue_cachep; atomic_t nr_queued_signals; -@@ -270,6 +279,11 @@ +@@ -270,6 +279,11 @@ printk("SIG dequeue (%s:%d): %d ", curre signal_pending(current)); #endif @@ -28106,7 +28106,7 @@ Index: linux-2.4.35.4/kernel/signal.c sig = next_signal(current, mask); if (sig) { if (current->notifier) { -@@ -293,6 +307,10 @@ +@@ -293,6 +307,10 @@ printk("SIG dequeue (%s:%d): %d ", curre printk(" %d -> %d\n", signal_pending(current), sig); #endif @@ -28117,7 +28117,7 @@ Index: linux-2.4.35.4/kernel/signal.c return sig; } -@@ -540,6 +558,11 @@ +@@ -540,6 +558,11 @@ send_sig_info(int sig, struct siginfo *i printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig); #endif @@ -28129,7 +28129,7 @@ Index: linux-2.4.35.4/kernel/signal.c ret = -EINVAL; if (sig < 0 || sig > _NSIG) goto out_nolock; -@@ -778,8 +801,8 @@ +@@ -778,8 +801,8 @@ void do_notify_parent(struct task_struct info.si_uid = tsk->uid; /* FIXME: find out whether or not this is supposed to be c*time. */ @@ -28142,9 +28142,9 @@ Index: linux-2.4.35.4/kernel/signal.c why = SI_KERNEL; /* shouldn't happen */ Index: linux-2.4.35.4/kernel/sys.c =================================================================== ---- linux-2.4.35.4.orig/kernel/sys.c 2007-12-15 05:19:44.682967375 +0100 -+++ linux-2.4.35.4/kernel/sys.c 2007-12-15 05:19:45.074989715 +0100 -@@ -801,16 +801,23 @@ +--- linux-2.4.35.4.orig/kernel/sys.c ++++ linux-2.4.35.4/kernel/sys.c +@@ -801,16 +801,23 @@ asmlinkage long sys_setfsgid(gid_t gid) asmlinkage long sys_times(struct tms * tbuf) { @@ -28173,9 +28173,9 @@ Index: linux-2.4.35.4/kernel/sys.c /* Index: linux-2.4.35.4/lib/Makefile =================================================================== ---- linux-2.4.35.4.orig/lib/Makefile 2007-12-15 05:19:44.694968059 +0100 -+++ linux-2.4.35.4/lib/Makefile 2007-12-15 05:19:45.074989715 +0100 -@@ -27,6 +27,7 @@ +--- linux-2.4.35.4.orig/lib/Makefile ++++ linux-2.4.35.4/lib/Makefile +@@ -27,6 +27,7 @@ obj-$(CONFIG_CRC32) += crc32.o subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate @@ -28185,9 +28185,9 @@ Index: linux-2.4.35.4/lib/Makefile include $(TOPDIR)/drivers/bluetooth/Makefile.lib Index: linux-2.4.35.4/Makefile =================================================================== ---- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:44.702968514 +0100 -+++ linux-2.4.35.4/Makefile 2007-12-15 05:19:45.074989715 +0100 -@@ -469,10 +469,11 @@ +--- linux-2.4.35.4.orig/Makefile ++++ linux-2.4.35.4/Makefile +@@ -469,10 +469,11 @@ mrproper: clean archmrproper $(MAKE) -C Documentation/DocBook mrproper distclean: mrproper @@ -28203,7 +28203,7 @@ Index: linux-2.4.35.4/Makefile backup: mrproper cd .. && tar cf - linux/ | gzip -9 > backup.gz -@@ -499,7 +500,7 @@ +@@ -499,7 +500,7 @@ mandocs: $(MAKE) -C Documentation/DocBook man sums: |