diff options
Diffstat (limited to 'target/linux/generic-2.4/patches')
68 files changed, 1624 insertions, 3453 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 ea973bdaaa..e3acfa8c3a 100644 --- a/target/linux/generic-2.4/patches/000-linux_mips.patch +++ b/target/linux/generic-2.4/patches/000-linux_mips.patch @@ -1,7 +1,5 @@ -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 -+++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c +--- a/arch/mips/au1000/common/au1xxx_irqmap.c ++++ b/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}, @@ -48,10 +46,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0}, { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 }, { 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 -+++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c +--- a/arch/mips/au1000/common/cputable.c ++++ b/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 }, @@ -62,10 +58,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 }, }; -Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c -+++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c +--- a/arch/mips/au1000/common/dbdma.c ++++ b/arch/mips/au1000/common/dbdma.c @@ -41,6 +41,8 @@ #include <asm/au1xxx_dbdma.h> #include <asm/system.h> @@ -644,10 +638,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c + #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */ -Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c ++++ b/arch/mips/au1000/common/gpio.c @@ -0,0 +1,118 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -767,10 +759,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c +EXPORT_SYMBOL(au1xxx_gpio_tristate); +EXPORT_SYMBOL(au1xxx_gpio_write); +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 -+++ linux-2.4.35.4/arch/mips/au1000/common/irq.c +--- a/arch/mips/au1000/common/irq.c ++++ b/arch/mips/au1000/common/irq.c @@ -303,8 +303,30 @@ static struct hw_interrupt_type level_ir }; @@ -838,10 +828,8 @@ 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 -+++ linux-2.4.35.4/arch/mips/au1000/common/Makefile +--- a/arch/mips/au1000/common/Makefile ++++ b/arch/mips/au1000/common/Makefile @@ -19,9 +19,9 @@ O_TARGET := au1000.o export-objs = prom.o clocks.o power.o usbdev.o @@ -854,10 +842,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o 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 -+++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c +--- a/arch/mips/au1000/common/pci_fixup.c ++++ b/arch/mips/au1000/common/pci_fixup.c @@ -75,9 +75,13 @@ void __init pcibios_fixup(void) #ifdef CONFIG_NONCOHERENT_IO @@ -874,10 +860,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c printk("Non-coherent PCI accesses enabled\n"); #endif -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 -+++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c +--- a/arch/mips/au1000/common/pci_ops.c ++++ b/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) @@ -919,10 +903,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c } #endif -Index: linux-2.4.35.4/arch/mips/au1000/common/power.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c -+++ linux-2.4.35.4/arch/mips/au1000/common/power.c +--- a/arch/mips/au1000/common/power.c ++++ b/arch/mips/au1000/common/power.c @@ -50,7 +50,6 @@ static void calibrate_delay(void); @@ -1149,10 +1131,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c {0} }; -Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c -+++ linux-2.4.35.4/arch/mips/au1000/common/reset.c +--- a/arch/mips/au1000/common/reset.c ++++ b/arch/mips/au1000/common/reset.c @@ -37,8 +37,6 @@ #include <asm/system.h> #include <asm/au1000.h> @@ -1233,10 +1213,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c + /* If board can't power-off, spin forever */ au1000_halt(); } -Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c -+++ linux-2.4.35.4/arch/mips/au1000/common/setup.c +--- a/arch/mips/au1000/common/setup.c ++++ b/arch/mips/au1000/common/setup.c @@ -174,6 +174,40 @@ void __init au1x00_setup(void) initrd_end = (unsigned long)&__rd_end; #endif @@ -1331,10 +1309,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c if ((ide_ops == NULL) || (ide_ops == &no_ide_ops)) ide_ops = &std_ide_ops; #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 -+++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S +--- a/arch/mips/au1000/common/sleeper.S ++++ b/arch/mips/au1000/common/sleeper.S @@ -15,17 +15,48 @@ #include <asm/addrspace.h> #include <asm/regdef.h> @@ -1603,10 +1579,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S + .set reorder END(save_and_sleep) + -Index: linux-2.4.35.4/arch/mips/au1000/common/time.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c -+++ linux-2.4.35.4/arch/mips/au1000/common/time.c +--- a/arch/mips/au1000/common/time.c ++++ b/arch/mips/au1000/common/time.c @@ -50,7 +50,6 @@ #include <linux/mc146818rtc.h> #include <linux/timex.h> @@ -1666,10 +1640,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 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c +--- a/arch/mips/au1000/db1x00/board_setup.c ++++ b/arch/mips/au1000/db1x00/board_setup.c @@ -46,10 +46,22 @@ #include <asm/au1000.h> #include <asm/db1x00.h> @@ -1753,10 +1725,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c #ifdef CONFIG_MIPS_DB1000 printk("AMD Alchemy Au1000/Db1000 Board\n"); #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 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c +--- a/arch/mips/au1000/db1x00/irqmap.c ++++ b/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# @@ -1765,10 +1735,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c #else { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 Fully_Interted# { 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 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile +--- a/arch/mips/au1000/db1x00/Makefile ++++ b/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 @@ -1781,10 +1749,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile +endif + include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c ++++ b/arch/mips/au1000/db1x00/mmc_support.c @@ -0,0 +1,126 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -1912,10 +1878,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c +EXPORT_SYMBOL(mmc_power_on); +EXPORT_SYMBOL(mmc_power_off); + -Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c ++++ b/arch/mips/au1000/ficmmp/au1200_ibutton.c @@ -0,0 +1,270 @@ +/* ---------------------------------------------------------------------- + * mtwilson_keys.c @@ -2187,10 +2151,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c +MODULE_AUTHOR( DRIVER_AUTHOR ); +MODULE_DESCRIPTION( DRIVER_DESC ); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c ++++ b/arch/mips/au1000/ficmmp/au1xxx_dock.c @@ -0,0 +1,261 @@ +/* + * Copyright (C) 2003 Metrowerks, All Rights Reserved. @@ -2453,10 +2415,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c + +module_init(au1xxx_dock_init); +module_exit(au1xxx_dock_exit); -Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c ++++ b/arch/mips/au1000/ficmmp/board_setup.c @@ -0,0 +1,226 @@ +/* + * @@ -2684,10 +2644,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c + return 0; +} + -Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c ++++ b/arch/mips/au1000/ficmmp/init.c @@ -0,0 +1,76 @@ +/* + * @@ -2765,10 +2723,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c + return 0; +} + -Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c ++++ b/arch/mips/au1000/ficmmp/irqmap.c @@ -0,0 +1,61 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -2831,10 +2787,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c + +int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); + -Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile ++++ b/arch/mips/au1000/ficmmp/Makefile @@ -0,0 +1,25 @@ +# +# Copyright 2000 MontaVista Software Inc. @@ -2861,10 +2815,8 @@ 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 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c +--- a/arch/mips/au1000/hydrogen3/board_setup.c ++++ b/arch/mips/au1000/hydrogen3/board_setup.c @@ -51,12 +51,19 @@ void board_reset (void) { } @@ -2885,10 +2837,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c #ifdef CONFIG_AU1X00_USB_DEVICE // 2nd USB port is USB device pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000); -Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c ++++ b/arch/mips/au1000/hydrogen3/buttons.c @@ -0,0 +1,308 @@ +/* + * Copyright (C) 2003 Metrowerks, All Rights Reserved. @@ -3198,10 +3148,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c + +module_init(hydrogen3_buttons_init); +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 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile +--- a/arch/mips/au1000/hydrogen3/Makefile ++++ b/arch/mips/au1000/hydrogen3/Makefile @@ -14,6 +14,11 @@ USE_STANDARD_AS_RULE := true O_TARGET := hydrogen3.o @@ -3215,10 +3163,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile +endif include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c ++++ b/arch/mips/au1000/hydrogen3/mmc_support.c @@ -0,0 +1,89 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -3309,10 +3255,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c +EXPORT_SYMBOL(mmc_power_on); +EXPORT_SYMBOL(mmc_power_off); + -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 -+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c +--- a/arch/mips/au1000/mtx-1/board_setup.c ++++ b/arch/mips/au1000/mtx-1/board_setup.c @@ -48,6 +48,12 @@ extern struct rtc_ops no_rtc_ops; @@ -3326,10 +3270,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c void __init board_setup(void) { 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 -+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c +--- a/arch/mips/au1000/mtx-1/irqmap.c ++++ b/arch/mips/au1000/mtx-1/irqmap.c @@ -72,10 +72,10 @@ au1xxx_pci_irqmap(struct pci_dev *dev, u * A B C D */ @@ -3345,10 +3287,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c }; const long min_idsel = 0, max_idsel = 3, irqs_per_slot = 4; 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 -+++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c +--- a/arch/mips/au1000/pb1000/board_setup.c ++++ b/arch/mips/au1000/pb1000/board_setup.c @@ -58,6 +58,10 @@ void board_reset (void) { } @@ -3360,10 +3300,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c void __init board_setup(void) { 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 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c +--- a/arch/mips/au1000/pb1100/board_setup.c ++++ b/arch/mips/au1000/pb1100/board_setup.c @@ -62,6 +62,10 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -3375,10 +3313,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c void __init board_setup(void) { 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 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile +--- a/arch/mips/au1000/pb1100/Makefile ++++ b/arch/mips/au1000/pb1100/Makefile @@ -16,4 +16,10 @@ O_TARGET := pb1100.o obj-y := init.o board_setup.o irqmap.o @@ -3390,10 +3326,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile +endif + include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c ++++ b/arch/mips/au1000/pb1100/mmc_support.c @@ -0,0 +1,126 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -3521,10 +3455,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c +EXPORT_SYMBOL(mmc_power_on); +EXPORT_SYMBOL(mmc_power_off); + -Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c ++++ b/arch/mips/au1000/pb1200/board_setup.c @@ -0,0 +1,221 @@ +/* + * @@ -3747,10 +3679,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c + return 0; +} + -Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c ++++ b/arch/mips/au1000/pb1200/init.c @@ -0,0 +1,72 @@ +/* + * @@ -3824,10 +3754,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c + return 0; +} + -Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c ++++ b/arch/mips/au1000/pb1200/irqmap.c @@ -0,0 +1,180 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -4009,10 +3937,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c + request of any source attached to the cascade */ +} + -Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile ++++ b/arch/mips/au1000/pb1200/Makefile @@ -0,0 +1,25 @@ +# +# Copyright 2000 MontaVista Software Inc. @@ -4039,10 +3965,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 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c ++++ b/arch/mips/au1000/pb1200/mmc_support.c @@ -0,0 +1,141 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -4185,10 +4109,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c +EXPORT_SYMBOL(mmc_power_on); +EXPORT_SYMBOL(mmc_power_off); + -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 -+++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c +--- a/arch/mips/au1000/pb1500/board_setup.c ++++ b/arch/mips/au1000/pb1500/board_setup.c @@ -62,6 +62,10 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -4200,10 +4122,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c void __init board_setup(void) { 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 -+++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c +--- a/arch/mips/au1000/pb1550/board_setup.c ++++ b/arch/mips/au1000/pb1550/board_setup.c @@ -48,12 +48,31 @@ extern struct rtc_ops no_rtc_ops; @@ -4273,10 +4193,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c +#endif printk("AMD Alchemy Pb1550 Board\n"); } -Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c -+++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c +--- a/arch/mips/au1000/pb1550/irqmap.c ++++ b/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 }, @@ -4287,10 +4205,8 @@ 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 -+++ linux-2.4.35.4/arch/mips/config-shared.in +--- a/arch/mips/config-shared.in ++++ b/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 @@ -4411,10 +4327,8 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in "$CONFIG_NEC_OSPREY" = "y" -o \ "$CONFIG_NEC_EAGLE" = "y" -o \ "$CONFIG_NINO" = "y" -o \ -Index: linux-2.4.35.4/arch/mips/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig -+++ linux-2.4.35.4/arch/mips/defconfig +--- a/arch/mips/defconfig ++++ b/arch/mips/defconfig @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4457,10 +4371,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-atlas -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-atlas -+++ linux-2.4.35.4/arch/mips/defconfig-atlas +--- a/arch/mips/defconfig-atlas ++++ b/arch/mips/defconfig-atlas @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4503,10 +4415,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-bosporus -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus -+++ linux-2.4.35.4/arch/mips/defconfig-bosporus +--- a/arch/mips/defconfig-bosporus ++++ b/arch/mips/defconfig-bosporus @@ -30,8 +30,8 @@ CONFIG_MIPS_BOSPORUS=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4567,10 +4477,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-capcella -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-capcella -+++ linux-2.4.35.4/arch/mips/defconfig-capcella +--- a/arch/mips/defconfig-capcella ++++ b/arch/mips/defconfig-capcella @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4601,10 +4509,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-cobalt +--- a/arch/mips/defconfig-cobalt ++++ b/arch/mips/defconfig-cobalt @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4635,10 +4541,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=16 -Index: linux-2.4.35.4/arch/mips/defconfig-csb250 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-csb250 -+++ linux-2.4.35.4/arch/mips/defconfig-csb250 +--- a/arch/mips/defconfig-csb250 ++++ b/arch/mips/defconfig-csb250 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4669,10 +4573,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-db1000 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1000 -+++ linux-2.4.35.4/arch/mips/defconfig-db1000 +--- a/arch/mips/defconfig-db1000 ++++ b/arch/mips/defconfig-db1000 @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1000=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4723,10 +4625,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-db1100 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1100 +--- a/arch/mips/defconfig-db1100 ++++ b/arch/mips/defconfig-db1100 @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1100=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -4793,10 +4693,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_FB_IT8181 is not set # CONFIG_FB_VIRTUAL is not set CONFIG_FBCON_ADVANCED=y -Index: linux-2.4.35.4/arch/mips/defconfig-db1200 -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/defconfig-db1200 ++++ b/arch/mips/defconfig-db1200 @@ -0,0 +1,1032 @@ +# +# Automatically generated make config: don't edit @@ -5830,10 +5728,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1200 +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +# 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 -+++ linux-2.4.35.4/arch/mips/defconfig-db1500 +--- a/arch/mips/defconfig-db1500 ++++ b/arch/mips/defconfig-db1500 @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1500=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -5864,10 +5760,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-db1550 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1550 -+++ linux-2.4.35.4/arch/mips/defconfig-db1550 +--- a/arch/mips/defconfig-db1550 ++++ b/arch/mips/defconfig-db1550 @@ -30,8 +30,8 @@ CONFIG_MIPS_DB1550=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -5918,10 +5812,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476 -+++ linux-2.4.35.4/arch/mips/defconfig-ddb5476 +--- a/arch/mips/defconfig-ddb5476 ++++ b/arch/mips/defconfig-ddb5476 @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -5952,10 +5844,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477 -+++ linux-2.4.35.4/arch/mips/defconfig-ddb5477 +--- a/arch/mips/defconfig-ddb5477 ++++ b/arch/mips/defconfig-ddb5477 @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -5986,10 +5876,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-decstation -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-decstation -+++ linux-2.4.35.4/arch/mips/defconfig-decstation +--- a/arch/mips/defconfig-decstation ++++ b/arch/mips/defconfig-decstation @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -6032,10 +5920,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-e55 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-e55 -+++ linux-2.4.35.4/arch/mips/defconfig-e55 +--- a/arch/mips/defconfig-e55 ++++ b/arch/mips/defconfig-e55 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -6066,10 +5952,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-eagle +--- a/arch/mips/defconfig-eagle ++++ b/arch/mips/defconfig-eagle @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -6129,10 +6013,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-ev64120 +--- a/arch/mips/defconfig-ev64120 ++++ b/arch/mips/defconfig-ev64120 @@ -30,8 +30,8 @@ CONFIG_MODULES=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -6163,10 +6045,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100 -+++ linux-2.4.35.4/arch/mips/defconfig-ev96100 +--- a/arch/mips/defconfig-ev96100 ++++ b/arch/mips/defconfig-ev96100 @@ -30,8 +30,8 @@ CONFIG_MODULES=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -6197,10 +6077,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/defconfig-ficmmp ++++ b/arch/mips/defconfig-ficmmp @@ -0,0 +1,862 @@ +# +# Automatically generated make config: don't edit @@ -7064,10 +6942,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=m +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 -+++ linux-2.4.35.4/arch/mips/defconfig-hp-lj +--- a/arch/mips/defconfig-hp-lj ++++ b/arch/mips/defconfig-hp-lj @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7127,10 +7003,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_UNIX98_PTYS is not set # -Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3 -+++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3 +--- a/arch/mips/defconfig-hydrogen3 ++++ b/arch/mips/defconfig-hydrogen3 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7195,10 +7069,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_FB_IT8181 is not set # CONFIG_FB_VIRTUAL is not set CONFIG_FBCON_ADVANCED=y -Index: linux-2.4.35.4/arch/mips/defconfig-ip22 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ip22 -+++ linux-2.4.35.4/arch/mips/defconfig-ip22 +--- a/arch/mips/defconfig-ip22 ++++ b/arch/mips/defconfig-ip22 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7241,10 +7113,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-it8172 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-it8172 -+++ linux-2.4.35.4/arch/mips/defconfig-it8172 +--- a/arch/mips/defconfig-it8172 ++++ b/arch/mips/defconfig-it8172 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7304,10 +7174,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-ivr -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ivr -+++ linux-2.4.35.4/arch/mips/defconfig-ivr +--- a/arch/mips/defconfig-ivr ++++ b/arch/mips/defconfig-ivr @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7338,10 +7206,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927 -+++ linux-2.4.35.4/arch/mips/defconfig-jmr3927 +--- a/arch/mips/defconfig-jmr3927 ++++ b/arch/mips/defconfig-jmr3927 @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7372,10 +7238,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # CONFIG_UNIX98_PTYS is not set # -Index: linux-2.4.35.4/arch/mips/defconfig-lasat -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-lasat -+++ linux-2.4.35.4/arch/mips/defconfig-lasat +--- a/arch/mips/defconfig-lasat ++++ b/arch/mips/defconfig-lasat @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7424,10 +7288,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-malta -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-malta -+++ linux-2.4.35.4/arch/mips/defconfig-malta +--- a/arch/mips/defconfig-malta ++++ b/arch/mips/defconfig-malta @@ -22,16 +22,19 @@ CONFIG_KMOD=y # # CONFIG_ACER_PICA_61 is not set @@ -7566,10 +7428,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-mirage -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mirage -+++ linux-2.4.35.4/arch/mips/defconfig-mirage +--- a/arch/mips/defconfig-mirage ++++ b/arch/mips/defconfig-mirage @@ -30,8 +30,8 @@ CONFIG_MIPS_MIRAGE=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7618,10 +7478,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x -+++ linux-2.4.35.4/arch/mips/defconfig-mpc30x +--- a/arch/mips/defconfig-mpc30x ++++ b/arch/mips/defconfig-mpc30x @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7652,10 +7510,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-mtx-1 +--- a/arch/mips/defconfig-mtx-1 ++++ b/arch/mips/defconfig-mtx-1 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7716,10 +7572,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-nino -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-nino -+++ linux-2.4.35.4/arch/mips/defconfig-nino +--- a/arch/mips/defconfig-nino ++++ b/arch/mips/defconfig-nino @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7750,10 +7604,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # CONFIG_UNIX98_PTYS is not set # -Index: linux-2.4.35.4/arch/mips/defconfig-ocelot -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot -+++ linux-2.4.35.4/arch/mips/defconfig-ocelot +--- a/arch/mips/defconfig-ocelot ++++ b/arch/mips/defconfig-ocelot @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7802,10 +7654,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-osprey -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-osprey -+++ linux-2.4.35.4/arch/mips/defconfig-osprey +--- a/arch/mips/defconfig-osprey ++++ b/arch/mips/defconfig-osprey @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -7836,10 +7686,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1000 +--- a/arch/mips/defconfig-pb1000 ++++ b/arch/mips/defconfig-pb1000 @@ -30,8 +30,8 @@ CONFIG_KMOD=y CONFIG_MIPS_PB1000=y # CONFIG_MIPS_PB1100 is not set @@ -7897,10 +7745,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_TS_AU1X00_ADS7846 is not set # -Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1100 +--- a/arch/mips/defconfig-pb1100 ++++ b/arch/mips/defconfig-pb1100 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set CONFIG_MIPS_PB1100=y @@ -7965,10 +7811,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_FB_IT8181 is not set # CONFIG_FB_VIRTUAL is not set CONFIG_FBCON_ADVANCED=y -Index: linux-2.4.35.4/arch/mips/defconfig-pb1200 -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/defconfig-pb1200 ++++ b/arch/mips/defconfig-pb1200 @@ -0,0 +1,1060 @@ +# +# Automatically generated make config: don't edit @@ -9030,10 +8874,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1200 +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +# 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 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1500 +--- a/arch/mips/defconfig-pb1500 ++++ b/arch/mips/defconfig-pb1500 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9082,10 +8924,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1550 +--- a/arch/mips/defconfig-pb1550 ++++ b/arch/mips/defconfig-pb1550 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9136,10 +8976,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927 -+++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927 +--- a/arch/mips/defconfig-rbtx4927 ++++ b/arch/mips/defconfig-rbtx4927 @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9170,10 +9008,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # CONFIG_UNIX98_PTYS is not set # -Index: linux-2.4.35.4/arch/mips/defconfig-rm200 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-rm200 -+++ linux-2.4.35.4/arch/mips/defconfig-rm200 +--- a/arch/mips/defconfig-rm200 ++++ b/arch/mips/defconfig-rm200 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9204,10 +9040,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm -+++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm +--- a/arch/mips/defconfig-sb1250-swarm ++++ b/arch/mips/defconfig-sb1250-swarm @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9246,10 +9080,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-sead -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-sead -+++ linux-2.4.35.4/arch/mips/defconfig-sead +--- a/arch/mips/defconfig-sead ++++ b/arch/mips/defconfig-sead @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9268,10 +9100,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sead # CONFIG_UNIX98_PTYS is not set # -Index: linux-2.4.35.4/arch/mips/defconfig-stretch -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-stretch -+++ linux-2.4.35.4/arch/mips/defconfig-stretch +--- a/arch/mips/defconfig-stretch ++++ b/arch/mips/defconfig-stretch @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9314,10 +9144,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226 -+++ linux-2.4.35.4/arch/mips/defconfig-tb0226 +--- a/arch/mips/defconfig-tb0226 ++++ b/arch/mips/defconfig-tb0226 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9360,10 +9188,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-tb0229 +--- a/arch/mips/defconfig-tb0229 ++++ b/arch/mips/defconfig-tb0229 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9394,10 +9220,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-ti1500 +--- a/arch/mips/defconfig-ti1500 ++++ b/arch/mips/defconfig-ti1500 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9446,10 +9270,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-workpad -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-workpad -+++ linux-2.4.35.4/arch/mips/defconfig-workpad +--- a/arch/mips/defconfig-workpad ++++ b/arch/mips/defconfig-workpad @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9480,10 +9302,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad # CONFIG_VR41XX_KIU is not set CONFIG_UNIX98_PTYS=y 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 -+++ linux-2.4.35.4/arch/mips/defconfig-xxs1500 +--- a/arch/mips/defconfig-xxs1500 ++++ b/arch/mips/defconfig-xxs1500 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9532,10 +9352,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/defconfig-yosemite -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite -+++ linux-2.4.35.4/arch/mips/defconfig-yosemite +--- a/arch/mips/defconfig-yosemite ++++ b/arch/mips/defconfig-yosemite @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -9578,10 +9396,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c -+++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c +--- a/arch/mips/kernel/cpu-probe.c ++++ b/arch/mips/kernel/cpu-probe.c @@ -34,21 +34,16 @@ static void r4k_wait(void) ".set\tmips0"); } @@ -9650,10 +9466,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c default: printk(" unavailable.\n"); break; -Index: linux-2.4.35.4/arch/mips/kernel/head.S -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/head.S -+++ linux-2.4.35.4/arch/mips/kernel/head.S +--- a/arch/mips/kernel/head.S ++++ b/arch/mips/kernel/head.S @@ -43,9 +43,9 @@ /* Cache Error */ @@ -9822,10 +9636,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(smp_bootstrap) #endif -Index: linux-2.4.35.4/arch/mips/kernel/process.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/process.c -+++ linux-2.4.35.4/arch/mips/kernel/process.c +--- a/arch/mips/kernel/process.c ++++ b/arch/mips/kernel/process.c @@ -128,6 +128,26 @@ int dump_fpu(struct pt_regs *regs, elf_f return 1; } @@ -9853,10 +9665,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/process.c /* * Create a kernel thread */ -Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S -+++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S +--- a/arch/mips/kernel/scall_o32.S ++++ b/arch/mips/kernel/scall_o32.S @@ -121,15 +121,14 @@ reschedule: trace_a_syscall: @@ -9875,10 +9685,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S li t0, -EMAXERRNO - 1 # error? 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 -+++ linux-2.4.35.4/arch/mips/kernel/setup.c +--- a/arch/mips/kernel/setup.c ++++ b/arch/mips/kernel/setup.c @@ -5,7 +5,7 @@ * * Copyright (C) 1995 Linus Torvalds @@ -9908,10 +9716,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c start_kernel(); } -Index: linux-2.4.35.4/arch/mips/kernel/traps.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/traps.c -+++ linux-2.4.35.4/arch/mips/kernel/traps.c +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c @@ -452,9 +452,10 @@ static inline void simulate_ll(struct pt } ll_task = current; @@ -9998,10 +9804,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c - TLBMISS_HANDLER_SETUP(); + per_cpu_trap_init(); } -Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c -+++ linux-2.4.35.4/arch/mips/lib/rtc-no.c +--- a/arch/mips/lib/rtc-no.c ++++ b/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. @@ -10020,10 +9824,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 -+++ linux-2.4.35.4/arch/mips/lib/rtc-std.c +--- a/arch/mips/lib/rtc-std.c ++++ b/arch/mips/lib/rtc-std.c @@ -5,9 +5,8 @@ * * RTC routines for PC style attached Dallas chip. @@ -10041,10 +9843,8 @@ 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 -+++ linux-2.4.35.4/arch/mips/Makefile +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile @@ -209,7 +209,7 @@ LOADADDR := 0x80080000 endif @@ -10112,10 +9912,8 @@ 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 -+++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c +--- a/arch/mips/mm/cerr-sb1.c ++++ b/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] */ @@ -10160,10 +9958,8 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c if (way == 0) { lru = (taghi >> 14) & 0xff; 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 -+++ linux-2.4.35.4/arch/mips/mm/c-r4k.c +--- a/arch/mips/mm/c-r4k.c ++++ b/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. @@ -10194,10 +9990,8 @@ Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c r4k_blast_dcache_page_setup(); r4k_blast_dcache_page_indexed_setup(); 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 -+++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S +--- a/arch/mips/mm/tlbex-mips32.S ++++ b/arch/mips/mm/tlbex-mips32.S @@ -196,7 +196,7 @@ .set noat; \ SAVE_ALL; \ @@ -10207,10 +10001,8 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S .set at; \ move a0, sp; \ 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 -+++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S +--- a/arch/mips/mm/tlbex-r4k.S ++++ b/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 @@ -10279,10 +10071,8 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .set mips3 eret .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 -+++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c +--- a/arch/mips/mm/tlb-r4k.c ++++ b/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. @@ -10609,10 +10399,8 @@ 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 -+++ linux-2.4.35.4/arch/mips64/defconfig +--- a/arch/mips64/defconfig ++++ b/arch/mips64/defconfig @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -10643,10 +10431,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-atlas -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas -+++ linux-2.4.35.4/arch/mips64/defconfig-atlas +--- a/arch/mips64/defconfig-atlas ++++ b/arch/mips64/defconfig-atlas @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -10689,10 +10475,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-decstation -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation -+++ linux-2.4.35.4/arch/mips64/defconfig-decstation +--- a/arch/mips64/defconfig-decstation ++++ b/arch/mips64/defconfig-decstation @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -10735,10 +10519,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22 -+++ linux-2.4.35.4/arch/mips64/defconfig-ip22 +--- a/arch/mips64/defconfig-ip22 ++++ b/arch/mips64/defconfig-ip22 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -10781,10 +10563,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27 -+++ linux-2.4.35.4/arch/mips64/defconfig-ip27 +--- a/arch/mips64/defconfig-ip27 ++++ b/arch/mips64/defconfig-ip27 @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -10815,10 +10595,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar -+++ linux-2.4.35.4/arch/mips64/defconfig-jaguar +--- a/arch/mips64/defconfig-jaguar ++++ b/arch/mips64/defconfig-jaguar @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -10849,10 +10627,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-malta -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-malta -+++ linux-2.4.35.4/arch/mips64/defconfig-malta +--- a/arch/mips64/defconfig-malta ++++ b/arch/mips64/defconfig-malta @@ -22,16 +22,19 @@ CONFIG_KMOD=y # # CONFIG_ACER_PICA_61 is not set @@ -11003,10 +10779,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc -+++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc +--- a/arch/mips64/defconfig-ocelotc ++++ b/arch/mips64/defconfig-ocelotc @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -11037,10 +10811,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm -+++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm +--- a/arch/mips64/defconfig-sb1250-swarm ++++ b/arch/mips64/defconfig-sb1250-swarm @@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -11079,10 +10851,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -Index: linux-2.4.35.4/arch/mips64/defconfig-sead -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-sead -+++ linux-2.4.35.4/arch/mips64/defconfig-sead +--- a/arch/mips64/defconfig-sead ++++ b/arch/mips64/defconfig-sead @@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set @@ -11101,10 +10871,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sead # CONFIG_UNIX98_PTYS is not set # -Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c -+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c +--- a/arch/mips64/kernel/binfmt_elfn32.c ++++ b/arch/mips64/kernel/binfmt_elfn32.c @@ -116,4 +116,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux- #undef MODULE_DESCRIPTION #undef MODULE_AUTHOR @@ -11113,10 +10881,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c +#define TASK_SIZE TASK_SIZE32 + #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 -+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c +--- a/arch/mips64/kernel/binfmt_elfo32.c ++++ b/arch/mips64/kernel/binfmt_elfo32.c @@ -137,4 +137,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux- #undef MODULE_DESCRIPTION #undef MODULE_AUTHOR @@ -11125,10 +10891,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c +#define TASK_SIZE TASK_SIZE32 + #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 -+++ linux-2.4.35.4/arch/mips64/kernel/head.S +--- a/arch/mips64/kernel/head.S ++++ b/arch/mips64/kernel/head.S @@ -91,6 +91,21 @@ EXPORT(_stext) __INIT @@ -11213,10 +10977,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S END(smp_bootstrap) #endif /* CONFIG_SMP */ -Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c -+++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c +--- a/arch/mips64/kernel/ioctl32.c ++++ b/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), @@ -11226,10 +10988,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c IOCTL32_DEFAULT(AUTOFS_IOC_ASKREGHOST), IOCTL32_DEFAULT(AUTOFS_IOC_TOGGLEREGHOST), 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 -+++ linux-2.4.35.4/arch/mips64/kernel/linux32.c +--- a/arch/mips64/kernel/linux32.c ++++ b/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 @@ -11316,10 +11076,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c /* * Ooo, nasty. We need here to frob 32-bit unsigned longs to * 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 -+++ linux-2.4.35.4/arch/mips64/kernel/process.c +--- a/arch/mips64/kernel/process.c ++++ b/arch/mips64/kernel/process.c @@ -125,6 +125,25 @@ int dump_fpu(struct pt_regs *regs, elf_f return 1; } @@ -11346,10 +11104,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/process.c /* * Create a kernel thread */ -Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S -+++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S +--- a/arch/mips64/kernel/scall_64.S ++++ b/arch/mips64/kernel/scall_64.S @@ -102,15 +102,14 @@ _64_reschedule: trace_a_syscall: @@ -11368,10 +11124,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S li t0, -EMAXERRNO - 1 # error? 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 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S +--- a/arch/mips64/kernel/scall_n32.S ++++ b/arch/mips64/kernel/scall_n32.S @@ -106,15 +106,14 @@ n32_reschedule: trace_a_syscall: @@ -11390,10 +11144,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S li t0, -EMAXERRNO - 1 # error? 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 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S +--- a/arch/mips64/kernel/scall_o32.S ++++ b/arch/mips64/kernel/scall_o32.S @@ -118,9 +118,8 @@ trace_a_syscall: sd a6, PT_R10(sp) sd a7, PT_R11(sp) @@ -11423,10 +11175,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S .macro sys function, nargs .byte \nargs .endm -Index: linux-2.4.35.4/arch/mips64/kernel/setup.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c -+++ linux-2.4.35.4/arch/mips64/kernel/setup.c +--- a/arch/mips64/kernel/setup.c ++++ b/arch/mips64/kernel/setup.c @@ -129,14 +129,6 @@ asmlinkage void __init init_arch(int arg */ load_mmu(); @@ -11442,10 +11192,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/setup.c start_kernel(); } -Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c -+++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c +--- a/arch/mips64/kernel/signal_n32.c ++++ b/arch/mips64/kernel/signal_n32.c @@ -68,7 +68,7 @@ struct rt_sigframe_n32 { }; @@ -11455,10 +11203,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c asmlinkage void sysn32_rt_sigreturn(abi64_no_regargs, struct pt_regs regs) { -Index: linux-2.4.35.4/arch/mips64/kernel/traps.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c -+++ linux-2.4.35.4/arch/mips64/kernel/traps.c +--- a/arch/mips64/kernel/traps.c ++++ b/arch/mips64/kernel/traps.c @@ -462,9 +462,10 @@ static inline void simulate_ll(struct pt } ll_task = current; @@ -11549,10 +11295,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c - current->active_mm = &init_mm; + per_cpu_trap_init(); } -Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c -+++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c +--- a/arch/mips64/mm/cerr-sb1.c ++++ b/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] */ @@ -11597,10 +11341,8 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c if (way == 0) { lru = (taghi >> 14) & 0xff; 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 -+++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c +--- a/arch/mips64/mm/c-r4k.c ++++ b/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. @@ -11631,10 +11373,8 @@ Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c r4k_blast_dcache_page_setup(); r4k_blast_dcache_page_indexed_setup(); 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 -+++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S +--- a/arch/mips64/mm/tlbex-r4k.S ++++ b/arch/mips64/mm/tlbex-r4k.S @@ -125,6 +125,33 @@ LEAF(except_vec1_r4k) nop END(except_vec1_r4k) @@ -11743,10 +11483,8 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S eret END(handle_vec1_r10k) -Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c -+++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c +--- a/arch/mips64/mm/tlb-r4k.c ++++ b/arch/mips64/mm/tlb-r4k.c @@ -1,24 +1,12 @@ /* - * Carsten Langgaard, carstenl@mips.com @@ -12098,10 +11836,8 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c probe_tlb(config); write_c0_pagemask(PM_DEFAULT_MASK); 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 -+++ linux-2.4.35.4/drivers/char/au1000_gpio.c +--- a/drivers/char/au1000_gpio.c ++++ b/drivers/char/au1000_gpio.c @@ -246,7 +246,7 @@ static struct file_operations au1000gpio static struct miscdevice au1000gpio_miscdev = @@ -12111,10 +11847,8 @@ Index: linux-2.4.35.4/drivers/char/au1000_gpio.c "au1000_gpio", &au1000gpio_fops }; -Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c ++++ b/drivers/char/au1550_psc_spi.c @@ -0,0 +1,466 @@ +/* + * Driver for Alchemy Au1550 SPI on the PSC. @@ -12582,10 +12316,8 @@ Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c + +module_init(au1550spi_init); +module_exit(au1550spi_exit); -Index: linux-2.4.35.4/drivers/char/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/Config.in -+++ linux-2.4.35.4/drivers/char/Config.in +--- a/drivers/char/Config.in ++++ b/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 @@ -12623,10 +12355,8 @@ Index: linux-2.4.35.4/drivers/char/Config.in fi if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then 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 -+++ linux-2.4.35.4/drivers/char/decserial.c +--- a/drivers/char/decserial.c ++++ b/drivers/char/decserial.c @@ -3,95 +3,105 @@ * choose the right serial device at boot time * @@ -12777,10 +12507,8 @@ Index: linux-2.4.35.4/drivers/char/decserial.c #endif } -Index: linux-2.4.35.4/drivers/char/ds1286.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/ds1286.c -+++ linux-2.4.35.4/drivers/char/ds1286.c +--- a/drivers/char/ds1286.c ++++ b/drivers/char/ds1286.c @@ -1,6 +1,10 @@ /* * DS1286 Real Time Clock interface for Linux @@ -12916,10 +12644,8 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c + +MODULE_AUTHOR("Ralf Baechle"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/char/ds1742.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/ds1742.c -+++ linux-2.4.35.4/drivers/char/ds1742.c +--- a/drivers/char/ds1742.c ++++ b/drivers/char/ds1742.c @@ -142,6 +142,7 @@ static int rtc_ds1742_set_time(unsigned CMOS_WRITE(RTC_WRITE, RTC_CONTROL); @@ -12955,10 +12681,8 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c to_tm(curr_time, &rtc_tm); rtc_tm.tm_year -= 1900; 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 -+++ linux-2.4.35.4/drivers/char/dummy_keyb.c +--- a/drivers/char/dummy_keyb.c ++++ b/drivers/char/dummy_keyb.c @@ -141,3 +141,7 @@ void __init kbd_init_hw(void) { printk("Dummy keyboard driver installed.\n"); @@ -12967,10 +12691,8 @@ Index: linux-2.4.35.4/drivers/char/dummy_keyb.c +unsigned char kbd_sysrq_key; +unsigned char kbd_sysrq_xlate[128]; +#endif -Index: linux-2.4.35.4/drivers/char/dz.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/dz.c -+++ linux-2.4.35.4/drivers/char/dz.c +--- a/drivers/char/dz.c ++++ b/drivers/char/dz.c @@ -1,11 +1,13 @@ /* - * dz.c: Serial port driver for DECStations equiped @@ -13840,10 +13562,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 -+++ linux-2.4.35.4/drivers/char/dz.h +--- a/drivers/char/dz.h ++++ b/drivers/char/dz.h @@ -10,6 +10,8 @@ #ifndef DZ_SERIAL_H #define DZ_SERIAL_H @@ -13992,10 +13712,8 @@ Index: linux-2.4.35.4/drivers/char/dz.h -#endif - #endif /* DZ_SERIAL_H */ -Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map ++++ b/drivers/char/ibm_workpad_keymap.map @@ -0,0 +1,343 @@ +# Keymap for IBM Workpad z50 +# US Mapping @@ -14340,10 +14058,8 @@ Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map +keycode 93 = AltGr +keycode 94 = ShiftR + 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 -+++ linux-2.4.35.4/drivers/char/indydog.c +--- a/drivers/char/indydog.c ++++ b/drivers/char/indydog.c @@ -1,5 +1,5 @@ /* - * IndyDog 0.2 A Hardware Watchdog Device for SGI IP22 @@ -14587,10 +14303,8 @@ Index: linux-2.4.35.4/drivers/char/indydog.c +MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>"); +MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22"); 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 -+++ linux-2.4.35.4/drivers/char/ip27-rtc.c +--- a/drivers/char/ip27-rtc.c ++++ b/drivers/char/ip27-rtc.c @@ -44,6 +44,7 @@ #include <asm/sn/klconfig.h> #include <asm/sn/sn0/ip27.h> @@ -14620,10 +14334,8 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c +MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>"); +MODULE_DESCRIPTION("SGI IP27 M48T35 RTC driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/char/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/Makefile -+++ linux-2.4.35.4/drivers/char/Makefile +--- a/drivers/char/Makefile ++++ b/drivers/char/Makefile @@ -48,7 +48,12 @@ ifeq ($(ARCH),mips) KEYBD = endif @@ -14672,10 +14384,8 @@ Index: linux-2.4.35.4/drivers/char/Makefile + +victor_mpc30x_keymap.c: victor_mpc30x_keymap.map + 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 -+++ linux-2.4.35.4/drivers/char/mips_rtc.c +--- a/drivers/char/mips_rtc.c ++++ b/drivers/char/mips_rtc.c @@ -53,14 +53,6 @@ #include <asm/io.h> #include <asm/uaccess.h> @@ -14691,10 +14401,8 @@ Index: linux-2.4.35.4/drivers/char/mips_rtc.c #include <asm/time.h> 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 -+++ linux-2.4.35.4/drivers/char/sb1250_duart.c +--- a/drivers/char/sb1250_duart.c ++++ b/drivers/char/sb1250_duart.c @@ -328,10 +328,11 @@ static int duart_write(struct tty_struct if (c <= 0) break; @@ -14749,10 +14457,8 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c break; case TIOCSSERIAL: printk("Ignoring TIOCSSERIAL\n"); -Index: linux-2.4.35.4/drivers/char/serial.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/serial.c -+++ linux-2.4.35.4/drivers/char/serial.c +--- a/drivers/char/serial.c ++++ b/drivers/char/serial.c @@ -62,6 +62,12 @@ * Robert Schwebel <robert@schwebel.de>, * Juergen Beisert <jbeisert@eurodsn.de>, @@ -14798,10 +14504,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 -+++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map ++++ b/drivers/char/victor_mpc30x_keymap.map @@ -0,0 +1,102 @@ +# Victor Interlink MP-C303/304 keyboard keymap +# @@ -14905,10 +14609,8 @@ Index: linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map + alt keycode 31 = PageDown +keycode 47 = Right + 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 -+++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c +--- a/drivers/char/vr41xx_keyb.c ++++ b/drivers/char/vr41xx_keyb.c @@ -308,7 +308,7 @@ void __devinit kbd_init_hw(void) if (found != 0) { kiu_base = VRC4173_KIU_OFFSET; @@ -14927,10 +14629,8 @@ Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c kiu_writew(KIURST_KIURST, KIURST); -Index: linux-2.4.35.4/drivers/i2c/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/Config.in -+++ linux-2.4.35.4/drivers/i2c/Config.in +--- a/drivers/i2c/Config.in ++++ b/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 @@ -14942,10 +14642,8 @@ Index: linux-2.4.35.4/drivers/i2c/Config.in # This is needed for automatic patch generation: sensors code starts here # 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 -+++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c ++++ b/drivers/i2c/i2c-algo-au1550.c @@ -0,0 +1,340 @@ +/* + * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface @@ -15287,10 +14985,8 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c +MODULE_AUTHOR("Dan Malek <dan@embeddededge.com>"); +MODULE_DESCRIPTION("SMBus Au1550 algorithm"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c ++++ b/drivers/i2c/i2c-au1550.c @@ -0,0 +1,154 @@ +/* + * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface @@ -15446,10 +15142,8 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c +{ + i2c_au1550_del_bus(&pb1550_board_adapter); +} -Index: linux-2.4.35.4/drivers/i2c/i2c-core.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c -+++ linux-2.4.35.4/drivers/i2c/i2c-core.c +--- a/drivers/i2c/i2c-core.c ++++ b/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); @@ -15471,10 +15165,8 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-core.c /* -------------- proc interface ---- */ #ifdef CONFIG_I2C_PROC sensors_init(); -Index: linux-2.4.35.4/drivers/i2c/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/Makefile -+++ linux-2.4.35.4/drivers/i2c/Makefile +--- a/drivers/i2c/Makefile ++++ b/drivers/i2c/Makefile @@ -6,7 +6,7 @@ O_TARGET := i2c.o export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \ @@ -15492,10 +15184,8 @@ Index: linux-2.4.35.4/drivers/i2c/Makefile # This is needed for automatic patch generation: sensors code starts here # 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 -+++ linux-2.4.35.4/drivers/media/video/indycam.c +--- a/drivers/media/video/indycam.c ++++ b/drivers/media/video/indycam.c @@ -50,13 +50,14 @@ static int indycam_attach(struct i2c_ada 0x80, /* INDYCAM_GAMMA */ }; @@ -15545,10 +15235,8 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c MOD_INC_USE_COUNT; return 0; -Index: linux-2.4.35.4/drivers/media/video/vino.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/media/video/vino.c -+++ linux-2.4.35.4/drivers/media/video/vino.c +--- a/drivers/media/video/vino.c ++++ b/drivers/media/video/vino.c @@ -5,6 +5,8 @@ * License version 2 as published by the Free Software Foundation. * @@ -15669,10 +15357,8 @@ 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 -+++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c +--- a/drivers/mtd/devices/docprobe.c ++++ b/drivers/mtd/devices/docprobe.c @@ -89,10 +89,10 @@ static unsigned long __initdata doc_loca 0xe4000000, #elif defined(CONFIG_MOMENCO_OCELOT) @@ -15687,10 +15373,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c #warning Unknown architecture for DiskOnChip. No default probe locations defined #endif 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 -+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c +--- a/drivers/mtd/devices/ms02-nv.c ++++ b/drivers/mtd/devices/ms02-nv.c @@ -1,10 +1,10 @@ /* - * Copyright (c) 2001 Maciej W. Rozycki @@ -15764,10 +15448,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c csr = (volatile u32 *)KN03_MCR_BASE; if (*csr & KN03_MCR_BNK32M) 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 -+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h +--- a/drivers/mtd/devices/ms02-nv.h ++++ b/drivers/mtd/devices/ms02-nv.h @@ -1,32 +1,96 @@ /* - * Copyright (c) 2001 Maciej W. Rozycki @@ -15874,10 +15556,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h typedef volatile u32 ms02nv_uint; 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 -+++ linux-2.4.35.4/drivers/mtd/maps/Config.in +--- a/drivers/mtd/maps/Config.in ++++ b/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 @@ -15905,10 +15585,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Config.in dep_tristate ' Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then 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 -+++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c ++++ b/drivers/mtd/maps/db1x00-flash.c @@ -0,0 +1,283 @@ +/* + * Flash memory access on Alchemy Db1xxx boards @@ -16193,10 +15871,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c +MODULE_AUTHOR("Pete Popov"); +MODULE_DESCRIPTION("Db1x00 mtd map driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c ++++ b/drivers/mtd/maps/hydrogen3-flash.c @@ -0,0 +1,189 @@ +/* + * Flash memory access on Alchemy HydrogenIII boards @@ -16387,10 +16063,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c +MODULE_AUTHOR("Pete Popov"); +MODULE_DESCRIPTION("HydrogenIII mtd map driver"); +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 -+++ linux-2.4.35.4/drivers/mtd/maps/lasat.c +--- a/drivers/mtd/maps/lasat.c ++++ b/drivers/mtd/maps/lasat.c @@ -1,15 +1,6 @@ /* * Flash device on lasat 100 and 200 boards @@ -16496,10 +16170,8 @@ 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 -+++ linux-2.4.35.4/drivers/mtd/maps/Makefile +--- a/drivers/mtd/maps/Makefile ++++ b/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 @@ -16521,10 +16193,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Makefile +obj-$(CONFIG_MTD_MIRAGE) += mirage-flash.o include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c ++++ b/drivers/mtd/maps/mirage-flash.c @@ -0,0 +1,194 @@ +/* + * Flash memory access on AMD Mirage board. @@ -16720,10 +16390,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c +MODULE_AUTHOR("Embedded Edge"); +MODULE_DESCRIPTION("Mirage mtd map driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c ++++ b/drivers/mtd/maps/mtx-1.c @@ -0,0 +1,181 @@ +/* + * Flash memory access on 4G Systems MTX-1 board @@ -16906,10 +16574,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c +MODULE_AUTHOR("Pete Popov"); +MODULE_DESCRIPTION("MTX-1 CFI map driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c ++++ b/drivers/mtd/maps/pb1550-flash.c @@ -0,0 +1,270 @@ +/* + * Flash memory access on Alchemy Pb1550 board @@ -17181,10 +16847,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c +MODULE_AUTHOR("Embedded Edge, LLC"); +MODULE_DESCRIPTION("Pb1550 mtd map driver"); +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 -+++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c +--- a/drivers/mtd/maps/pb1xxx-flash.c ++++ b/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 */ @@ -17220,10 +16884,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c #else #error Unsupported board #endif -Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c ++++ b/drivers/mtd/maps/xxs1500.c @@ -0,0 +1,186 @@ +/* + * Flash memory access on MyCable XXS1500 board @@ -17411,10 +17073,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c +MODULE_AUTHOR("Pete Popov"); +MODULE_DESCRIPTION("XXS1500 CFI map driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/net/defxx.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/defxx.c -+++ linux-2.4.35.4/drivers/net/defxx.c +--- a/drivers/net/defxx.c ++++ b/drivers/net/defxx.c @@ -10,24 +10,18 @@ * * Abstract: @@ -18255,10 +17915,8 @@ Index: linux-2.4.35.4/drivers/net/defxx.c MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/net/defxx.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/defxx.h -+++ linux-2.4.35.4/drivers/net/defxx.h +--- a/drivers/net/defxx.h ++++ b/drivers/net/defxx.h @@ -12,17 +12,11 @@ * Contains all definitions specified by port specification and required * by the defxx.c driver. @@ -18347,10 +18005,8 @@ Index: linux-2.4.35.4/drivers/net/defxx.h struct pci_dev * pci_dev; u32 full_duplex_enb; /* FDDI Full Duplex enable (1 == on, 2 == off) */ 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 -+++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c +--- a/drivers/net/hamradio/hdlcdrv.c ++++ b/drivers/net/hamradio/hdlcdrv.c @@ -587,6 +587,8 @@ static int hdlcdrv_close(struct net_devi return -EINVAL; s = (struct hdlcdrv_state *)dev->priv; @@ -18360,10 +18016,8 @@ Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c if (s->ops && s->ops->close) i = s->ops->close(dev); 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 -+++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c +--- a/drivers/net/irda/au1k_ir.c ++++ b/drivers/net/irda/au1k_ir.c @@ -81,10 +81,6 @@ static char version[] __devinitdata = #define RUN_AT(x) (jiffies + (x)) @@ -18375,10 +18029,8 @@ Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c static spinlock_t ir_lock = SPIN_LOCK_UNLOCKED; /* -Index: linux-2.4.35.4/drivers/net/sgiseeq.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/sgiseeq.c -+++ linux-2.4.35.4/drivers/net/sgiseeq.c +--- a/drivers/net/sgiseeq.c ++++ b/drivers/net/sgiseeq.c @@ -24,16 +24,16 @@ #include <asm/io.h> #include <asm/system.h> @@ -18529,10 +18181,8 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c +MODULE_DESCRIPTION("SGI Seeq 8003 driver"); +MODULE_AUTHOR("David S. Miller"); MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/drivers/pci/pci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/pci/pci.c -+++ linux-2.4.35.4/drivers/pci/pci.c +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c @@ -1281,11 +1281,17 @@ static int __devinit pci_scan_bridge(str { unsigned int buses; @@ -18559,10 +18209,8 @@ Index: linux-2.4.35.4/drivers/pci/pci.c sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number); return max; } -Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c -+++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c +--- a/drivers/pcmcia/au1000_db1x00.c ++++ b/drivers/pcmcia/au1000_db1x00.c @@ -1,6 +1,6 @@ /* * @@ -18635,10 +18283,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c return 0; } -Index: linux-2.4.35.4/drivers/pcmcia/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/Config.in -+++ linux-2.4.35.4/drivers/pcmcia/Config.in +--- a/drivers/pcmcia/Config.in ++++ b/drivers/pcmcia/Config.in @@ -30,16 +30,14 @@ if [ "$CONFIG_PCMCIA" != "n" ]; then dep_tristate ' M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA fi @@ -18660,10 +18306,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/Config.in if [ "$CONFIG_VRC4173" = "y" -o "$CONFIG_VRC4173" = "m" ]; then dep_tristate ' NEC VRC4173 CARDU support' CONFIG_PCMCIA_VRC4173 $CONFIG_PCMCIA fi -Index: linux-2.4.35.4/drivers/pcmcia/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/Makefile -+++ linux-2.4.35.4/drivers/pcmcia/Makefile +--- a/drivers/pcmcia/Makefile ++++ b/drivers/pcmcia/Makefile @@ -61,9 +61,18 @@ endif obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o @@ -18694,10 +18338,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/Makefile obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c ++++ b/drivers/pcmcia/vrc4171_card.c @@ -0,0 +1,886 @@ +/* + * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services. @@ -19585,10 +19227,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c + +module_init(vrc4171_card_init); +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 -+++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h +--- a/drivers/scsi/NCR53C9x.h ++++ b/drivers/scsi/NCR53C9x.h @@ -144,12 +144,7 @@ #ifndef MULTIPLE_PAD_SIZES @@ -19603,10 +19243,8 @@ Index: linux-2.4.35.4/drivers/scsi/NCR53C9x.h #define esp_read(__reg) (__reg) 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 -+++ linux-2.4.35.4/drivers/sound/au1550_i2s.c +--- a/drivers/sound/au1550_i2s.c ++++ b/drivers/sound/au1550_i2s.c @@ -41,6 +41,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * @@ -20478,10 +20116,8 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c err_dev1: au1xxx_dbdma_chan_free(s->dma_adc.dmanr); err_dma2: -Index: linux-2.4.35.4/drivers/sound/au1550_psc.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c -+++ linux-2.4.35.4/drivers/sound/au1550_psc.c +--- a/drivers/sound/au1550_psc.c ++++ b/drivers/sound/au1550_psc.c @@ -30,6 +30,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * @@ -20640,10 +20276,8 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c return 0; err_dev3: -Index: linux-2.4.35.4/drivers/sound/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/sound/Config.in -+++ linux-2.4.35.4/drivers/sound/Config.in +--- a/drivers/sound/Config.in ++++ b/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 @@ -20664,10 +20298,8 @@ Index: linux-2.4.35.4/drivers/sound/Config.in fi 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 -+++ linux-2.4.35.4/drivers/tc/lk201.c +--- a/drivers/tc/lk201.c ++++ b/drivers/tc/lk201.c @@ -5,7 +5,7 @@ * for more details. * @@ -20945,10 +20577,8 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c + if (!register_dec_serial_hook(keyb_line, &lk201_hook)) + unregister_dec_serial_hook(keyb_line); } -Index: linux-2.4.35.4/drivers/tc/zs.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/tc/zs.c -+++ linux-2.4.35.4/drivers/tc/zs.c +--- a/drivers/tc/zs.c ++++ b/drivers/tc/zs.c @@ -68,6 +68,8 @@ #include <asm/bitops.h> #include <asm/uaccess.h> @@ -21337,10 +20967,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 -+++ linux-2.4.35.4/drivers/tc/zs.h +--- a/drivers/tc/zs.h ++++ b/drivers/tc/zs.h @@ -1,14 +1,18 @@ /* - * macserial.h: Definitions for the Macintosh Z8530 serial driver. @@ -21449,10 +21077,8 @@ Index: linux-2.4.35.4/drivers/tc/zs.h unsigned char *xmit_buf; int xmit_head; int xmit_tail; -Index: linux-2.4.35.4/drivers/video/au1200fb.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/video/au1200fb.c ++++ b/drivers/video/au1200fb.c @@ -0,0 +1,1564 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -23018,10 +22644,8 @@ Index: linux-2.4.35.4/drivers/video/au1200fb.c +#endif /* MODULE */ + + -Index: linux-2.4.35.4/drivers/video/au1200fb.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/video/au1200fb.h ++++ b/drivers/video/au1200fb.h @@ -0,0 +1,288 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -23311,10 +22935,8 @@ 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 -+++ linux-2.4.35.4/drivers/video/Config.in +--- a/drivers/video/Config.in ++++ b/drivers/video/Config.in @@ -87,8 +87,8 @@ if [ "$CONFIG_FB" = "y" ]; then if [ "$CONFIG_HP300" = "y" ]; then define_bool CONFIG_FB_HP300 y @@ -23354,10 +22976,8 @@ Index: linux-2.4.35.4/drivers/video/Config.in fi fi fi -Index: linux-2.4.35.4/drivers/video/fbmem.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/video/fbmem.c -+++ linux-2.4.35.4/drivers/video/fbmem.c +--- a/drivers/video/fbmem.c ++++ b/drivers/video/fbmem.c @@ -139,6 +139,8 @@ extern int e1356fb_init(void); extern int e1356fb_setup(char*); extern int au1100fb_init(void); @@ -23377,10 +22997,8 @@ Index: linux-2.4.35.4/drivers/video/fbmem.c #ifdef CONFIG_FB_IT8181 { "it8181fb", it8181fb_init, it8181fb_setup }, #endif -Index: linux-2.4.35.4/drivers/video/ims332.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/video/ims332.h ++++ b/drivers/video/ims332.h @@ -0,0 +1,275 @@ +/* + * linux/drivers/video/ims332.h @@ -23657,10 +23275,8 @@ Index: linux-2.4.35.4/drivers/video/ims332.h + IMS332_CTRL_A_BOOT_ENABLE_VTG); + printk("\n"); +} -Index: linux-2.4.35.4/drivers/video/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/video/Makefile -+++ linux-2.4.35.4/drivers/video/Makefile +--- a/drivers/video/Makefile ++++ b/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 @@ -23669,9 +23285,7 @@ Index: linux-2.4.35.4/drivers/video/Makefile obj-$(CONFIG_FB_IT8181) += it8181fb.o fbgen.o 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 +--- a/drivers/video/maxinefb.h +++ /dev/null @@ -1,38 +0,0 @@ -/* @@ -23712,10 +23326,8 @@ Index: linux-2.4.35.4/drivers/video/maxinefb.h -#define IMS332_REG_COLOR_PALETTE 0x100 /* color palette, 256 entries */ -#define IMS332_REG_CURSOR_COLOR_PALETTE 0x0a1 /* cursor color palette, */ - /* 3 entries */ -Index: linux-2.4.35.4/drivers/video/newport_con.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/video/newport_con.c -+++ linux-2.4.35.4/drivers/video/newport_con.c +--- a/drivers/video/newport_con.c ++++ b/drivers/video/newport_con.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -23949,10 +23561,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 -+++ linux-2.4.35.4/drivers/video/tgafb.c +--- a/drivers/video/tgafb.c ++++ b/drivers/video/tgafb.c @@ -45,6 +45,15 @@ #include <linux/console.h> #include <asm/io.h> @@ -24129,10 +23739,8 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c return 0; } -Index: linux-2.4.35.4/drivers/video/tgafb.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/video/tgafb.h -+++ linux-2.4.35.4/drivers/video/tgafb.h +--- a/drivers/video/tgafb.h ++++ b/drivers/video/tgafb.h @@ -36,6 +36,7 @@ #define TGA_RASTEROP_REG 0x0034 #define TGA_PIXELSHIFT_REG 0x0038 @@ -24141,10 +23749,8 @@ Index: linux-2.4.35.4/drivers/video/tgafb.h #define TGA_PIXELMASK_REG 0x005c #define TGA_CURSOR_BASE_REG 0x0060 #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 -+++ linux-2.4.35.4/fs/binfmt_elf.c +--- a/fs/binfmt_elf.c ++++ b/fs/binfmt_elf.c @@ -665,6 +665,9 @@ static int load_elf_binary(struct linux_ bprm->argc++; } @@ -24167,10 +23773,8 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c elf.e_ehsize = sizeof(elf); elf.e_phentsize = sizeof(struct elf_phdr); 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 -+++ linux-2.4.35.4/fs/partitions/sgi.c +--- a/fs/partitions/sgi.c ++++ b/fs/partitions/sgi.c @@ -17,6 +17,11 @@ #include "check.h" #include "sgi.h" @@ -24194,10 +23798,8 @@ Index: linux-2.4.35.4/fs/partitions/sgi.c current_minor++; } printk("\n"); -Index: linux-2.4.35.4/fs/proc/array.c -=================================================================== ---- linux-2.4.35.4.orig/fs/proc/array.c -+++ linux-2.4.35.4/fs/proc/array.c +--- a/fs/proc/array.c ++++ b/fs/proc/array.c @@ -368,15 +368,15 @@ int proc_pid_stat(struct task_struct *ta task->cmin_flt, task->maj_flt, @@ -24238,10 +23840,8 @@ Index: linux-2.4.35.4/fs/proc/array.c return len; } -Index: linux-2.4.35.4/fs/proc/proc_misc.c -=================================================================== ---- linux-2.4.35.4.orig/fs/proc/proc_misc.c -+++ linux-2.4.35.4/fs/proc/proc_misc.c +--- a/fs/proc/proc_misc.c ++++ b/fs/proc/proc_misc.c @@ -308,16 +308,16 @@ static int kstat_read_proc(char *page, c { int i, len = 0; @@ -24278,10 +23878,8 @@ Index: linux-2.4.35.4/fs/proc/proc_misc.c + kstat.per_cpu_nice[cpu_logical_map(i)] \ + kstat.per_cpu_system[cpu_logical_map(i)])); 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 -+++ linux-2.4.35.4/include/asm-alpha/param.h +--- a/include/asm-alpha/param.h ++++ b/include/asm-alpha/param.h @@ -13,6 +13,9 @@ # else # define HZ 1200 @@ -24292,10 +23890,8 @@ Index: linux-2.4.35.4/include/asm-alpha/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-i386/param.h +--- a/include/asm-i386/param.h ++++ b/include/asm-i386/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -24306,10 +23902,8 @@ Index: linux-2.4.35.4/include/asm-i386/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-ia64/param.h +--- a/include/asm-ia64/param.h ++++ b/include/asm-ia64/param.h @@ -7,9 +7,15 @@ * Based on <asm-i386/param.h>. * @@ -24327,10 +23921,8 @@ Index: linux-2.4.35.4/include/asm-ia64/param.h #define EXEC_PAGESIZE 65536 #ifndef NGROUPS -Index: linux-2.4.35.4/include/asm-m68k/param.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-m68k/param.h -+++ linux-2.4.35.4/include/asm-m68k/param.h +--- a/include/asm-m68k/param.h ++++ b/include/asm-m68k/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -24341,10 +23933,8 @@ Index: linux-2.4.35.4/include/asm-m68k/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h +--- a/include/asm-mips/au1000_gpio.h ++++ b/include/asm-mips/au1000_gpio.h @@ -30,6 +30,13 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -24460,10 +24050,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000_gpio.h #endif #endif -Index: linux-2.4.35.4/include/asm-mips/au1000.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000.h -+++ linux-2.4.35.4/include/asm-mips/au1000.h +--- a/include/asm-mips/au1000.h ++++ b/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 @@ -25131,10 +24719,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h + +#endif + -Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h -+++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h +--- a/include/asm-mips/au1000_pcmcia.h ++++ b/include/asm-mips/au1000_pcmcia.h @@ -38,16 +38,41 @@ #define AU1X_SOCK0_PHYS_MEM 0xF80000000 @@ -25186,10 +24772,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h #endif 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 -+++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h +--- a/include/asm-mips/au1100_mmc.h ++++ b/include/asm-mips/au1100_mmc.h @@ -39,16 +39,22 @@ #define __ASM_AU1100_MMC_H @@ -25231,10 +24815,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1100_mmc.h + #endif /* __ASM_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 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h +--- a/include/asm-mips/au1xxx_dbdma.h ++++ b/include/asm-mips/au1xxx_dbdma.h @@ -43,7 +43,7 @@ #define DDMA_GLOBAL_BASE 0xb4003000 #define DDMA_CHANNEL_BASE 0xb4002000 @@ -25387,10 +24969,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h + #endif /* _LANGUAGE_ASSEMBLY */ #endif /* _AU1000_DBDMA_H_ */ -Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h ++++ b/include/asm-mips/au1xxx_gpio.h @@ -0,0 +1,22 @@ + + @@ -25414,10 +24994,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h +} AU1X00_GPIO2; + +#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 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h +--- a/include/asm-mips/au1xxx_psc.h ++++ b/include/asm-mips/au1xxx_psc.h @@ -41,6 +41,11 @@ #define PSC3_BASE_ADDR 0xb0d00000 #endif @@ -25439,10 +25017,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h #define PSC_I2SCFG_WI (1 << 15) #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 -+++ linux-2.4.35.4/include/asm-mips/bootinfo.h +--- a/include/asm-mips/bootinfo.h ++++ b/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 */ @@ -25453,10 +25029,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 -+++ linux-2.4.35.4/include/asm-mips/db1200.h ++++ b/include/asm-mips/db1200.h @@ -0,0 +1,214 @@ +/* + * AMD Alchemy DB1200 Referrence Board @@ -25672,10 +25246,8 @@ Index: linux-2.4.35.4/include/asm-mips/db1200.h + +#endif /* __ASM_DB1200_H */ + -Index: linux-2.4.35.4/include/asm-mips/db1x00.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/db1x00.h -+++ linux-2.4.35.4/include/asm-mips/db1x00.h +--- a/include/asm-mips/db1x00.h ++++ b/include/asm-mips/db1x00.h @@ -1,5 +1,5 @@ /* - * AMD Alchemy DB1x00 Reference Boards @@ -25781,10 +25353,8 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h #endif /* __ASM_DB1X00_H */ -Index: linux-2.4.35.4/include/asm-mips/elf.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/elf.h -+++ linux-2.4.35.4/include/asm-mips/elf.h +--- a/include/asm-mips/elf.h ++++ b/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 @@ -25799,10 +25369,8 @@ Index: linux-2.4.35.4/include/asm-mips/elf.h /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This could be done in userspace, -Index: linux-2.4.35.4/include/asm-mips/ficmmp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/asm-mips/ficmmp.h ++++ b/include/asm-mips/ficmmp.h @@ -0,0 +1,156 @@ +/* + * FIC MMP @@ -25960,10 +25528,8 @@ Index: linux-2.4.35.4/include/asm-mips/ficmmp.h + +#endif /* __ASM_FICMMP_H */ + -Index: linux-2.4.35.4/include/asm-mips/hazards.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/hazards.h -+++ linux-2.4.35.4/include/asm-mips/hazards.h +--- a/include/asm-mips/hazards.h ++++ b/include/asm-mips/hazards.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -26180,10 +25746,8 @@ Index: linux-2.4.35.4/include/asm-mips/hazards.h +#endif /* __ASSEMBLY__ */ + #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 -+++ linux-2.4.35.4/include/asm-mips/ide.h +--- a/include/asm-mips/ide.h ++++ b/include/asm-mips/ide.h @@ -32,12 +32,12 @@ struct ide_ops { extern struct ide_ops *ide_ops; @@ -26299,10 +25863,8 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h #endif /* __KERNEL__ */ -Index: linux-2.4.35.4/include/asm-mips/io.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/io.h -+++ linux-2.4.35.4/include/asm-mips/io.h +--- a/include/asm-mips/io.h ++++ b/include/asm-mips/io.h @@ -392,7 +392,8 @@ static inline unsigned int inl_p(unsigne return __ioswab32(__val); } @@ -26333,10 +25895,8 @@ Index: linux-2.4.35.4/include/asm-mips/io.h { while (count--) { 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 -+++ linux-2.4.35.4/include/asm-mips/mipsregs.h +--- a/include/asm-mips/mipsregs.h ++++ b/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) @@ -26399,10 +25959,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 -+++ linux-2.4.35.4/include/asm-mips/mmu_context.h +--- a/include/asm-mips/mmu_context.h ++++ b/include/asm-mips/mmu_context.h @@ -27,7 +27,7 @@ #define TLBMISS_HANDLER_SETUP_PGD(pgd) \ pgd_current[smp_processor_id()] = (unsigned long)(pgd) @@ -26412,10 +25970,8 @@ Index: linux-2.4.35.4/include/asm-mips/mmu_context.h TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) extern unsigned long pgd_current[]; -Index: linux-2.4.35.4/include/asm-mips/pb1100.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/pb1100.h -+++ linux-2.4.35.4/include/asm-mips/pb1100.h +--- a/include/asm-mips/pb1100.h ++++ b/include/asm-mips/pb1100.h @@ -1,5 +1,5 @@ /* - * Alchemy Semi PB1100 Referrence Board @@ -26582,10 +26138,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1100.h #endif /* __ASM_PB1100_H */ + -Index: linux-2.4.35.4/include/asm-mips/pb1200.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/asm-mips/pb1200.h ++++ b/include/asm-mips/pb1200.h @@ -0,0 +1,244 @@ +/* + * AMD Alchemy PB1200 Referrence Board @@ -26831,10 +26385,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1200.h + +#endif /* __ASM_PB1200_H */ + -Index: linux-2.4.35.4/include/asm-mips/pb1550.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/pb1550.h -+++ linux-2.4.35.4/include/asm-mips/pb1550.h +--- a/include/asm-mips/pb1550.h ++++ b/include/asm-mips/pb1550.h @@ -30,13 +30,11 @@ #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX @@ -26878,10 +26430,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1550.h +#define AU1XXX_SMC91111_IRQ AU1000_GPIO_3 #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 -+++ linux-2.4.35.4/include/asm-mips/reg.h +--- a/include/asm-mips/reg.h ++++ b/include/asm-mips/reg.h @@ -45,6 +45,9 @@ /* * k0/k1 unsaved @@ -26900,10 +26450,8 @@ Index: linux-2.4.35.4/include/asm-mips/reg.h #define EF_SIZE 180 /* size in bytes */ -Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h -+++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h +--- a/include/asm-mips/sgi/hpc3.h ++++ b/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 */ @@ -26969,10 +26517,8 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h * It is possible to have two HPC3's within the address space on * one machine, though only having one is more likely on an Indy. */ -Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h -+++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h +--- a/include/asm-mips/tx4927/tx4927.h ++++ b/include/asm-mips/tx4927/tx4927.h @@ -88,8 +88,8 @@ @@ -27041,10 +26587,8 @@ Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h #define TX4927_ACLC_ACSEMAPH 0xf720 #define TX4927_ACLC_ACGPIDAT 0xf740 #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 -+++ linux-2.4.35.4/include/asm-mips/unistd.h +--- a/include/asm-mips/unistd.h ++++ b/include/asm-mips/unistd.h @@ -760,7 +760,7 @@ type name(void) \ if (__a3 == 0) \ return (type) __v0; \ @@ -27126,10 +26670,8 @@ 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 -+++ linux-2.4.35.4/include/asm-mips64/checksum.h +--- a/include/asm-mips64/checksum.h ++++ b/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" @@ -27139,10 +26681,8 @@ Index: linux-2.4.35.4/include/asm-mips64/checksum.h ".set\tat" : "=&r" (sum) : "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 -+++ linux-2.4.35.4/include/asm-mips64/elf.h +--- a/include/asm-mips64/elf.h ++++ b/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 @@ -27157,10 +26697,8 @@ Index: linux-2.4.35.4/include/asm-mips64/elf.h /* This yields a mask that user programs can use to figure out what 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 -+++ linux-2.4.35.4/include/asm-mips64/hazards.h +--- a/include/asm-mips64/hazards.h ++++ b/include/asm-mips64/hazards.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -27378,10 +26916,8 @@ Index: linux-2.4.35.4/include/asm-mips64/hazards.h +#endif /* __ASSEMBLY__ */ + #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 -+++ linux-2.4.35.4/include/asm-mips64/ide.h +--- a/include/asm-mips64/ide.h ++++ b/include/asm-mips64/ide.h @@ -32,12 +32,12 @@ struct ide_ops { extern struct ide_ops *ide_ops; @@ -27497,10 +27033,8 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h #endif /* __KERNEL__ */ -Index: linux-2.4.35.4/include/asm-mips64/io.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/io.h -+++ linux-2.4.35.4/include/asm-mips64/io.h +--- a/include/asm-mips64/io.h ++++ b/include/asm-mips64/io.h @@ -414,7 +414,8 @@ static inline unsigned int inl_p(unsigne return __ioswab32(__val); } @@ -27531,10 +27065,8 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h { while (count--) { 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 -+++ linux-2.4.35.4/include/asm-mips64/mipsregs.h +--- a/include/asm-mips64/mipsregs.h ++++ b/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) @@ -27597,10 +27129,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 -+++ linux-2.4.35.4/include/asm-mips64/reg.h +--- a/include/asm-mips64/reg.h ++++ b/include/asm-mips64/reg.h @@ -46,6 +46,9 @@ /* * k0/k1 unsaved @@ -27611,10 +27141,8 @@ Index: linux-2.4.35.4/include/asm-mips64/reg.h #define EF_REG28 28 #define EF_REG29 29 #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 -+++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h +--- a/include/asm-mips64/sgi/hpc3.h ++++ b/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 */ @@ -27680,10 +27208,8 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h * It is possible to have two HPC3's within the address space on * one machine, though only having one is more likely on an Indy. */ -Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h -+++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h +--- a/include/asm-mips64/sn/nmi.h ++++ b/include/asm-mips64/sn/nmi.h @@ -8,7 +8,7 @@ #ifndef __ASM_SN_NMI_H #define __ASM_SN_NMI_H @@ -27693,10 +27219,8 @@ Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h #include <asm/sn/addrs.h> -Index: linux-2.4.35.4/include/asm-mips64/unistd.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/unistd.h -+++ linux-2.4.35.4/include/asm-mips64/unistd.h +--- a/include/asm-mips64/unistd.h ++++ b/include/asm-mips64/unistd.h @@ -760,7 +760,7 @@ type name(void) \ if (__a3 == 0) \ return (type) __v0; \ @@ -27778,10 +27302,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 -+++ linux-2.4.35.4/include/asm-ppc/param.h +--- a/include/asm-ppc/param.h ++++ b/include/asm-ppc/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -27792,10 +27314,8 @@ Index: linux-2.4.35.4/include/asm-ppc/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-s390/param.h +--- a/include/asm-s390/param.h ++++ b/include/asm-s390/param.h @@ -11,6 +11,9 @@ #ifndef HZ @@ -27806,10 +27326,8 @@ Index: linux-2.4.35.4/include/asm-s390/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-sh/param.h +--- a/include/asm-sh/param.h ++++ b/include/asm-sh/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -27820,10 +27338,8 @@ Index: linux-2.4.35.4/include/asm-sh/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-sparc/param.h +--- a/include/asm-sparc/param.h ++++ b/include/asm-sparc/param.h @@ -4,6 +4,9 @@ #ifndef HZ @@ -27834,10 +27350,8 @@ Index: linux-2.4.35.4/include/asm-sparc/param.h #endif #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 -+++ linux-2.4.35.4/include/asm-sparc64/param.h +--- a/include/asm-sparc64/param.h ++++ b/include/asm-sparc64/param.h @@ -4,6 +4,9 @@ #ifndef HZ @@ -27848,10 +27362,8 @@ Index: linux-2.4.35.4/include/asm-sparc64/param.h #endif #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 -+++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h ++++ b/include/linux/i2c-algo-au1550.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com> @@ -27884,10 +27396,8 @@ Index: linux-2.4.35.4/include/linux/i2c-algo-au1550.h +int i2c_au1550_del_bus(struct i2c_adapter *); + +#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 -+++ linux-2.4.35.4/include/linux/i2c-id.h +--- a/include/linux/i2c-id.h ++++ b/include/linux/i2c-id.h @@ -155,6 +155,8 @@ #define I2C_ALGO_SIBYTE 0x150000 /* Broadcom SiByte SOCs */ #define I2C_ALGO_SGI 0x160000 /* SGI algorithm */ @@ -27907,10 +27417,8 @@ Index: linux-2.4.35.4/include/linux/i2c-id.h /* --- SMBus only adapters */ #define I2C_HW_SMBUS_PIIX4 0x00 #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 -+++ linux-2.4.35.4/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/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); @@ -27922,10 +27430,8 @@ Index: linux-2.4.35.4/include/linux/sched.h extern void proc_caches_init(void); extern void flush_signals(struct task_struct *); 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 -+++ linux-2.4.35.4/include/linux/serial.h +--- a/include/linux/serial.h ++++ b/include/linux/serial.h @@ -75,7 +75,8 @@ struct serial_struct { #define PORT_16654 11 #define PORT_16850 12 @@ -27936,10 +27442,8 @@ Index: linux-2.4.35.4/include/linux/serial.h #define SERIAL_IO_PORT 0 #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 -+++ linux-2.4.35.4/include/linux/swap.h +--- a/include/linux/swap.h ++++ b/include/linux/swap.h @@ -1,6 +1,12 @@ #ifndef _LINUX_SWAP_H #define _LINUX_SWAP_H @@ -27971,10 +27475,8 @@ Index: linux-2.4.35.4/include/linux/swap.h /* * Max bad pages in the new format.. */ -Index: linux-2.4.35.4/include/video/newport.h -=================================================================== ---- linux-2.4.35.4.orig/include/video/newport.h -+++ linux-2.4.35.4/include/video/newport.h +--- a/include/video/newport.h ++++ b/include/video/newport.h @@ -291,8 +291,6 @@ struct newport_regs { unsigned int _unused2[0x1ef]; struct newport_cregs cgo; @@ -28042,10 +27544,8 @@ Index: linux-2.4.35.4/include/video/newport.h while ((rex->set.dcbdata0.bybytes.b3 & 3) != XM9_FIFO_EMPTY) ; -Index: linux-2.4.35.4/init/main.c -=================================================================== ---- linux-2.4.35.4.orig/init/main.c -+++ linux-2.4.35.4/init/main.c +--- a/init/main.c ++++ b/init/main.c @@ -296,7 +296,6 @@ static void __init parse_options(char *l @@ -28054,10 +27554,8 @@ Index: linux-2.4.35.4/init/main.c unsigned long wait_init_idle; -Index: linux-2.4.35.4/kernel/exit.c -=================================================================== ---- linux-2.4.35.4.orig/kernel/exit.c -+++ linux-2.4.35.4/kernel/exit.c +--- a/kernel/exit.c ++++ b/kernel/exit.c @@ -26,7 +26,7 @@ extern struct task_struct *child_reaper; int getrusage(struct task_struct *, int, struct rusage *); @@ -28067,10 +27565,8 @@ Index: linux-2.4.35.4/kernel/exit.c { if (p != current) { #ifdef CONFIG_SMP -Index: linux-2.4.35.4/kernel/signal.c -=================================================================== ---- linux-2.4.35.4.orig/kernel/signal.c -+++ linux-2.4.35.4/kernel/signal.c +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/sched.h> @@ -28140,10 +27636,8 @@ Index: linux-2.4.35.4/kernel/signal.c status = tsk->exit_code & 0x7f; why = SI_KERNEL; /* shouldn't happen */ -Index: linux-2.4.35.4/kernel/sys.c -=================================================================== ---- linux-2.4.35.4.orig/kernel/sys.c -+++ linux-2.4.35.4/kernel/sys.c +--- a/kernel/sys.c ++++ b/kernel/sys.c @@ -801,16 +801,23 @@ asmlinkage long sys_setfsgid(gid_t gid) asmlinkage long sys_times(struct tms * tbuf) @@ -28171,10 +27665,8 @@ 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 -+++ linux-2.4.35.4/lib/Makefile +--- a/lib/Makefile ++++ b/lib/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_CRC32) += crc32.o subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate @@ -28183,10 +27675,8 @@ Index: linux-2.4.35.4/lib/Makefile include $(TOPDIR)/drivers/net/Makefile.lib include $(TOPDIR)/drivers/usb/Makefile.lib include $(TOPDIR)/drivers/bluetooth/Makefile.lib -Index: linux-2.4.35.4/Makefile -=================================================================== ---- linux-2.4.35.4.orig/Makefile -+++ linux-2.4.35.4/Makefile +--- a/Makefile ++++ b/Makefile @@ -469,10 +469,11 @@ mrproper: clean archmrproper $(MAKE) -C Documentation/DocBook mrproper diff --git a/target/linux/generic-2.4/patches/001-squashfs.patch b/target/linux/generic-2.4/patches/001-squashfs.patch index 4ebfb7575e..2cc3b85b3f 100644 --- a/target/linux/generic-2.4/patches/001-squashfs.patch +++ b/target/linux/generic-2.4/patches/001-squashfs.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/fs/Config.in -=================================================================== ---- linux-2.4.35.4.orig/fs/Config.in -+++ linux-2.4.35.4/fs/Config.in +--- a/fs/Config.in ++++ b/fs/Config.in @@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 fi @@ -17,10 +15,8 @@ Index: linux-2.4.35.4/fs/Config.in bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS define_bool CONFIG_RAMFS y -Index: linux-2.4.35.4/fs/Makefile -=================================================================== ---- linux-2.4.35.4.orig/fs/Makefile -+++ linux-2.4.35.4/fs/Makefile +--- a/fs/Makefile ++++ b/fs/Makefile @@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS) += reiserfs subdir-$(CONFIG_DEVPTS_FS) += devpts subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs @@ -29,10 +25,8 @@ Index: linux-2.4.35.4/fs/Makefile subdir-$(CONFIG_JFS_FS) += jfs subdir-$(CONFIG_XFS_FS) += xfs -Index: linux-2.4.35.4/fs/squashfs/inode.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c @@ -0,0 +1,2028 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2062,10 +2056,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem"); +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>"); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/fs/squashfs/Makefile -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/squashfs/Makefile ++++ b/fs/squashfs/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the linux squashfs routines. @@ -2078,10 +2070,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile +obj-m := $(O_TARGET) + +include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c ++++ b/fs/squashfs/squashfs2_0.c @@ -0,0 +1,751 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2834,10 +2824,8 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c + + return 1; +} -Index: linux-2.4.35.4/fs/squashfs/squashfs.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/squashfs/squashfs.h ++++ b/fs/squashfs/squashfs.h @@ -0,0 +1,85 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2924,10 +2912,8 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs.h + return 0; +} +#endif -Index: linux-2.4.35.4/include/linux/fs.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/fs.h -+++ linux-2.4.35.4/include/linux/fs.h +--- a/include/linux/fs.h ++++ b/include/linux/fs.h @@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he #include <linux/usbdev_fs_i.h> #include <linux/jffs2_fs_i.h> @@ -2960,10 +2946,8 @@ Index: linux-2.4.35.4/include/linux/fs.h void *generic_sbp; } u; /* -Index: linux-2.4.35.4/include/linux/squashfs_fs.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/squashfs_fs.h ++++ b/include/linux/squashfs_fs.h @@ -0,0 +1,915 @@ +#ifndef SQUASHFS_FS +#define SQUASHFS_FS @@ -3880,10 +3864,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs.h + +#endif +#endif -Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/squashfs_fs_i.h ++++ b/include/linux/squashfs_fs_i.h @@ -0,0 +1,44 @@ +#ifndef SQUASHFS_FS_I +#define SQUASHFS_FS_I @@ -3929,10 +3911,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h + } u; +}; +#endif -Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h ++++ b/include/linux/squashfs_fs_sb.h @@ -0,0 +1,74 @@ +#ifndef SQUASHFS_FS_SB +#define SQUASHFS_FS_SB @@ -4008,10 +3988,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h + int (*read_fragment_index_table)(struct super_block *s); +}; +#endif -Index: linux-2.4.35.4/init/do_mounts.c -=================================================================== ---- linux-2.4.35.4.orig/init/do_mounts.c -+++ linux-2.4.35.4/init/do_mounts.c +--- a/init/do_mounts.c ++++ b/init/do_mounts.c @@ -15,6 +15,7 @@ #include <linux/minix_fs.h> #include <linux/ext2_fs.h> @@ -4060,10 +4038,8 @@ Index: linux-2.4.35.4/init/do_mounts.c /* * Read block 1 to test for minix and ext2 superblock */ -Index: linux-2.4.35.4/lib/Config.in -=================================================================== ---- linux-2.4.35.4.orig/lib/Config.in -+++ linux-2.4.35.4/lib/Config.in +--- a/lib/Config.in ++++ b/lib/Config.in @@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32 # Do we need the compression support? # diff --git a/target/linux/generic-2.4/patches/002-squashfs_lzma.patch b/target/linux/generic-2.4/patches/002-squashfs_lzma.patch index 1509ea536e..9192493a2f 100644 --- a/target/linux/generic-2.4/patches/002-squashfs_lzma.patch +++ b/target/linux/generic-2.4/patches/002-squashfs_lzma.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/fs/squashfs/inode.c -=================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/inode.c -+++ linux-2.4.35.4/fs/squashfs/inode.c +--- a/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c @@ -4,6 +4,9 @@ * Copyright (c) 2002, 2003, 2004, 2005, 2006 * Phillip Lougher <phillip@lougher.org.uk> @@ -99,10 +97,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c unregister_filesystem(&squashfs_fs_type); } -Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c ++++ b/fs/squashfs/LzmaDecode.c @@ -0,0 +1,663 @@ +/* + LzmaDecode.c @@ -767,10 +763,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c + *outSizeProcessed = nowPos; + return LZMA_RESULT_OK; +} -Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h ++++ b/fs/squashfs/LzmaDecode.h @@ -0,0 +1,100 @@ +/* + LzmaDecode.h @@ -872,10 +866,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h + UInt32 *outSizeProcessed); + +#endif -Index: linux-2.4.35.4/fs/squashfs/Makefile -=================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/Makefile -+++ linux-2.4.35.4/fs/squashfs/Makefile +--- a/fs/squashfs/Makefile ++++ b/fs/squashfs/Makefile @@ -4,7 +4,7 @@ O_TARGET := squashfs.o diff --git a/target/linux/generic-2.4/patches/003-jffs2_compression.patch b/target/linux/generic-2.4/patches/003-jffs2_compression.patch index aa7ab8f2c1..368a0aa7b2 100644 --- a/target/linux/generic-2.4/patches/003-jffs2_compression.patch +++ b/target/linux/generic-2.4/patches/003-jffs2_compression.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -17580,6 +17580,32 @@ CONFIG_JFFS2_FS_DEBUG If reporting bugs, please try to have available a full dump of the messages at debug level 1 while the misbehaviour was occurring. @@ -35,10 +33,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help JFFS stats available in /proc filesystem CONFIG_JFFS_PROC_FS Enabling this option will cause statistics from mounted JFFS file systems -Index: linux-2.4.35.4/fs/Config.in -=================================================================== ---- linux-2.4.35.4.orig/fs/Config.in -+++ linux-2.4.35.4/fs/Config.in +--- a/fs/Config.in ++++ b/fs/Config.in @@ -50,6 +50,12 @@ dep_tristate 'Journalling Flash File Sys if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 @@ -52,20 +48,16 @@ Index: linux-2.4.35.4/fs/Config.in tristate 'Compressed ROM file system support' CONFIG_CRAMFS tristate 'Squashed file system support' CONFIG_SQUASHFS if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then -Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc ++++ b/fs/jffs2/Config.in.bbc.inc @@ -0,0 +1,5 @@ +dep_mbool ' ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS +dep_mbool ' LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS +dep_mbool ' LZARI compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZARI $CONFIG_JFFS2_FS +dep_mbool ' LZHD compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZHD $CONFIG_JFFS2_FS +dep_mbool ' LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS -Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc ++++ b/fs/jffs2/Configure.help.bbc.inc @@ -0,0 +1,25 @@ +ARMLIB compression support for BBC (EXPERIMENTAL) +CONFIG_JFFS2_BBC_ARMLIB @@ -92,10 +84,8 @@ Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc + This enables simple LempelZiv-Storer-Szymanski compression for BBC + (faster than LZHD, and, and has a not-so-good compression ratio, + was included just for testing) -Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc ++++ b/fs/jffs2/Kconfig.bbc.inc @@ -0,0 +1,40 @@ +config JFFS2_BBC_ARMLIB + bool "ARMLIB compression support for BBC (EXPERIMENTAL)" @@ -137,10 +127,8 @@ Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc + This enables simple LempelZiv-Storer-Szymanski compression for BBC + (faster than LZHD, and, and has a not-so-good compression ratio, + was included just for testing) -Index: linux-2.4.35.4/fs/jffs2/Makefile -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/Makefile -+++ linux-2.4.35.4/fs/jffs2/Makefile +--- a/fs/jffs2/Makefile ++++ b/fs/jffs2/Makefile @@ -10,9 +10,23 @@ # Note 2! The CFLAGS definitions are now in the main makefile... @@ -165,10 +153,8 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile read.o nodemgmt.o readinode.o super.o write.o scan.o gc.o \ symlink.o build.o erase.o background.o -Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc ++++ b/fs/jffs2/Makefile.bbc.inc @@ -0,0 +1,12 @@ +JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o + @@ -182,10 +168,8 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc + +JFFS2_BBC_MKFS_OBJS = jffs2_bbc_mkfs.o jffs2_bbc_framework.o jffs2_bbc_armlib_comp.o jffs2_bbc_lzo_comp.o\ + jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o -Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c -+++ linux-2.4.35.4/fs/jffs2/compr_zlib.c +--- a/fs/jffs2/compr_zlib.c ++++ b/fs/jffs2/compr_zlib.c @@ -85,7 +85,7 @@ void jffs2_zlib_exit(void) vfree(inflate_workspace); } @@ -224,10 +208,8 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c + jffs2_zlib_decompress(data_in,cpage_out,srclen,destlen); +} + -Index: linux-2.4.35.4/fs/jffs2/file.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/file.c -+++ linux-2.4.35.4/fs/jffs2/file.c +--- a/fs/jffs2/file.c ++++ b/fs/jffs2/file.c @@ -35,6 +35,7 @@ * */ @@ -244,10 +226,8 @@ Index: linux-2.4.35.4/fs/jffs2/file.c comprtype = jffs2_compress(page_address(pg)+ (file_ofs & (PAGE_CACHE_SIZE-1)), comprbuf, &datalen, &cdatalen); } if (comprtype == JFFS2_COMPR_NONE) { -Index: linux-2.4.35.4/fs/jffs2/gc.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/gc.c -+++ linux-2.4.35.4/fs/jffs2/gc.c +--- a/fs/jffs2/gc.c ++++ b/fs/jffs2/gc.c @@ -35,6 +35,7 @@ * */ @@ -264,10 +244,8 @@ Index: linux-2.4.35.4/fs/jffs2/gc.c comprtype = jffs2_compress(writebuf, comprbuf, &datalen, &cdatalen); } if (comprtype) { -Index: linux-2.4.35.4/fs/jffs2/hpatch -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/hpatch ++++ b/fs/jffs2/hpatch @@ -0,0 +1,191 @@ +#!/usr/bin/perl +# A patch-like utility @@ -460,10 +438,8 @@ Index: linux-2.4.35.4/fs/jffs2/hpatch +} +file_end(); +close(CMD); -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c ++++ b/fs/jffs2/jffs2_bbc_armlib_comp.c @@ -0,0 +1,2224 @@ +/* + * JFFS2-BBC: armlib compressor plugin @@ -2689,10 +2665,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c +} + +/*END OF ARMLIB*/ -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c ++++ b/fs/jffs2/jffs2_bbc_framework.c @@ -0,0 +1,1324 @@ +/* + * JFFS2-BBC: Compression Framework @@ -4018,10 +3992,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c +} + +#endif -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h ++++ b/fs/jffs2/jffs2_bbc_framework.h @@ -0,0 +1,202 @@ +/* + * JFFS2-BBC: Compression Framework - headers @@ -4225,10 +4197,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h +int jffs2_bbc_get_memory_counter(void); + +#endif -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c ++++ b/fs/jffs2/jffs2_bbc_fs.c @@ -0,0 +1,331 @@ +/* + * JFFS2-BBC: File System Extension for Linux Kernel @@ -4561,10 +4531,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c + jffs2_bbc_compressor_deinit(); + remove_proc_entry("jffs2_bbc", NULL); +} -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h ++++ b/fs/jffs2/jffs2_bbc_fs.h @@ -0,0 +1,30 @@ +/* + * JFFS2 BBC: File System Extension for Linux Kernel - headers @@ -4596,10 +4564,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h + +void jffs2_bbc_proc_init(void); +void jffs2_bbc_proc_deinit(void); -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c ++++ b/fs/jffs2/jffs2_bbc_lzari_comp.c @@ -0,0 +1,788 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -5389,10 +5355,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c +{ + jffs2_bbc_unregister_compressor (&jffs2_bbc_lzari); +} -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c ++++ b/fs/jffs2/jffs2_bbc_lzhd_comp.c @@ -0,0 +1,747 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -6141,10 +6105,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c +{ + jffs2_bbc_unregister_compressor (&jffs2_bbc_lzhd); +} -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c ++++ b/fs/jffs2/jffs2_bbc_lzo_comp.c @@ -0,0 +1,2435 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -8581,10 +8543,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c +{ + jffs2_bbc_unregister_compressor (&jffs2_bbc_lzo); +} -Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c ++++ b/fs/jffs2/jffs2_bbc_lzss_comp.c @@ -0,0 +1,385 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -8971,10 +8931,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c +{ + jffs2_bbc_unregister_compressor (&jffs2_bbc_lzss); +} -Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch ++++ b/fs/jffs2/linux-2.4.25.hpatch @@ -0,0 +1,97 @@ +FMakefile +=BBC insertion @@ -9073,10 +9031,8 @@ Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch +?{ ++ jffs2_bbc_proc_deinit(); /**BBC**/ ++ -Index: linux-2.4.35.4/fs/jffs2/read.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/read.c -+++ linux-2.4.35.4/fs/jffs2/read.c +--- a/fs/jffs2/read.c ++++ b/fs/jffs2/read.c @@ -35,6 +35,7 @@ * */ @@ -9093,10 +9049,8 @@ Index: linux-2.4.35.4/fs/jffs2/read.c ret = jffs2_decompress(ri->compr, readbuf, decomprbuf, ri->csize, ri->dsize); if (ret) { printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret); -Index: linux-2.4.35.4/fs/jffs2/super.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/super.c -+++ linux-2.4.35.4/fs/jffs2/super.c +--- a/fs/jffs2/super.c ++++ b/fs/jffs2/super.c @@ -35,6 +35,7 @@ * */ diff --git a/target/linux/generic-2.4/patches/004-exec_pagesize.patch b/target/linux/generic-2.4/patches/004-exec_pagesize.patch index 5711cc2861..2fbe7e372c 100644 --- a/target/linux/generic-2.4/patches/004-exec_pagesize.patch +++ b/target/linux/generic-2.4/patches/004-exec_pagesize.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/asm-mips/param.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/param.h -+++ linux-2.4.35.4/include/asm-mips/param.h +--- a/include/asm-mips/param.h ++++ b/include/asm-mips/param.h @@ -55,7 +55,7 @@ #endif /* defined(__KERNEL__) */ #endif /* defined(HZ) */ diff --git a/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch b/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch index 66a92e8b6b..36cce1e960 100644 --- a/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch +++ b/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/mtd/chips/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in -+++ linux-2.4.35.4/drivers/mtd/chips/Config.in +--- a/drivers/mtd/chips/Config.in ++++ b/drivers/mtd/chips/Config.in @@ -45,6 +45,7 @@ fi dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE @@ -10,10 +8,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Config.in dep_tristate ' Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD -Index: linux-2.4.35.4/drivers/mtd/chips/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile -+++ linux-2.4.35.4/drivers/mtd/chips/Makefile +--- a/drivers/mtd/chips/Makefile ++++ b/drivers/mtd/chips/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_MTD) += chipreg.o obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o obj-$(CONFIG_MTD_CFI) += cfi_probe.o @@ -22,10 +18,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Makefile obj-$(CONFIG_MTD_CFI_AMDSTD) += cfi_cmdset_0002.o obj-$(CONFIG_MTD_CFI_INTELEXT) += cfi_cmdset_0001.o obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o -Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c ++++ b/drivers/mtd/chips/cfi_cmdset_0701.c @@ -0,0 +1,855 @@ +/* + * Common Flash Interface support: @@ -882,10 +876,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c +module_init(cfi_sststd_init); +module_exit(cfi_sststd_exit); + -Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c -+++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c +--- a/drivers/mtd/chips/cfi_probe.c ++++ b/drivers/mtd/chips/cfi_probe.c @@ -67,8 +67,15 @@ static int cfi_probe_chip(struct map_inf cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL); @@ -904,10 +896,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c if (!cfi->numchips) { /* This is the first time we're called. Set up the CFI -Index: linux-2.4.35.4/drivers/mtd/chips/gen_probe.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c -+++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c +--- a/drivers/mtd/chips/gen_probe.c ++++ b/drivers/mtd/chips/gen_probe.c @@ -328,13 +328,18 @@ static struct mtd_info *check_cmd_set(st return cfi_cmdset_0001(map, primary); #endif diff --git a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch index 40f4504773..56cb2a493c 100644 --- a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch +++ b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c -+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c +--- a/drivers/mtd/chips/cfi_cmdset_0001.c ++++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -28,10 +28,18 @@ #include <linux/slab.h> #include <linux/delay.h> @@ -80,10 +78,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c kfree(cfi->cmdset_priv); kfree(cfi->cfiq); kfree(cfi); -Index: linux-2.4.35.4/include/linux/mtd/mtd.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/mtd/mtd.h -+++ linux-2.4.35.4/include/linux/mtd/mtd.h +--- a/include/linux/mtd/mtd.h ++++ b/include/linux/mtd/mtd.h @@ -10,6 +10,7 @@ #include <linux/version.h> #include <linux/types.h> diff --git a/target/linux/generic-2.4/patches/009-mtd_uaccess.patch b/target/linux/generic-2.4/patches/009-mtd_uaccess.patch index fd0a9a47ea..0c42f00b50 100644 --- a/target/linux/generic-2.4/patches/009-mtd_uaccess.patch +++ b/target/linux/generic-2.4/patches/009-mtd_uaccess.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/mtd/mtdchar.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c -+++ linux-2.4.35.4/drivers/mtd/mtdchar.c +--- a/drivers/mtd/mtdchar.c ++++ b/drivers/mtd/mtdchar.c @@ -558,13 +558,13 @@ static void mtd_notify_add(struct mtd_in sprintf(name, "%d", mtd->index); devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name, @@ -18,10 +16,8 @@ Index: linux-2.4.35.4/drivers/mtd/mtdchar.c &mtd_fops, NULL); } -Index: linux-2.4.35.4/drivers/mtd/mtdblock.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c -+++ linux-2.4.35.4/drivers/mtd/mtdblock.c +--- a/drivers/mtd/mtdblock.c ++++ b/drivers/mtd/mtdblock.c @@ -601,7 +601,7 @@ static void mtd_notify_add(struct mtd_in sprintf(name, "%d", mtd->index); devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name, diff --git a/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch index 312b1f6754..8ff8c4d0dd 100644 --- a/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch +++ b/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/fs/squashfs/Makefile -=================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/Makefile -+++ linux-2.4.35.4/fs/squashfs/Makefile +--- a/fs/squashfs/Makefile ++++ b/fs/squashfs/Makefile @@ -4,7 +4,7 @@ O_TARGET := squashfs.o @@ -11,10 +9,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile obj-m := $(O_TARGET) -Index: linux-2.4.35.4/fs/squashfs/squashfs.h -=================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/squashfs.h -+++ linux-2.4.35.4/fs/squashfs/squashfs.h +--- a/fs/squashfs/squashfs.h ++++ b/fs/squashfs/squashfs.h @@ -24,6 +24,9 @@ #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY diff --git a/target/linux/generic-2.4/patches/050-build_flags.patch b/target/linux/generic-2.4/patches/050-build_flags.patch index 7c32c68814..7bd1a5a074 100644 --- a/target/linux/generic-2.4/patches/050-build_flags.patch +++ b/target/linux/generic-2.4/patches/050-build_flags.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/arch/mips/Makefile -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/Makefile -+++ linux-2.4.35.4/arch/mips/Makefile +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile @@ -44,10 +44,10 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot GCCFLAGS := -I $(TOPDIR)/include/asm/gcc GCCFLAGS += -G 0 -mno-abicalls -fno-pic -pipe @@ -49,10 +47,8 @@ Index: linux-2.4.35.4/arch/mips/Makefile CFLAGS += $(GCCFLAGS) LD += -m $(ld-emul) -Index: linux-2.4.35.4/Makefile -=================================================================== ---- linux-2.4.35.4.orig/Makefile -+++ linux-2.4.35.4/Makefile +--- a/Makefile ++++ b/Makefile @@ -17,7 +17,7 @@ HPATH = $(TOPDIR)/include FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu diff --git a/target/linux/generic-2.4/patches/051-parallel_build.patch b/target/linux/generic-2.4/patches/051-parallel_build.patch index 63bc745fb7..6509f77981 100644 --- a/target/linux/generic-2.4/patches/051-parallel_build.patch +++ b/target/linux/generic-2.4/patches/051-parallel_build.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/arch/mips/Makefile -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/Makefile -+++ linux-2.4.35.4/arch/mips/Makefile +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile @@ -739,6 +739,7 @@ LINKFLAGS += -T arch/$(ARCH)/ld.script HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o diff --git a/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch b/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch index ad724ecfb5..62b54dceef 100644 --- a/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch +++ b/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Makefile -=================================================================== ---- linux-2.4.35.4.orig/Makefile -+++ linux-2.4.35.4/Makefile +--- a/Makefile ++++ b/Makefile @@ -428,18 +428,9 @@ else depmod_opts := -b $(INSTALL_MOD_PATH) -r endif diff --git a/target/linux/generic-2.4/patches/100-wireless-extension.patch b/target/linux/generic-2.4/patches/100-wireless-extension.patch index da65961b1f..d6fc549875 100644 --- a/target/linux/generic-2.4/patches/100-wireless-extension.patch +++ b/target/linux/generic-2.4/patches/100-wireless-extension.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netdevice.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netdevice.h -+++ linux-2.4.35.4/include/linux/netdevice.h +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h @@ -295,7 +295,9 @@ struct net_device /* List of functions to handle Wireless Extensions (instead of ioctl). @@ -13,10 +11,8 @@ Index: linux-2.4.35.4/include/linux/netdevice.h struct ethtool_ops *ethtool_ops; -Index: linux-2.4.35.4/include/linux/wireless.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/wireless.h -+++ linux-2.4.35.4/include/linux/wireless.h +--- a/include/linux/wireless.h ++++ b/include/linux/wireless.h @@ -1,10 +1,10 @@ /* * This file define a set of standard wireless extensions @@ -472,10 +468,8 @@ Index: linux-2.4.35.4/include/linux/wireless.h }; /* -Index: linux-2.4.35.4/include/net/iw_handler.h -=================================================================== ---- linux-2.4.35.4.orig/include/net/iw_handler.h -+++ linux-2.4.35.4/include/net/iw_handler.h +--- a/include/net/iw_handler.h ++++ b/include/net/iw_handler.h @@ -1,10 +1,10 @@ /* * This file define the new driver API for Wireless Extensions @@ -593,10 +587,8 @@ Index: linux-2.4.35.4/include/net/iw_handler.h }; /**************************** PROTOTYPES ****************************/ -Index: linux-2.4.35.4/net/core/dev.c -=================================================================== ---- linux-2.4.35.4.orig/net/core/dev.c -+++ linux-2.4.35.4/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -2426,7 +2426,7 @@ int dev_ioctl(unsigned int cmd, void *ar /* Follow me in net/core/wireless.c */ ret = wireless_process_ioctl(&ifr, cmd); @@ -606,10 +598,8 @@ Index: linux-2.4.35.4/net/core/dev.c copy_to_user(arg, &ifr, sizeof(struct ifreq))) return -EFAULT; return ret; -Index: linux-2.4.35.4/net/core/wireless.c -=================================================================== ---- linux-2.4.35.4.orig/net/core/wireless.c -+++ linux-2.4.35.4/net/core/wireless.c +--- a/net/core/wireless.c ++++ b/net/core/wireless.c @@ -2,7 +2,7 @@ * This file implement the Wireless Extensions APIs. * diff --git a/target/linux/generic-2.4/patches/106-mppe_mppc.patch b/target/linux/generic-2.4/patches/106-mppe_mppc.patch index db29f56922..dede6dcfb0 100644 --- a/target/linux/generic-2.4/patches/106-mppe_mppc.patch +++ b/target/linux/generic-2.4/patches/106-mppe_mppc.patch @@ -4,10 +4,8 @@ Microsoft Point-to-Point Encryption / Compression support http://www.polbox.com/h/hs001/linux-2.4.29-mppe-mppc-1.3.patch.gz -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -9974,6 +9974,28 @@ CONFIG_PPP_BSDCOMP module; it is called bsd_comp.o and will show up in the directory modules once you have said "make modules". If unsure, say N. @@ -37,10 +35,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help PPP over Ethernet CONFIG_PPPOE Support for PPP over Ethernet. -Index: linux-2.4.35.4/crypto/Config.in -=================================================================== ---- linux-2.4.35.4.orig/crypto/Config.in -+++ linux-2.4.35.4/crypto/Config.in +--- a/crypto/Config.in ++++ b/crypto/Config.in @@ -11,7 +11,9 @@ if [ "$CONFIG_INET_AH" = "y" -o \ "$CONFIG_INET6_AH" = "y" -o \ "$CONFIG_INET6_AH" = "m" -o \ @@ -102,10 +98,8 @@ Index: linux-2.4.35.4/crypto/Config.in if [ "$CONFIG_INET_IPCOMP" = "y" -o \ "$CONFIG_INET_IPCOMP" = "m" -o \ "$CONFIG_INET6_IPCOMP" = "y" -o \ -Index: linux-2.4.35.4/drivers/net/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/Config.in -+++ linux-2.4.35.4/drivers/net/Config.in +--- a/drivers/net/Config.in ++++ b/drivers/net/Config.in @@ -336,6 +336,7 @@ if [ ! "$CONFIG_PPP" = "n" ]; then dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP @@ -114,10 +108,8 @@ Index: linux-2.4.35.4/drivers/net/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP fi -Index: linux-2.4.35.4/drivers/net/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/Makefile -+++ linux-2.4.35.4/drivers/net/Makefile +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile @@ -166,6 +166,7 @@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o @@ -126,10 +118,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile obj-$(CONFIG_PPPOE) += pppox.o pppoe.o obj-$(CONFIG_SLIP) += slip.o -Index: linux-2.4.35.4/drivers/net/ppp_generic.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/ppp_generic.c -+++ linux-2.4.35.4/drivers/net/ppp_generic.c +--- a/drivers/net/ppp_generic.c ++++ b/drivers/net/ppp_generic.c @@ -19,7 +19,7 @@ * PPP driver, written by Michael Callahan and Al Longyear, and * subsequently hacked by Paul Mackerras. @@ -263,10 +253,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c init_ppp_file(&ppp->file, INTERFACE); ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */ for (i = 0; i < NUM_NP; ++i) -Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c ++++ b/drivers/net/ppp_mppe_mppc.c @@ -0,0 +1,1312 @@ +/* + * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module. @@ -1580,10 +1568,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c +MODULE_AUTHOR("Jan Dubiec <jdx@slackware.pl>"); +MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux"); +MODULE_LICENSE("Dual BSD/GPL"); -Index: linux-2.4.35.4/include/linux/ppp-comp.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/ppp-comp.h -+++ linux-2.4.35.4/include/linux/ppp-comp.h +--- a/include/linux/ppp-comp.h ++++ b/include/linux/ppp-comp.h @@ -28,7 +28,7 @@ */ diff --git a/target/linux/generic-2.4/patches/107-cifs.patch b/target/linux/generic-2.4/patches/107-cifs.patch index f05ee3c85e..3ca3fb57e1 100644 --- a/target/linux/generic-2.4/patches/107-cifs.patch +++ b/target/linux/generic-2.4/patches/107-cifs.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -17995,6 +17995,34 @@ CONFIG_UNIXWARE_DISKLABEL If you don't know what all this is about, say N. @@ -37,10 +35,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help SMB file system support (to mount Windows shares etc.) CONFIG_SMB_FS SMB (Server Message Block) is the protocol Windows for Workgroups -Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX -=================================================================== ---- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX -+++ linux-2.4.35.4/Documentation/filesystems/00-INDEX +--- a/Documentation/filesystems/00-INDEX ++++ b/Documentation/filesystems/00-INDEX @@ -10,6 +10,8 @@ befs.txt - info for the BeOS file system (BFS) bfs.txt @@ -50,10 +46,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX coda.txt - description of the CODA filesystem. cramfs.txt -Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt -=================================================================== --- /dev/null -+++ linux-2.4.35.4/Documentation/filesystems/cifs.txt ++++ b/Documentation/filesystems/cifs.txt @@ -0,0 +1,51 @@ + This is the client VFS module for the Common Internet File System + (CIFS) protocol which is the successor to the Server Message Block @@ -106,10 +100,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt + or the Samba site: + + http://www.samba.org -Index: linux-2.4.35.4/fs/cifs/asn1.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/asn1.c ++++ b/fs/cifs/asn1.c @@ -0,0 +1,614 @@ +/* + * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in @@ -725,10 +717,8 @@ Index: linux-2.4.35.4/fs/cifs/asn1.c + + return 1; +} -Index: linux-2.4.35.4/fs/cifs/AUTHORS -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/AUTHORS ++++ b/fs/cifs/AUTHORS @@ -0,0 +1,37 @@ +Original Author +=============== @@ -767,10 +757,8 @@ Index: linux-2.4.35.4/fs/cifs/AUTHORS + +And thanks to the IBM LTC and Power test teams and SuSE testers for +finding multiple bugs during excellent stress test runs. -Index: linux-2.4.35.4/fs/cifs/CHANGES -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/CHANGES ++++ b/fs/cifs/CHANGES @@ -0,0 +1,572 @@ +Version 1.20 +------------ @@ -1344,10 +1332,8 @@ Index: linux-2.4.35.4/fs/cifs/CHANGES +----------- +Initial drop + -Index: linux-2.4.35.4/fs/cifs/cifs_debug.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifs_debug.c ++++ b/fs/cifs/cifs_debug.c @@ -0,0 +1,797 @@ +/* + * fs/cifs_debug.c @@ -2146,10 +2132,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.c + + +#endif -Index: linux-2.4.35.4/fs/cifs/cifs_debug.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifs_debug.h ++++ b/fs/cifs/cifs_debug.h @@ -0,0 +1,66 @@ +/* + * @@ -2217,10 +2201,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.h +#endif /* _CIFS_DEBUG */ + +#endif /* _H_CIFS_DEBUG */ -Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifsencrypt.c ++++ b/fs/cifs/cifsencrypt.c @@ -0,0 +1,204 @@ +/* + * fs/cifs/cifsencrypt.c @@ -2426,10 +2408,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c + + hmac_md5_final(v2_session_response,&context); +} -Index: linux-2.4.35.4/fs/cifs/cifserr.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifserr.c ++++ b/fs/cifs/cifserr.c @@ -0,0 +1,70 @@ +/* + * fs/cifserr.c @@ -2501,10 +2481,8 @@ Index: linux-2.4.35.4/fs/cifs/cifserr.c +{ + return map_cifs_error(error_class, error_code, FALSE); +} -Index: linux-2.4.35.4/fs/cifs/cifsfs.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifsfs.c ++++ b/fs/cifs/cifsfs.c @@ -0,0 +1,769 @@ +/* + * fs/cifs/cifsfs.c @@ -3275,10 +3253,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c + ("VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows"); +module_init(init_cifs) +module_exit(exit_cifs) -Index: linux-2.4.35.4/fs/cifs/cifsfs.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifsfs.h ++++ b/fs/cifs/cifsfs.h @@ -0,0 +1,97 @@ +/* + * fs/cifs/cifsfs.h @@ -3377,10 +3353,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.h +extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); +#define CIFS_VERSION "1.20" +#endif /* _CIFSFS_H */ -Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h ++++ b/fs/cifs/cifs_fs_sb.h @@ -0,0 +1,32 @@ +/* + * fs/cifs/cifs_fs_sb.h @@ -3414,10 +3388,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h + mode_t mnt_dir_mode; +}; +#endif /* _CIFS_FS_SB_H */ -Index: linux-2.4.35.4/fs/cifs/cifsglob.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifsglob.h ++++ b/fs/cifs/cifsglob.h @@ -0,0 +1,413 @@ +/* + * fs/cifs/cifsglob.h @@ -3832,10 +3804,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsglob.h +GLOBAL_EXTERN unsigned int sign_CIFS_PDUs; /* enable smb packet signing */ +GLOBAL_EXTERN unsigned int linuxExtEnabled; /* enable Linux/Unix CIFS extensions */ + -Index: linux-2.4.35.4/fs/cifs/cifspdu.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifspdu.h ++++ b/fs/cifs/cifspdu.h @@ -0,0 +1,1793 @@ +/* + * fs/cifs/cifspdu.h @@ -5630,10 +5600,8 @@ Index: linux-2.4.35.4/fs/cifs/cifspdu.h +#pragma pack() /* resume default structure packing */ + +#endif /* _CIFSPDU_H */ -Index: linux-2.4.35.4/fs/cifs/cifsproto.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifsproto.h ++++ b/fs/cifs/cifsproto.h @@ -0,0 +1,254 @@ +/* + * fs/cifs/cifsproto.h @@ -5889,10 +5857,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsproto.h + char * EAData, size_t size, + const struct nls_table *nls_codepage); +#endif /* _CIFSPROTO_H */ -Index: linux-2.4.35.4/fs/cifs/cifssmb.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifssmb.c ++++ b/fs/cifs/cifssmb.c @@ -0,0 +1,3016 @@ +/* + * fs/cifs/cifssmb.c @@ -8910,10 +8876,8 @@ Index: linux-2.4.35.4/fs/cifs/cifssmb.c + return rc; +} +#endif -Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifs_unicode.c ++++ b/fs/cifs/cifs_unicode.c @@ -0,0 +1,87 @@ +/* + * fs/cifs/cifs_unicode.c @@ -9002,10 +8966,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c + return i; +} + -Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifs_unicode.h ++++ b/fs/cifs/cifs_unicode.h @@ -0,0 +1,353 @@ +/* + * cifs_unicode: Unicode kernel case support @@ -9360,10 +9322,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h +} + +#endif -Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h ++++ b/fs/cifs/cifs_uniupr.h @@ -0,0 +1,253 @@ +/* + * Copyright (c) International Business Machines Corp., 2000,2002 @@ -9618,10 +9578,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h + 0, 0, 0 +}; +#endif -Index: linux-2.4.35.4/fs/cifs/connect.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/connect.c ++++ b/fs/cifs/connect.c @@ -0,0 +1,2924 @@ +/* + * fs/cifs/connect.c @@ -12547,10 +12505,8 @@ Index: linux-2.4.35.4/fs/cifs/connect.c + return rc; +} + -Index: linux-2.4.35.4/fs/cifs/dir.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/dir.c ++++ b/fs/cifs/dir.c @@ -0,0 +1,425 @@ +/* + * fs/cifs/dir.c @@ -12977,10 +12933,8 @@ Index: linux-2.4.35.4/fs/cifs/dir.c +/* d_delete: cifs_d_delete, *//* not needed except for debugging */ + /* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */ +}; -Index: linux-2.4.35.4/fs/cifs/file.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/file.c ++++ b/fs/cifs/file.c @@ -0,0 +1,2185 @@ +/* + * fs/cifs/file.c @@ -15167,10 +15121,8 @@ Index: linux-2.4.35.4/fs/cifs/file.c + .sync_page = cifs_sync_page, + /*.direct_IO = */ +}; -Index: linux-2.4.35.4/fs/cifs/inode.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/inode.c ++++ b/fs/cifs/inode.c @@ -0,0 +1,1079 @@ +/* + * fs/cifs/inode.c @@ -16251,10 +16203,8 @@ Index: linux-2.4.35.4/fs/cifs/inode.c + /* may have to add back in if and when safe distributed caching of + directories added e.g. via FindNotify */ +} -Index: linux-2.4.35.4/fs/cifs/link.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/link.c ++++ b/fs/cifs/link.c @@ -0,0 +1,328 @@ +/* + * fs/cifs/link.c @@ -16584,10 +16534,8 @@ Index: linux-2.4.35.4/fs/cifs/link.c + FreeXid(xid); + return rc; +} -Index: linux-2.4.35.4/fs/cifs/Makefile -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/Makefile ++++ b/fs/cifs/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for Linux CIFS VFS client @@ -16599,10 +16547,8 @@ Index: linux-2.4.35.4/fs/cifs/Makefile +obj-m := $(O_TARGET) + +include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/fs/cifs/md4.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/md4.c ++++ b/fs/cifs/md4.c @@ -0,0 +1,203 @@ +/* + Unix SMB/Netbios implementation. @@ -16807,10 +16753,8 @@ Index: linux-2.4.35.4/fs/cifs/md4.c + + A = B = C = D = 0; +} -Index: linux-2.4.35.4/fs/cifs/md5.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/md5.c ++++ b/fs/cifs/md5.c @@ -0,0 +1,363 @@ +/* + * This code implements the MD5 message-digest algorithm. @@ -17175,10 +17119,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.c + } + hmac_md5_final(digest, &ctx); +} -Index: linux-2.4.35.4/fs/cifs/md5.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/md5.h ++++ b/fs/cifs/md5.h @@ -0,0 +1,38 @@ +#ifndef MD5_H +#define MD5_H @@ -17218,10 +17160,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.h +void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx); +void hmac_md5(unsigned char key[16], unsigned char *data, int data_len, + unsigned char *digest); -Index: linux-2.4.35.4/fs/cifs/misc.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/misc.c ++++ b/fs/cifs/misc.c @@ -0,0 +1,463 @@ +/* + * fs/cifs/misc.c @@ -17686,10 +17626,8 @@ Index: linux-2.4.35.4/fs/cifs/misc.c + printk( " | %s\n", debug_line); + return; +} -Index: linux-2.4.35.4/fs/cifs/netmisc.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/netmisc.c ++++ b/fs/cifs/netmisc.c @@ -0,0 +1,905 @@ +/* + * fs/cifs/netmisc.c @@ -18596,10 +18534,8 @@ Index: linux-2.4.35.4/fs/cifs/netmisc.c + dce_time += NTFS_TIME_OFFSET; + return dce_time; +} -Index: linux-2.4.35.4/fs/cifs/nterr.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/nterr.c ++++ b/fs/cifs/nterr.c @@ -0,0 +1,687 @@ +/* + * Unix SMB/Netbios implementation. @@ -19288,10 +19224,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.c + {"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED}, + {NULL, 0} +}; -Index: linux-2.4.35.4/fs/cifs/nterr.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/nterr.h ++++ b/fs/cifs/nterr.h @@ -0,0 +1,556 @@ +/* + Unix SMB/Netbios implementation. @@ -19849,10 +19783,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.h +#define NT_STATUS_NO_SUCH_JOB 0xC0000000 | 0xEDE /* scheduler */ + +#endif /* _NTERR_H */ -Index: linux-2.4.35.4/fs/cifs/ntlmssp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/ntlmssp.h ++++ b/fs/cifs/ntlmssp.h @@ -0,0 +1,101 @@ +/* + * fs/cifs/ntlmssp.h @@ -19955,10 +19887,8 @@ Index: linux-2.4.35.4/fs/cifs/ntlmssp.h +} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE; + +#pragma pack() /* resume default structure packing */ -Index: linux-2.4.35.4/fs/cifs/README -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/README ++++ b/fs/cifs/README @@ -0,0 +1,356 @@ +The CIFS VFS support for Linux supports many advanced network filesystem +features such as heirarchical dfs like namespace, hardlinks, locking and more. @@ -20316,10 +20246,8 @@ Index: linux-2.4.35.4/fs/cifs/README +Windows 2000 server or Samba since it does not usually send "raw NTLMSSP" +(instead it sends NTLMSSP encapsulated in SPNEGO/GSSAPI, which support is not +complete in the CIFS VFS yet). -Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h ++++ b/fs/cifs/rfc1002pdu.h @@ -0,0 +1,79 @@ +/* + * fs/cifs/rfc1002pdu.h @@ -20400,10 +20328,8 @@ Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h + +#pragma pack() /* resume default structure packing */ + -Index: linux-2.4.35.4/fs/cifs/smbdes.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/smbdes.c ++++ b/fs/cifs/smbdes.c @@ -0,0 +1,408 @@ +/* + Unix SMB/Netbios implementation. @@ -20813,10 +20739,8 @@ Index: linux-2.4.35.4/fs/cifs/smbdes.c + key2[0] = key[7]; + smbhash(out + 8, in + 8, key2, forw); +} -Index: linux-2.4.35.4/fs/cifs/smbencrypt.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/smbencrypt.c ++++ b/fs/cifs/smbencrypt.c @@ -0,0 +1,295 @@ +/* + Unix SMB/Netbios implementation. @@ -21113,10 +21037,8 @@ Index: linux-2.4.35.4/fs/cifs/smbencrypt.c +{ + mdfour((unsigned char *) sess_key, (unsigned char *) kr, 16); +} -Index: linux-2.4.35.4/fs/cifs/smberr.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/smberr.c ++++ b/fs/cifs/smberr.c @@ -0,0 +1,240 @@ +/* + Unix SMB/Netbios implementation. @@ -21358,10 +21280,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.c + NTSTATUS status = map_nt_error_from_unix(error); + return ntstatus_to_werror(status); +} -Index: linux-2.4.35.4/fs/cifs/smberr.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/smberr.h ++++ b/fs/cifs/smberr.h @@ -0,0 +1,113 @@ +/* + * fs/cifs/smberr.h @@ -21476,10 +21396,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.h +#define ERRpasswordExpired 2242 +#define ERRnetlogonNotStarted 2455 +#define ERRnosupport 0xFFFF -Index: linux-2.4.35.4/fs/cifs/TODO -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/TODO ++++ b/fs/cifs/TODO @@ -0,0 +1,106 @@ +version 1.16 May 27, 2004 + @@ -21587,10 +21505,8 @@ Index: linux-2.4.35.4/fs/cifs/TODO +4) More exhaustively test the recently added NT4 support against various +NT4 service pack levels. + -Index: linux-2.4.35.4/fs/cifs/transport.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/cifs/transport.c ++++ b/fs/cifs/transport.c @@ -0,0 +1,434 @@ +/* + * fs/cifs/transport.c @@ -22026,10 +21942,8 @@ Index: linux-2.4.35.4/fs/cifs/transport.c + + return rc; +} -Index: linux-2.4.35.4/fs/Config.in -=================================================================== ---- linux-2.4.35.4.orig/fs/Config.in -+++ linux-2.4.35.4/fs/Config.in +--- a/fs/Config.in ++++ b/fs/Config.in @@ -153,6 +153,10 @@ if [ "$CONFIG_NET" = "y" ]; then define_bool CONFIG_LOCKD_V4 y fi @@ -22041,10 +21955,8 @@ Index: linux-2.4.35.4/fs/Config.in dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET if [ "$CONFIG_SMB_FS" != "n" ]; then bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT -Index: linux-2.4.35.4/fs/Makefile -=================================================================== ---- linux-2.4.35.4.orig/fs/Makefile -+++ linux-2.4.35.4/fs/Makefile +--- a/fs/Makefile ++++ b/fs/Makefile @@ -37,6 +37,7 @@ subdir-$(CONFIG_MSDOS_FS) += msdos subdir-$(CONFIG_VFAT_FS) += vfat subdir-$(CONFIG_BFS_FS) += bfs @@ -22053,10 +21965,8 @@ Index: linux-2.4.35.4/fs/Makefile subdir-$(CONFIG_DEVFS_FS) += devfs subdir-$(CONFIG_HFSPLUS_FS) += hfsplus # Before hfs to find wrapped HFS+ subdir-$(CONFIG_HFS_FS) += hfs -Index: linux-2.4.35.4/fs/nls/Config.in -=================================================================== ---- linux-2.4.35.4.orig/fs/nls/Config.in -+++ linux-2.4.35.4/fs/nls/Config.in +--- a/fs/nls/Config.in ++++ b/fs/nls/Config.in @@ -11,6 +11,7 @@ fi # msdos and Joliet want NLS diff --git a/target/linux/generic-2.4/patches/108-optional_aout_support.patch b/target/linux/generic-2.4/patches/108-optional_aout_support.patch index 0ae991d1d1..2c737f9aba 100644 --- a/target/linux/generic-2.4/patches/108-optional_aout_support.patch +++ b/target/linux/generic-2.4/patches/108-optional_aout_support.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -4690,6 +4690,12 @@ CONFIG_BINFMT_ELF ld.so (check the file <file:Documentation/Changes> for location and latest version). @@ -31,10 +29,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help OSF/1 v4 readv/writev compatibility CONFIG_OSF4_COMPAT -Index: linux-2.4.35.4/arch/alpha/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/alpha/config.in -+++ linux-2.4.35.4/arch/alpha/config.in +--- a/arch/alpha/config.in ++++ b/arch/alpha/config.in @@ -315,6 +315,9 @@ if [ "$CONFIG_BINFMT_AOUT" != "n" ]; the fi @@ -45,10 +41,8 @@ Index: linux-2.4.35.4/arch/alpha/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86 source drivers/parport/Config.in -Index: linux-2.4.35.4/arch/alpha/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/alpha/defconfig -+++ linux-2.4.35.4/arch/alpha/defconfig +--- a/arch/alpha/defconfig ++++ b/arch/alpha/defconfig @@ -72,6 +72,7 @@ CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set @@ -57,10 +51,8 @@ Index: linux-2.4.35.4/arch/alpha/defconfig # CONFIG_BINFMT_MISC is not set # CONFIG_BINFMT_EM86 is not set -Index: linux-2.4.35.4/arch/arm/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/arm/config.in -+++ linux-2.4.35.4/arch/arm/config.in +--- a/arch/arm/config.in ++++ b/arch/arm/config.in @@ -499,6 +499,9 @@ choice 'Kernel core (/proc/kcore) format A.OUT CONFIG_KCORE_AOUT" ELF tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT @@ -71,10 +63,8 @@ Index: linux-2.4.35.4/arch/arm/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32 -Index: linux-2.4.35.4/arch/arm/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/arm/defconfig -+++ linux-2.4.35.4/arch/arm/defconfig +--- a/arch/arm/defconfig ++++ b/arch/arm/defconfig @@ -83,8 +83,9 @@ CONFIG_SYSCTL=y CONFIG_NWFPE=y CONFIG_KCORE_ELF=y @@ -86,10 +76,8 @@ Index: linux-2.4.35.4/arch/arm/defconfig # CONFIG_BINFMT_MISC is not set # CONFIG_PM is not set # CONFIG_ARTHUR is not set -Index: linux-2.4.35.4/arch/cris/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/cris/config.in -+++ linux-2.4.35.4/arch/cris/config.in +--- a/arch/cris/config.in ++++ b/arch/cris/config.in @@ -31,6 +31,9 @@ bool 'BSD Process Accounting' CONFIG_BSD bool 'Sysctl support' CONFIG_SYSCTL @@ -100,10 +88,8 @@ Index: linux-2.4.35.4/arch/cris/config.in string 'Kernel command line' CONFIG_ETRAX_CMDLINE "root=/dev/mtdblock3" -Index: linux-2.4.35.4/arch/cris/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/cris/defconfig -+++ linux-2.4.35.4/arch/cris/defconfig +--- a/arch/cris/defconfig ++++ b/arch/cris/defconfig @@ -18,6 +18,7 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_SYSCTL is not set @@ -112,10 +98,8 @@ Index: linux-2.4.35.4/arch/cris/defconfig # CONFIG_ETRAX_KGDB is not set # CONFIG_ETRAX_WATCHDOG is not set -Index: linux-2.4.35.4/arch/i386/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/i386/config.in -+++ linux-2.4.35.4/arch/i386/config.in +--- a/arch/i386/config.in ++++ b/arch/i386/config.in @@ -329,6 +329,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT @@ -126,10 +110,8 @@ Index: linux-2.4.35.4/arch/i386/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER -Index: linux-2.4.35.4/arch/i386/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/i386/defconfig -+++ linux-2.4.35.4/arch/i386/defconfig +--- a/arch/i386/defconfig ++++ b/arch/i386/defconfig @@ -115,9 +115,10 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -143,10 +125,8 @@ Index: linux-2.4.35.4/arch/i386/defconfig # CONFIG_OOM_KILLER is not set CONFIG_PM=y # CONFIG_APM is not set -Index: linux-2.4.35.4/arch/ia64/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/ia64/config.in -+++ linux-2.4.35.4/arch/ia64/config.in +--- a/arch/ia64/config.in ++++ b/arch/ia64/config.in @@ -124,6 +124,9 @@ bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL @@ -157,10 +137,8 @@ Index: linux-2.4.35.4/arch/ia64/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then -Index: linux-2.4.35.4/arch/ia64/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/ia64/defconfig -+++ linux-2.4.35.4/arch/ia64/defconfig +--- a/arch/ia64/defconfig ++++ b/arch/ia64/defconfig @@ -60,6 +60,7 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y @@ -169,10 +147,8 @@ Index: linux-2.4.35.4/arch/ia64/defconfig # CONFIG_BINFMT_MISC is not set CONFIG_ACPI=y CONFIG_ACPI_EFI=y -Index: linux-2.4.35.4/arch/m68k/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/m68k/config.in -+++ linux-2.4.35.4/arch/m68k/config.in +--- a/arch/m68k/config.in ++++ b/arch/m68k/config.in @@ -99,6 +99,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT @@ -183,10 +159,8 @@ Index: linux-2.4.35.4/arch/m68k/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_AMIGA" = "y" ]; then -Index: linux-2.4.35.4/arch/m68k/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/m68k/defconfig -+++ linux-2.4.35.4/arch/m68k/defconfig +--- a/arch/m68k/defconfig ++++ b/arch/m68k/defconfig @@ -44,8 +44,9 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -198,10 +172,8 @@ Index: linux-2.4.35.4/arch/m68k/defconfig # CONFIG_BINFMT_MISC is not set CONFIG_ZORRO=y # CONFIG_AMIGA_PCMCIA is not set -Index: linux-2.4.35.4/arch/mips/config-shared.in -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/config-shared.in -+++ linux-2.4.35.4/arch/mips/config-shared.in +--- a/arch/mips/config-shared.in ++++ b/arch/mips/config-shared.in @@ -873,6 +873,9 @@ define_bool CONFIG_KCORE_ELF y define_bool CONFIG_KCORE_AOUT n define_bool CONFIG_BINFMT_AOUT n @@ -212,10 +184,8 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in dep_bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT $CONFIG_MIPS64 dep_bool 'Kernel support for o32 binaries' CONFIG_MIPS32_O32 $CONFIG_MIPS32_COMPAT dep_bool 'Kernel support for n32 binaries' CONFIG_MIPS32_N32 $CONFIG_MIPS32_COMPAT -Index: linux-2.4.35.4/arch/mips/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig -+++ linux-2.4.35.4/arch/mips/defconfig +--- a/arch/mips/defconfig ++++ b/arch/mips/defconfig @@ -143,6 +143,7 @@ CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set @@ -224,10 +194,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_MIPS32_COMPAT is not set # CONFIG_MIPS32_O32 is not set # CONFIG_MIPS32_N32 is not set -Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c -+++ linux-2.4.35.4/arch/mips/kernel/irixelf.c +--- a/arch/mips/kernel/irixelf.c ++++ b/arch/mips/kernel/irixelf.c @@ -8,6 +8,7 @@ * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). */ @@ -266,10 +234,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c /* Called through irix_syssgi() to map an elf image given an FD, * a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many -Index: linux-2.4.35.4/arch/mips64/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig -+++ linux-2.4.35.4/arch/mips64/defconfig +--- a/arch/mips64/defconfig ++++ b/arch/mips64/defconfig @@ -147,6 +147,7 @@ CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set @@ -278,10 +244,8 @@ Index: linux-2.4.35.4/arch/mips64/defconfig CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y # CONFIG_MIPS32_N32 is not set -Index: linux-2.4.35.4/arch/parisc/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/parisc/config.in -+++ linux-2.4.35.4/arch/parisc/config.in +--- a/arch/parisc/config.in ++++ b/arch/parisc/config.in @@ -89,6 +89,9 @@ bool 'BSD Process Accounting' CONFIG_BSD bool 'Sysctl support' CONFIG_SYSCTL define_bool CONFIG_KCORE_ELF y @@ -292,10 +256,8 @@ Index: linux-2.4.35.4/arch/parisc/config.in tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -Index: linux-2.4.35.4/arch/parisc/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/parisc/defconfig -+++ linux-2.4.35.4/arch/parisc/defconfig +--- a/arch/parisc/defconfig ++++ b/arch/parisc/defconfig @@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -304,10 +266,8 @@ Index: linux-2.4.35.4/arch/parisc/defconfig CONFIG_BINFMT_SOM=y # CONFIG_BINFMT_MISC is not set # CONFIG_PM is not set -Index: linux-2.4.35.4/arch/ppc/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/ppc/config.in -+++ linux-2.4.35.4/arch/ppc/config.in +--- a/arch/ppc/config.in ++++ b/arch/ppc/config.in @@ -384,6 +384,7 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi define_bool CONFIG_BINFMT_ELF y @@ -316,10 +276,8 @@ Index: linux-2.4.35.4/arch/ppc/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER -Index: linux-2.4.35.4/arch/ppc/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/ppc/defconfig -+++ linux-2.4.35.4/arch/ppc/defconfig +--- a/arch/ppc/defconfig ++++ b/arch/ppc/defconfig @@ -59,7 +59,8 @@ CONFIG_SYSVIPC=y CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y @@ -330,10 +288,8 @@ Index: linux-2.4.35.4/arch/ppc/defconfig # CONFIG_OOM_KILLER is not set CONFIG_PCI_NAMES=y CONFIG_HOTPLUG=y -Index: linux-2.4.35.4/arch/ppc64/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/ppc64/config.in -+++ linux-2.4.35.4/arch/ppc64/config.in +--- a/arch/ppc64/config.in ++++ b/arch/ppc64/config.in @@ -82,6 +82,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi @@ -344,10 +300,8 @@ Index: linux-2.4.35.4/arch/ppc64/config.in tristate 'Kernel support for 32 bit ELF binaries' CONFIG_BINFMT_ELF32 -Index: linux-2.4.35.4/arch/ppc64/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/ppc64/defconfig -+++ linux-2.4.35.4/arch/ppc64/defconfig +--- a/arch/ppc64/defconfig ++++ b/arch/ppc64/defconfig @@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_KCORE_ELF=y @@ -356,10 +310,8 @@ Index: linux-2.4.35.4/arch/ppc64/defconfig CONFIG_BINFMT_ELF32=y # CONFIG_BINFMT_MISC is not set CONFIG_PCI_NAMES=y -Index: linux-2.4.35.4/arch/s390/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/s390/config.in -+++ linux-2.4.35.4/arch/s390/config.in +--- a/arch/s390/config.in ++++ b/arch/s390/config.in @@ -58,6 +58,9 @@ bool 'BSD Process Accounting' CONFIG_BSD bool 'Sysctl support' CONFIG_SYSCTL define_bool CONFIG_KCORE_ELF y @@ -370,10 +322,8 @@ Index: linux-2.4.35.4/arch/s390/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG bool 'Pseudo page fault support' CONFIG_PFAULT -Index: linux-2.4.35.4/arch/s390/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/s390/defconfig -+++ linux-2.4.35.4/arch/s390/defconfig +--- a/arch/s390/defconfig ++++ b/arch/s390/defconfig @@ -46,6 +46,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -382,10 +332,8 @@ Index: linux-2.4.35.4/arch/s390/defconfig # CONFIG_BINFMT_MISC is not set # CONFIG_PROCESS_DEBUG is not set CONFIG_PFAULT=y -Index: linux-2.4.35.4/arch/s390x/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/s390x/config.in -+++ linux-2.4.35.4/arch/s390x/config.in +--- a/arch/s390x/config.in ++++ b/arch/s390x/config.in @@ -61,6 +61,9 @@ bool 'BSD Process Accounting' CONFIG_BSD bool 'Sysctl support' CONFIG_SYSCTL define_bool CONFIG_KCORE_ELF y @@ -396,10 +344,8 @@ Index: linux-2.4.35.4/arch/s390x/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG bool 'Pseudo page fault support' CONFIG_PFAULT -Index: linux-2.4.35.4/arch/s390x/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/s390x/defconfig -+++ linux-2.4.35.4/arch/s390x/defconfig +--- a/arch/s390x/defconfig ++++ b/arch/s390x/defconfig @@ -47,6 +47,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -408,10 +354,8 @@ Index: linux-2.4.35.4/arch/s390x/defconfig # CONFIG_BINFMT_MISC is not set # CONFIG_PROCESS_DEBUG is not set CONFIG_PFAULT=y -Index: linux-2.4.35.4/arch/sh/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/sh/config.in -+++ linux-2.4.35.4/arch/sh/config.in +--- a/arch/sh/config.in ++++ b/arch/sh/config.in @@ -283,6 +283,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then A.OUT CONFIG_KCORE_AOUT" ELF fi @@ -422,10 +366,8 @@ Index: linux-2.4.35.4/arch/sh/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER -Index: linux-2.4.35.4/arch/sh/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/sh/defconfig -+++ linux-2.4.35.4/arch/sh/defconfig +--- a/arch/sh/defconfig ++++ b/arch/sh/defconfig @@ -48,6 +48,7 @@ CONFIG_CF_ENABLER=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set @@ -434,10 +376,8 @@ Index: linux-2.4.35.4/arch/sh/defconfig # CONFIG_BINFMT_MISC is not set # -Index: linux-2.4.35.4/arch/sparc/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/sparc/config.in -+++ linux-2.4.35.4/arch/sparc/config.in +--- a/arch/sparc/config.in ++++ b/arch/sparc/config.in @@ -74,6 +74,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT @@ -448,10 +388,8 @@ Index: linux-2.4.35.4/arch/sparc/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER -Index: linux-2.4.35.4/arch/sparc/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/sparc/defconfig -+++ linux-2.4.35.4/arch/sparc/defconfig +--- a/arch/sparc/defconfig ++++ b/arch/sparc/defconfig @@ -49,9 +49,10 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y @@ -465,10 +403,8 @@ Index: linux-2.4.35.4/arch/sparc/defconfig CONFIG_SUNOS_EMUL=y # CONFIG_OOM_KILLER is not set -Index: linux-2.4.35.4/arch/sparc64/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/sparc64/config.in -+++ linux-2.4.35.4/arch/sparc64/config.in +--- a/arch/sparc64/config.in ++++ b/arch/sparc64/config.in @@ -79,6 +79,9 @@ if [ "$CONFIG_SPARC32_COMPAT" != "n" ]; bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 fi @@ -479,10 +415,8 @@ Index: linux-2.4.35.4/arch/sparc64/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -Index: linux-2.4.35.4/arch/sparc64/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/sparc64/defconfig -+++ linux-2.4.35.4/arch/sparc64/defconfig +--- a/arch/sparc64/defconfig ++++ b/arch/sparc64/defconfig @@ -70,7 +70,8 @@ CONFIG_SPARC32_COMPAT=y CONFIG_BINFMT_ELF32=y # CONFIG_BINFMT_AOUT32 is not set @@ -493,10 +427,8 @@ Index: linux-2.4.35.4/arch/sparc64/defconfig # CONFIG_SUNOS_EMUL is not set CONFIG_SOLARIS_EMUL=m # CONFIG_OOM_KILLER is not set -Index: linux-2.4.35.4/arch/x86_64/config.in -=================================================================== ---- linux-2.4.35.4.orig/arch/x86_64/config.in -+++ linux-2.4.35.4/arch/x86_64/config.in +--- a/arch/x86_64/config.in ++++ b/arch/x86_64/config.in @@ -118,6 +118,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi #tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT @@ -507,10 +439,8 @@ Index: linux-2.4.35.4/arch/x86_64/config.in tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'Power Management support' CONFIG_PM -Index: linux-2.4.35.4/arch/x86_64/defconfig -=================================================================== ---- linux-2.4.35.4.orig/arch/x86_64/defconfig -+++ linux-2.4.35.4/arch/x86_64/defconfig +--- a/arch/x86_64/defconfig ++++ b/arch/x86_64/defconfig @@ -67,6 +67,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -519,10 +449,8 @@ Index: linux-2.4.35.4/arch/x86_64/defconfig # CONFIG_BINFMT_MISC is not set CONFIG_PM=y CONFIG_IA32_EMULATION=y -Index: linux-2.4.35.4/fs/binfmt_elf.c -=================================================================== ---- linux-2.4.35.4.orig/fs/binfmt_elf.c -+++ linux-2.4.35.4/fs/binfmt_elf.c +--- a/fs/binfmt_elf.c ++++ b/fs/binfmt_elf.c @@ -9,6 +9,7 @@ * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). */ @@ -699,10 +627,8 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c /* * Note that some platforms still use traditional core dumps and not -Index: linux-2.4.35.4/fs/exec.c -=================================================================== ---- linux-2.4.35.4.orig/fs/exec.c -+++ linux-2.4.35.4/fs/exec.c +--- a/fs/exec.c ++++ b/fs/exec.c @@ -109,6 +109,7 @@ static inline void put_binfmt(struct lin */ asmlinkage long sys_uselib(const char * library) diff --git a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch index 757df15e21..51981b8afc 100644 --- a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch +++ b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch @@ -1,8 +1,6 @@ packaging/utils/nattpatch 2.4 -Index: linux-2.4.35.4/include/net/sock.h -=================================================================== ---- linux-2.4.35.4.orig/include/net/sock.h -+++ linux-2.4.35.4/include/net/sock.h +--- a/include/net/sock.h ++++ b/include/net/sock.h @@ -488,7 +488,13 @@ struct tcp_opt { } bictcp; }; @@ -28,10 +26,8 @@ Index: linux-2.4.35.4/include/net/sock.h } tp_pinfo; -Index: linux-2.4.35.4/net/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/Config.in -+++ linux-2.4.35.4/net/Config.in +--- a/net/Config.in ++++ b/net/Config.in @@ -104,4 +104,6 @@ comment 'Network testing' dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS endmenu @@ -39,10 +35,8 @@ Index: linux-2.4.35.4/net/Config.in +bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL + endmenu -Index: linux-2.4.35.4/net/ipv4/udp.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/udp.c -+++ linux-2.4.35.4/net/ipv4/udp.c +--- a/net/ipv4/udp.c ++++ b/net/ipv4/udp.c @@ -860,6 +860,9 @@ static void udp_close(struct sock *sk, l static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) diff --git a/target/linux/generic-2.4/patches/110-netdev_random_core.patch b/target/linux/generic-2.4/patches/110-netdev_random_core.patch index e088949c44..d4207ad882 100644 --- a/target/linux/generic-2.4/patches/110-netdev_random_core.patch +++ b/target/linux/generic-2.4/patches/110-netdev_random_core.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -10675,6 +10675,20 @@ CONFIG_TUN If you don't know what to use this for, you don't need it. @@ -23,10 +21,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help Ethertap network tap (OBSOLETE) CONFIG_ETHERTAP If you say Y here (and have said Y to "Kernel/User network link -Index: linux-2.4.35.4/drivers/net/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/Config.in -+++ linux-2.4.35.4/drivers/net/Config.in +--- a/drivers/net/Config.in ++++ b/drivers/net/Config.in @@ -8,6 +8,7 @@ tristate 'Dummy net driver support' CONF tristate 'Bonding driver support' CONFIG_BONDING tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER @@ -35,10 +31,8 @@ Index: linux-2.4.35.4/drivers/net/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP fi -Index: linux-2.4.35.4/include/asm-alpha/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-alpha/signal.h -+++ linux-2.4.35.4/include/asm-alpha/signal.h +--- a/include/asm-alpha/signal.h ++++ b/include/asm-alpha/signal.h @@ -121,8 +121,15 @@ typedef unsigned long sigset_t; #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -55,10 +49,8 @@ Index: linux-2.4.35.4/include/asm-alpha/signal.h #define SIG_BLOCK 1 /* for blocking signals */ #define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_SETMASK 3 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-arm/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-arm/signal.h -+++ linux-2.4.35.4/include/asm-arm/signal.h +--- a/include/asm-arm/signal.h ++++ b/include/asm-arm/signal.h @@ -125,8 +125,15 @@ typedef unsigned long sigset_t; #define SA_PROBE 0x80000000 #define SA_SAMPLE_RANDOM 0x10000000 @@ -75,10 +67,8 @@ Index: linux-2.4.35.4/include/asm-arm/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-cris/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-cris/signal.h -+++ linux-2.4.35.4/include/asm-cris/signal.h +--- a/include/asm-cris/signal.h ++++ b/include/asm-cris/signal.h @@ -120,8 +120,15 @@ typedef unsigned long sigset_t; #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -95,10 +85,8 @@ Index: linux-2.4.35.4/include/asm-cris/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-i386/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-i386/signal.h -+++ linux-2.4.35.4/include/asm-i386/signal.h +--- a/include/asm-i386/signal.h ++++ b/include/asm-i386/signal.h @@ -119,8 +119,15 @@ typedef unsigned long sigset_t; #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -115,10 +103,8 @@ Index: linux-2.4.35.4/include/asm-i386/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-ia64/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-ia64/signal.h -+++ linux-2.4.35.4/include/asm-ia64/signal.h +--- a/include/asm-ia64/signal.h ++++ b/include/asm-ia64/signal.h @@ -117,6 +117,12 @@ #define SA_SHIRQ 0x04000000 #define SA_PERCPU_IRQ 0x02000000 @@ -132,10 +118,8 @@ Index: linux-2.4.35.4/include/asm-ia64/signal.h #endif /* __KERNEL__ */ #define SIG_BLOCK 0 /* for blocking signals */ -Index: linux-2.4.35.4/include/asm-m68k/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-m68k/signal.h -+++ linux-2.4.35.4/include/asm-m68k/signal.h +--- a/include/asm-m68k/signal.h ++++ b/include/asm-m68k/signal.h @@ -116,8 +116,15 @@ typedef unsigned long sigset_t; #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -152,10 +136,8 @@ Index: linux-2.4.35.4/include/asm-m68k/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-mips/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/signal.h -+++ linux-2.4.35.4/include/asm-mips/signal.h +--- a/include/asm-mips/signal.h ++++ b/include/asm-mips/signal.h @@ -111,6 +111,12 @@ typedef unsigned long old_sigset_t; /* #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x02000000 @@ -169,10 +151,8 @@ Index: linux-2.4.35.4/include/asm-mips/signal.h #endif /* __KERNEL__ */ #define SIG_BLOCK 1 /* for blocking signals */ -Index: linux-2.4.35.4/include/asm-mips64/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/signal.h -+++ linux-2.4.35.4/include/asm-mips64/signal.h +--- a/include/asm-mips64/signal.h ++++ b/include/asm-mips64/signal.h @@ -119,6 +119,12 @@ typedef unsigned int old_sigset_t32; #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x02000000 @@ -186,10 +166,8 @@ Index: linux-2.4.35.4/include/asm-mips64/signal.h #endif /* __KERNEL__ */ #define SIG_BLOCK 1 /* for blocking signals */ -Index: linux-2.4.35.4/include/asm-parisc/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-parisc/signal.h -+++ linux-2.4.35.4/include/asm-parisc/signal.h +--- a/include/asm-parisc/signal.h ++++ b/include/asm-parisc/signal.h @@ -100,6 +100,12 @@ #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 @@ -203,10 +181,8 @@ Index: linux-2.4.35.4/include/asm-parisc/signal.h #endif /* __KERNEL__ */ #define SIG_BLOCK 0 /* for blocking signals */ -Index: linux-2.4.35.4/include/asm-ppc/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-ppc/signal.h -+++ linux-2.4.35.4/include/asm-ppc/signal.h +--- a/include/asm-ppc/signal.h ++++ b/include/asm-ppc/signal.h @@ -111,6 +111,13 @@ typedef struct { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -221,10 +197,8 @@ Index: linux-2.4.35.4/include/asm-ppc/signal.h #endif /* __KERNEL__ */ #define SIG_BLOCK 0 /* for blocking signals */ -Index: linux-2.4.35.4/include/asm-s390/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-s390/signal.h -+++ linux-2.4.35.4/include/asm-s390/signal.h +--- a/include/asm-s390/signal.h ++++ b/include/asm-s390/signal.h @@ -129,8 +129,15 @@ typedef unsigned long sigset_t; #define SA_SHIRQ 0x04000000 #define SA_DOPATHGROUP 0x00100000 @@ -241,10 +215,8 @@ Index: linux-2.4.35.4/include/asm-s390/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-s390x/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-s390x/signal.h -+++ linux-2.4.35.4/include/asm-s390x/signal.h +--- a/include/asm-s390x/signal.h ++++ b/include/asm-s390x/signal.h @@ -129,8 +129,15 @@ typedef unsigned long sigset_t; #define SA_SHIRQ 0x04000000 #define SA_DOPATHGROUP 0x00100000 @@ -261,10 +233,8 @@ Index: linux-2.4.35.4/include/asm-s390x/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-sh/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-sh/signal.h -+++ linux-2.4.35.4/include/asm-sh/signal.h +--- a/include/asm-sh/signal.h ++++ b/include/asm-sh/signal.h @@ -107,8 +107,15 @@ typedef struct { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -281,10 +251,8 @@ Index: linux-2.4.35.4/include/asm-sh/signal.h #define SIG_BLOCK 0 /* for blocking signals */ #define SIG_UNBLOCK 1 /* for unblocking signals */ #define SIG_SETMASK 2 /* for setting the signal mask */ -Index: linux-2.4.35.4/include/asm-sparc/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-sparc/signal.h -+++ linux-2.4.35.4/include/asm-sparc/signal.h +--- a/include/asm-sparc/signal.h ++++ b/include/asm-sparc/signal.h @@ -176,8 +176,15 @@ struct sigstack { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART @@ -301,10 +269,8 @@ Index: linux-2.4.35.4/include/asm-sparc/signal.h /* Type of a signal handler. */ #ifdef __KERNEL__ typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *); -Index: linux-2.4.35.4/include/asm-sparc64/signal.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-sparc64/signal.h -+++ linux-2.4.35.4/include/asm-sparc64/signal.h +--- a/include/asm-sparc64/signal.h ++++ b/include/asm-sparc64/signal.h @@ -192,8 +192,15 @@ struct sigstack { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART diff --git a/target/linux/generic-2.4/patches/112-bridging_performance.patch b/target/linux/generic-2.4/patches/112-bridging_performance.patch index daa396c848..9e15d6c877 100644 --- a/target/linux/generic-2.4/patches/112-bridging_performance.patch +++ b/target/linux/generic-2.4/patches/112-bridging_performance.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/core/dev.c -=================================================================== ---- linux-2.4.35.4.orig/net/core/dev.c -+++ linux-2.4.35.4/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -1289,6 +1289,19 @@ int netif_rx(struct sk_buff *skb) local_irq_save(flags); diff --git a/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch b/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch index b5ae881a45..62a6e21914 100644 --- a/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch +++ b/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c -+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c +--- a/arch/mips/kernel/mips_ksyms.c ++++ b/arch/mips/kernel/mips_ksyms.c @@ -30,6 +30,10 @@ #include <asm/floppy.h> #endif @@ -27,10 +25,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c /* Networking helper routines. */ EXPORT_SYMBOL(csum_partial_copy); -Index: linux-2.4.35.4/arch/mips/lib/Makefile -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/lib/Makefile -+++ linux-2.4.35.4/arch/mips/lib/Makefile +--- a/arch/mips/lib/Makefile ++++ b/arch/mips/lib/Makefile @@ -9,7 +9,8 @@ L_TARGET = lib.a obj-y += csum_partial.o csum_partial_copy.o \ promlib.o rtc-std.o rtc-no.o memcpy.o \ @@ -41,10 +37,8 @@ Index: linux-2.4.35.4/arch/mips/lib/Makefile export-objs := rtc-std.o rtc-no.o -Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/lib/ashldi3.c ++++ b/arch/mips/lib/ashldi3.c @@ -0,0 +1,62 @@ +/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */ +/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc. @@ -108,10 +102,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c + + return w.ll; +} -Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c ++++ b/arch/mips/lib/ashrdi3.c @@ -0,0 +1,63 @@ +/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */ +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -176,10 +168,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c + + return w.ll; +} -Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c ++++ b/arch/mips/lib/lshrdi3.c @@ -0,0 +1,62 @@ +/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */ +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -243,10 +233,8 @@ Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c + + return w.ll; +} -Index: linux-2.4.35.4/arch/mips/lib/muldi3.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/arch/mips/lib/muldi3.c ++++ b/arch/mips/lib/muldi3.c @@ -0,0 +1,63 @@ +/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and + gcc-2.7.2.3/longlong.h which is: */ @@ -311,10 +299,8 @@ Index: linux-2.4.35.4/arch/mips/lib/muldi3.c + + return w.ll; +} -Index: linux-2.4.35.4/fs/cifs/cifsfs.c -=================================================================== ---- linux-2.4.35.4.orig/fs/cifs/cifsfs.c -+++ linux-2.4.35.4/fs/cifs/cifsfs.c +--- a/fs/cifs/cifsfs.c ++++ b/fs/cifs/cifsfs.c @@ -50,8 +50,6 @@ static struct quotactl_ops cifs_quotactl_ops; #endif @@ -324,10 +310,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c int cifsFYI = 0; int cifsERROR = 1; int traceSMB = 0; -Index: linux-2.4.35.4/include/asm-mips/uaccess.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/uaccess.h -+++ linux-2.4.35.4/include/asm-mips/uaccess.h +--- a/include/asm-mips/uaccess.h ++++ b/include/asm-mips/uaccess.h @@ -149,7 +149,7 @@ static inline int verify_area(int type, * Returns zero on success, or -EFAULT on error. */ diff --git a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch index cb51a3f571..211b30bd7b 100644 --- a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch +++ b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/arch/mips/kernel/time.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/time.c -+++ linux-2.4.35.4/arch/mips/kernel/time.c +--- a/arch/mips/kernel/time.c ++++ b/arch/mips/kernel/time.c @@ -151,6 +151,27 @@ void (*mips_timer_ack)(void); unsigned int (*mips_hpt_read)(void); void (*mips_hpt_init)(unsigned int); @@ -36,10 +34,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c EXPORT_SYMBOL(rtc_get_time); +EXPORT_SYMBOL(get_htscl); +EXPORT_SYMBOL(get_tscll); -Index: linux-2.4.35.4/include/asm-mips/timex.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/timex.h -+++ linux-2.4.35.4/include/asm-mips/timex.h +--- a/include/asm-mips/timex.h ++++ b/include/asm-mips/timex.h @@ -31,6 +31,19 @@ static inline cycles_t get_cycles (void) return read_c0_count(); } @@ -60,10 +56,8 @@ Index: linux-2.4.35.4/include/asm-mips/timex.h #define vxtime_lock() do {} while (0) #define vxtime_unlock() do {} while (0) -Index: linux-2.4.35.4/include/net/pkt_sched.h -=================================================================== ---- linux-2.4.35.4.orig/include/net/pkt_sched.h -+++ linux-2.4.35.4/include/net/pkt_sched.h +--- a/include/net/pkt_sched.h ++++ b/include/net/pkt_sched.h @@ -5,7 +5,11 @@ #define PSCHED_JIFFIES 2 #define PSCHED_CPU 3 diff --git a/target/linux/generic-2.4/patches/115-branch_emul_fix.patch b/target/linux/generic-2.4/patches/115-branch_emul_fix.patch index 5d65ee8ef4..5a7b652ad2 100644 --- a/target/linux/generic-2.4/patches/115-branch_emul_fix.patch +++ b/target/linux/generic-2.4/patches/115-branch_emul_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/arch/mips/kernel/branch.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/branch.c -+++ linux-2.4.35.4/arch/mips/kernel/branch.c +--- a/arch/mips/kernel/branch.c ++++ b/arch/mips/kernel/branch.c @@ -170,7 +170,7 @@ int __compute_return_epc(struct pt_regs bit = (insn.i_format.rt >> 2); bit += (bit != 0); diff --git a/target/linux/generic-2.4/patches/116-bridge_ioctls.patch b/target/linux/generic-2.4/patches/116-bridge_ioctls.patch index f42c02a1f6..e005a355f3 100644 --- a/target/linux/generic-2.4/patches/116-bridge_ioctls.patch +++ b/target/linux/generic-2.4/patches/116-bridge_ioctls.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/sockios.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/sockios.h -+++ linux-2.4.35.4/include/linux/sockios.h +--- a/include/linux/sockios.h ++++ b/include/linux/sockios.h @@ -68,6 +68,11 @@ #define SIOCGIFBR 0x8940 /* Bridging support */ diff --git a/target/linux/generic-2.4/patches/200-i4l.patch b/target/linux/generic-2.4/patches/200-i4l.patch index 4c84cc5bdd..c7352551f7 100644 --- a/target/linux/generic-2.4/patches/200-i4l.patch +++ b/target/linux/generic-2.4/patches/200-i4l.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/isdn/CREDITS -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/CREDITS -+++ linux-2.4.35.4/Documentation/isdn/CREDITS +--- a/Documentation/isdn/CREDITS ++++ b/Documentation/isdn/CREDITS @@ -37,7 +37,7 @@ Michael Knigge (knick@cove.han.de) Andreas Kool (akool@Kool.f.EUnet.de) For contribution of the isdnlog/isdnrep-tool @@ -11,10 +9,8 @@ Index: linux-2.4.35.4/Documentation/isdn/CREDITS For lot of new ideas and the pcbit driver. Eberhard Moenkeberg (emoenke@gwdg.de) -Index: linux-2.4.35.4/Documentation/isdn/HiSax.cert -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/HiSax.cert -+++ linux-2.4.35.4/Documentation/isdn/HiSax.cert +--- a/Documentation/isdn/HiSax.cert ++++ b/Documentation/isdn/HiSax.cert @@ -68,6 +68,8 @@ drivers/isdn/hisax/cert.c drivers/isdn/hisax/elsa.c drivers/isdn/hisax/diva.c @@ -24,10 +20,8 @@ Index: linux-2.4.35.4/Documentation/isdn/HiSax.cert Please send any changes, bugfixes and patches to me rather than implementing them directly into the HiSax sources. -Index: linux-2.4.35.4/Documentation/isdn/INTERFACE -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE -+++ linux-2.4.35.4/Documentation/isdn/INTERFACE +--- a/Documentation/isdn/INTERFACE ++++ b/Documentation/isdn/INTERFACE @@ -1,4 +1,4 @@ -$Id: INTERFACE,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: INTERFACE,v 1.17 2002/01/31 13:26:35 keil Exp $ @@ -66,20 +60,16 @@ Index: linux-2.4.35.4/Documentation/isdn/INTERFACE + command = ISDN_STAT_PROCEED + arg = channel-number, locally to the driver. (starting with 0) + -Index: linux-2.4.35.4/Documentation/isdn/INTERFACE.fax -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE.fax -+++ linux-2.4.35.4/Documentation/isdn/INTERFACE.fax +--- a/Documentation/isdn/INTERFACE.fax ++++ b/Documentation/isdn/INTERFACE.fax @@ -1,4 +1,4 @@ -$Id: INTERFACE.fax,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: INTERFACE.fax,v 1.2 2000/08/06 09:22:50 armin Exp $ Description of the fax-subinterface between linklevel and hardwarelevel of -Index: linux-2.4.35.4/Documentation/isdn/README -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README -+++ linux-2.4.35.4/Documentation/isdn/README +--- a/Documentation/isdn/README ++++ b/Documentation/isdn/README @@ -278,6 +278,12 @@ README for the ISDN-subsystem 1 = Add CPN to FCON message on Bit 2: 0 = Add CDN to RING/FCON message off @@ -93,10 +83,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README Last but not least a (at the moment fairly primitive) device to request the line-status (/dev/isdninfo) is made available. -Index: linux-2.4.35.4/Documentation/isdn/README.HiSax -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.HiSax -+++ linux-2.4.35.4/Documentation/isdn/README.HiSax +--- a/Documentation/isdn/README.HiSax ++++ b/Documentation/isdn/README.HiSax @@ -41,10 +41,9 @@ ELSA Quickstep 3000 (same settings as QS ELSA Quickstep 3000PCI ELSA PCMCIA @@ -188,70 +176,56 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax Running the driver ------------------ -Index: linux-2.4.35.4/Documentation/isdn/README.act2000 -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.act2000 -+++ linux-2.4.35.4/Documentation/isdn/README.act2000 +--- a/Documentation/isdn/README.act2000 ++++ b/Documentation/isdn/README.act2000 @@ -1,4 +1,4 @@ -$Id: README.act2000,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: README.act2000,v 1.3 2000/08/06 09:22:51 armin Exp $ This document describes the ACT2000 driver for the IBM Active 2000 ISDN card. -Index: linux-2.4.35.4/Documentation/isdn/README.audio -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.audio -+++ linux-2.4.35.4/Documentation/isdn/README.audio +--- a/Documentation/isdn/README.audio ++++ b/Documentation/isdn/README.audio @@ -1,4 +1,4 @@ -$Id: README.audio,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: README.audio,v 1.8 1999/07/11 17:17:29 armin Exp $ ISDN subsystem for Linux. Description of audio mode. -Index: linux-2.4.35.4/Documentation/isdn/README.eicon -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.eicon -+++ linux-2.4.35.4/Documentation/isdn/README.eicon +--- a/Documentation/isdn/README.eicon ++++ b/Documentation/isdn/README.eicon @@ -1,4 +1,4 @@ -$Id: README.eicon,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: README.eicon,v 1.10 2000/08/13 12:19:15 armin Exp $ (c) 1999,2000 Armin Schindler (mac@melware.de) (c) 1999,2000 Cytronics & Melware (info@melware.de) -Index: linux-2.4.35.4/Documentation/isdn/README.hysdn -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.hysdn -+++ linux-2.4.35.4/Documentation/isdn/README.hysdn +--- a/Documentation/isdn/README.hysdn ++++ b/Documentation/isdn/README.hysdn @@ -1,4 +1,4 @@ -$Id: README.hysdn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $ The hysdn driver has been written by by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver -Index: linux-2.4.35.4/Documentation/isdn/README.icn -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.icn -+++ linux-2.4.35.4/Documentation/isdn/README.icn +--- a/Documentation/isdn/README.icn ++++ b/Documentation/isdn/README.icn @@ -1,4 +1,4 @@ -$Id: README.icn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +$Id: README.icn,v 1.7 2000/08/06 09:22:51 armin Exp $ You can get the ICN-ISDN-card from: -Index: linux-2.4.35.4/Documentation/isdn/README.pcbit -=================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.pcbit -+++ linux-2.4.35.4/Documentation/isdn/README.pcbit +--- a/Documentation/isdn/README.pcbit ++++ b/Documentation/isdn/README.pcbit @@ -37,4 +37,4 @@ mailing list (isdn4linux@listserv.isdn4l regards, Pedro. -<pedro_m@yahoo.com> +<roque@di.fc.ul.pt> -Index: linux-2.4.35.4/Documentation/isdn/abcext_kernel.help -=================================================================== --- /dev/null -+++ linux-2.4.35.4/Documentation/isdn/abcext_kernel.help ++++ b/Documentation/isdn/abcext_kernel.help @@ -0,0 +1,166 @@ + +ISDN-ABC-DW Extension @@ -419,10 +393,8 @@ Index: linux-2.4.35.4/Documentation/isdn/abcext_kernel.help + See "linux/Documentation/isdn/dw-abc-extension-howto.txt" + for more Information + -Index: linux-2.4.35.4/drivers/isdn/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/Config.in -+++ linux-2.4.35.4/drivers/isdn/Config.in +--- a/drivers/isdn/Config.in ++++ b/drivers/isdn/Config.in @@ -4,11 +4,9 @@ # only included if CONFIG_ISDN != n @@ -552,10 +524,8 @@ Index: linux-2.4.35.4/drivers/isdn/Config.in fi endmenu -Index: linux-2.4.35.4/drivers/isdn/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/Makefile -+++ linux-2.4.35.4/drivers/isdn/Makefile +--- a/drivers/isdn/Makefile ++++ b/drivers/isdn/Makefile @@ -2,7 +2,7 @@ # The target object and module list name. @@ -577,10 +547,8 @@ Index: linux-2.4.35.4/drivers/isdn/Makefile subdir-$(CONFIG_ISDN_DRV_ICN) += icn subdir-$(CONFIG_ISDN_DRV_PCBIT) += pcbit subdir-$(CONFIG_ISDN_DRV_SC) += sc -Index: linux-2.4.35.4/drivers/isdn/act2000/act2000.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000.h -+++ linux-2.4.35.4/drivers/isdn/act2000/act2000.h +--- a/drivers/isdn/act2000/act2000.h ++++ b/drivers/isdn/act2000/act2000.h @@ -1,4 +1,4 @@ -/* $Id: act2000.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id$ @@ -610,10 +578,8 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000.h { queue_task(&card->poll_tq, &tq_immediate); mark_bh(IMMEDIATE_BH); -Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.c -+++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c +--- a/drivers/isdn/act2000/act2000_isa.c ++++ b/drivers/isdn/act2000/act2000_isa.c @@ -1,4 +1,4 @@ -/* $Id: act2000_isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id$ @@ -650,20 +616,16 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c } } -Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.h -+++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h +--- a/drivers/isdn/act2000/act2000_isa.h ++++ b/drivers/isdn/act2000/act2000_isa.h @@ -1,4 +1,4 @@ -/* $Id: act2000_isa.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id$ * * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000 (ISA-Version). * -Index: linux-2.4.35.4/drivers/isdn/act2000/capi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.c -+++ linux-2.4.35.4/drivers/isdn/act2000/capi.c +--- a/drivers/isdn/act2000/capi.c ++++ b/drivers/isdn/act2000/capi.c @@ -1,4 +1,4 @@ -/* $Id: capi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id$ @@ -681,10 +643,8 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/capi.c #endif {{ 0x00, 0x00}, NULL}, }; -Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.h -+++ linux-2.4.35.4/drivers/isdn/act2000/capi.h +--- a/drivers/isdn/act2000/capi.h ++++ b/drivers/isdn/act2000/capi.h @@ -1,4 +1,4 @@ -/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id$ @@ -728,10 +688,8 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h actcapi_nextsmsg(act2000_card *card) { unsigned long flags; -Index: linux-2.4.35.4/drivers/isdn/act2000/module.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/module.c -+++ linux-2.4.35.4/drivers/isdn/act2000/module.c +--- a/drivers/isdn/act2000/module.c ++++ b/drivers/isdn/act2000/module.c @@ -1,4 +1,4 @@ -/* $Id: module.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id$ @@ -789,30 +747,24 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/module.c module_init(act2000_init); module_exit(act2000_exit); -Index: linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/avm_cs.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c +--- a/drivers/isdn/avmb1/avm_cs.c ++++ b/drivers/isdn/avmb1/avm_cs.c @@ -1,4 +1,4 @@ -/* $Id: avm_cs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: avm_cs.c,v 1.6 2001/09/24 13:22:44 kai Exp $ * * A PCMCIA client driver for AVM B1/M1/M2 * -Index: linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/avmcard.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h +--- a/drivers/isdn/avmb1/avmcard.h ++++ b/drivers/isdn/avmb1/avmcard.h @@ -1,4 +1,4 @@ -/* $Id: avmcard.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: avmcard.h,v 1.12 2001/09/24 13:22:44 kai Exp $ * * Copyright 1999 by Carsten Paeth <calle@calle.de> * -Index: linux-2.4.35.4/drivers/isdn/avmb1/b1.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1.c +--- a/drivers/isdn/avmb1/b1.c ++++ b/drivers/isdn/avmb1/b1.c @@ -1,4 +1,4 @@ -/* $Id: b1.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: b1.c,v 1.26 2001/09/24 13:22:44 kai Exp $ @@ -836,10 +788,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1.c /* ------------------------------------------------------------- */ -Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1dma.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c +--- a/drivers/isdn/avmb1/b1dma.c ++++ b/drivers/isdn/avmb1/b1dma.c @@ -1,4 +1,4 @@ -/* $Id: b1dma.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: b1dma.c,v 1.18 2001/09/24 13:22:44 kai Exp $ @@ -893,10 +843,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c rxlen = b1dmainmeml(card->mbase+0x28); csr = b1dmainmeml(card->mbase+AMCC_INTCSR); -Index: linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1isa.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c +--- a/drivers/isdn/avmb1/b1isa.c ++++ b/drivers/isdn/avmb1/b1isa.c @@ -1,4 +1,4 @@ -/* $Id: b1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: b1isa.c,v 1.14 2001/09/24 13:22:44 kai Exp $ @@ -918,10 +866,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c /* ------------------------------------------------------------- */ -Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pci.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c +--- a/drivers/isdn/avmb1/b1pci.c ++++ b/drivers/isdn/avmb1/b1pci.c @@ -1,4 +1,4 @@ -/* $Id: b1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: b1pci.c,v 1.40 2001/09/24 13:22:44 kai Exp $ @@ -981,10 +927,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c printk(KERN_INFO "%s: PCI BIOS reports AVM-B1 at i/o %#x, irq %d\n", -Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pcmcia.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c +--- a/drivers/isdn/avmb1/b1pcmcia.c ++++ b/drivers/isdn/avmb1/b1pcmcia.c @@ -1,4 +1,4 @@ -/* $Id: b1pcmcia.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: b1pcmcia.c,v 1.17 2001/09/24 13:22:44 kai Exp $ @@ -1000,10 +944,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c /* ------------------------------------------------------------- */ -Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/c4.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/c4.c +--- a/drivers/isdn/avmb1/c4.c ++++ b/drivers/isdn/avmb1/c4.c @@ -1,4 +1,4 @@ -/* $Id: c4.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: c4.c,v 1.38 2001/09/24 13:22:44 kai Exp $ @@ -1055,10 +997,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c printk(KERN_INFO "%s: PCI BIOS reports AVM-C%d at i/o %#x, irq %d, mem %#x\n", -Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capi.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/capi.c +--- a/drivers/isdn/avmb1/capi.c ++++ b/drivers/isdn/avmb1/capi.c @@ -1,4 +1,4 @@ -/* $Id: capi.c,v 1.1.4.2 2001/12/09 18:45:13 kai Exp $ +/* $Id: capi.c,v 1.59 2001/11/07 22:35:48 kai Exp $ @@ -1893,30 +1833,24 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c (void) detach_capi_interface(&cuser); printk(KERN_NOTICE "capi: Rev %s: unloaded\n", rev); } -Index: linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capicmd.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h +--- a/drivers/isdn/avmb1/capicmd.h ++++ b/drivers/isdn/avmb1/capicmd.h @@ -1,4 +1,4 @@ -/* $Id: capicmd.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capicmd.h,v 1.4 2001/09/24 13:22:44 kai Exp $ * * CAPI 2.0 Interface for Linux * -Index: linux-2.4.35.4/drivers/isdn/avmb1/capidev.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidev.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/capidev.h +--- a/drivers/isdn/avmb1/capidev.h ++++ b/drivers/isdn/avmb1/capidev.h @@ -1,4 +1,4 @@ -/* $Id: capidev.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capidev.h,v 1.8 2001/09/24 13:22:44 kai Exp $ * * CAPI 2.0 Interface for Linux * -Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c +--- a/drivers/isdn/avmb1/capidrv.c ++++ b/drivers/isdn/avmb1/capidrv.c @@ -1,4 +1,4 @@ -/* $Id: capidrv.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capidrv.c,v 1.45 2001/09/24 13:22:44 kai Exp $ @@ -2094,20 +2028,16 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c kfree(card->bchans); card->bchans = 0; -Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h +--- a/drivers/isdn/avmb1/capidrv.h ++++ b/drivers/isdn/avmb1/capidrv.h @@ -1,4 +1,4 @@ -/* $Id: capidrv.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capidrv.h,v 1.4 2001/09/24 13:22:44 kai Exp $ * * ISDN4Linux Driver, using capi20 interface (kernelcapi) * -Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.c +--- a/drivers/isdn/avmb1/capifs.c ++++ b/drivers/isdn/avmb1/capifs.c @@ -1,4 +1,4 @@ -/* $Id: capifs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capifs.c,v 1.22 2001/09/24 13:22:44 kai Exp $ @@ -2386,30 +2316,24 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c } } } -Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.h +--- a/drivers/isdn/avmb1/capifs.h ++++ b/drivers/isdn/avmb1/capifs.h @@ -1,4 +1,4 @@ -/* $Id: capifs.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capifs.h,v 1.4 2001/09/24 13:22:44 kai Exp $ * * Copyright 2000 by Carsten Paeth <calle@calle.de> * -Index: linux-2.4.35.4/drivers/isdn/avmb1/capilli.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capilli.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/capilli.h +--- a/drivers/isdn/avmb1/capilli.h ++++ b/drivers/isdn/avmb1/capilli.h @@ -1,4 +1,4 @@ -/* $Id: capilli.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capilli.h,v 1.5 2001/09/24 13:22:44 kai Exp $ * * Kernel CAPI 2.0 Driver Interface for Linux * -Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c +--- a/drivers/isdn/avmb1/capiutil.c ++++ b/drivers/isdn/avmb1/capiutil.c @@ -1,4 +1,4 @@ -/* $Id: capiutil.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capiutil.c,v 1.16 2001/09/24 13:22:44 kai Exp $ @@ -2424,20 +2348,16 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c #include "capiutil.h" MODULE_DESCRIPTION("CAPI4Linux: CAPI message conversion support"); -Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.h -+++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h +--- a/drivers/isdn/avmb1/capiutil.h ++++ b/drivers/isdn/avmb1/capiutil.h @@ -1,4 +1,4 @@ -/* $Id: capiutil.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: capiutil.h,v 1.7 2001/09/24 13:22:44 kai Exp $ * * CAPI 2.0 defines & types * -Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/kcapi.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c +--- a/drivers/isdn/avmb1/kcapi.c ++++ b/drivers/isdn/avmb1/kcapi.c @@ -1,4 +1,4 @@ -/* $Id: kcapi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: kcapi.c,v 1.28 2001/09/24 13:22:44 kai Exp $ @@ -2613,10 +2533,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c printk(KERN_NOTICE "kcapi: card %d \"%s\" ready.\n", CARDNR(card), card->name); -Index: linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1isa.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c +--- a/drivers/isdn/avmb1/t1isa.c ++++ b/drivers/isdn/avmb1/t1isa.c @@ -1,4 +1,4 @@ -/* $Id: t1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: t1isa.c,v 1.22 2001/09/24 13:22:44 kai Exp $ @@ -2639,10 +2557,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c /* ------------------------------------------------------------- */ -Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1pci.c -+++ linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c +--- a/drivers/isdn/avmb1/t1pci.c ++++ b/drivers/isdn/avmb1/t1pci.c @@ -1,4 +1,4 @@ -/* $Id: t1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: t1pci.c,v 1.25 2001/09/24 13:22:44 kai Exp $ @@ -2692,10 +2608,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c printk(KERN_INFO "%s: PCI BIOS reports AVM-T1-PCI at i/o %#x, irq %d, mem %#x\n", -Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/divert/divert_procfs.c -+++ linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c +--- a/drivers/isdn/divert/divert_procfs.c ++++ b/drivers/isdn/divert/divert_procfs.c @@ -1,4 +1,4 @@ -/* $Id: divert_procfs.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ @@ -2816,10 +2730,8 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c #endif /* CONFIG_PROC_FS */ return (0); -Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.c -+++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c +--- a/drivers/isdn/divert/isdn_divert.c ++++ b/drivers/isdn/divert/isdn_divert.c @@ -1,4 +1,4 @@ -/* $Id: isdn_divert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ @@ -2875,10 +2787,8 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c break; default: -Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.h -+++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h +--- a/drivers/isdn/divert/isdn_divert.h ++++ b/drivers/isdn/divert/isdn_divert.h @@ -1,4 +1,4 @@ -/* $Id: isdn_divert.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ @@ -2907,10 +2817,8 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h actions 1-2 only take place if interface is opened */ u_char waittime; /* maximum wait time for proceeding */ -Index: linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/Divas_mod.c -+++ linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c +--- a/drivers/isdn/eicon/Divas_mod.c ++++ b/drivers/isdn/eicon/Divas_mod.c @@ -20,6 +20,7 @@ #include "adapter.h" #include "uxio.h" @@ -2919,10 +2827,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c MODULE_DESCRIPTION("ISDN4Linux: Driver for Eicon Diva Server cards"); MODULE_AUTHOR("Armin Schindler"); -Index: linux-2.4.35.4/drivers/isdn/eicon/common.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/common.c -+++ linux-2.4.35.4/drivers/isdn/eicon/common.c +--- a/drivers/isdn/eicon/common.c ++++ b/drivers/isdn/eicon/common.c @@ -808,9 +808,7 @@ void DivasDoDpc(void *pData) while(i--) @@ -2934,10 +2840,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/common.c } } -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon.h -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon.h +--- a/drivers/isdn/eicon/eicon.h ++++ b/drivers/isdn/eicon/eicon.h @@ -1,4 +1,4 @@ -/* $Id: eicon.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon.h,v 1.26 2001/09/24 13:22:47 kai Exp $ @@ -2967,20 +2871,16 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon.h { queue_task(&card->ack_tq, &tq_immediate); mark_bh(IMMEDIATE_BH); -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_dsp.h -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h +--- a/drivers/isdn/eicon/eicon_dsp.h ++++ b/drivers/isdn/eicon/eicon_dsp.h @@ -1,4 +1,4 @@ -/* $Id: eicon_dsp.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_dsp.h,v 1.8 2001/09/24 13:22:47 kai Exp $ * * ISDN lowlevel-module for Eicon active cards. * DSP definitions -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.c -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c +--- a/drivers/isdn/eicon/eicon_idi.c ++++ b/drivers/isdn/eicon/eicon_idi.c @@ -1,4 +1,4 @@ -/* $Id: eicon_idi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_idi.c,v 1.45 2001/11/07 22:35:48 kai Exp $ @@ -3057,30 +2957,24 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c chan->statectrl &= ~WAITING_FOR_HANGUP; chan->statectrl &= ~IN_HOLD; if (chan->statectrl & HAVE_CONN_REQ) { -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.h -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h +--- a/drivers/isdn/eicon/eicon_idi.h ++++ b/drivers/isdn/eicon/eicon_idi.h @@ -1,4 +1,4 @@ -/* $Id: eicon_idi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_idi.h,v 1.12 2001/09/24 13:22:47 kai Exp $ * * ISDN lowlevel-module for the Eicon active cards. * IDI-Interface -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_io.c -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c +--- a/drivers/isdn/eicon/eicon_io.c ++++ b/drivers/isdn/eicon/eicon_io.c @@ -1,4 +1,4 @@ -/* $Id: eicon_io.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_io.c,v 1.15 2001/09/24 13:22:47 kai Exp $ * * ISDN low-level module for Eicon active ISDN-Cards. * Code for communicating with hardware. -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.c -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c +--- a/drivers/isdn/eicon/eicon_isa.c ++++ b/drivers/isdn/eicon/eicon_isa.c @@ -1,4 +1,4 @@ -/* $Id: eicon_isa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_isa.c,v 1.18 2001/11/07 22:35:48 kai Exp $ @@ -3172,20 +3066,16 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c #ifdef EICON_MCA_DEBUG printk(KERN_INFO "eicon_isa_boot: card->ramsize = %d.\n", card->ramsize); #endif -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.h -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h +--- a/drivers/isdn/eicon/eicon_isa.h ++++ b/drivers/isdn/eicon/eicon_isa.h @@ -1,4 +1,4 @@ -/* $Id: eicon_isa.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_isa.h,v 1.11 2001/09/24 13:22:47 kai Exp $ * * ISDN low-level module for Eicon active ISDN-Cards. * -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_mod.c -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c +--- a/drivers/isdn/eicon/eicon_mod.c ++++ b/drivers/isdn/eicon/eicon_mod.c @@ -1,4 +1,4 @@ -/* $Id: eicon_mod.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_mod.c,v 1.44 2001/11/20 09:48:25 armin Exp $ @@ -3268,10 +3158,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c #endif /* MODULE */ -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.c -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c +--- a/drivers/isdn/eicon/eicon_pci.c ++++ b/drivers/isdn/eicon/eicon_pci.c @@ -1,4 +1,4 @@ -/* $Id: eicon_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_pci.c,v 1.18 2001/09/24 13:22:47 kai Exp $ @@ -3287,20 +3175,16 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c #if CONFIG_PCI /* intire stuff is only for PCI */ #ifdef CONFIG_ISDN_DRV_EICON_PCI -Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.h -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h +--- a/drivers/isdn/eicon/eicon_pci.h ++++ b/drivers/isdn/eicon/eicon_pci.h @@ -1,4 +1,4 @@ -/* $Id: eicon_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: eicon_pci.h,v 1.7 2001/09/24 13:22:47 kai Exp $ * * ISDN low-level module for Eicon active ISDN-Cards (PCI part). * -Index: linux-2.4.35.4/drivers/isdn/eicon/fourbri.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/fourbri.c -+++ linux-2.4.35.4/drivers/isdn/eicon/fourbri.c +--- a/drivers/isdn/eicon/fourbri.c ++++ b/drivers/isdn/eicon/fourbri.c @@ -337,8 +337,7 @@ static int diva_server_4bri_load(card_t static int diva_server_4bri_start(card_t *card, byte *channels) { @@ -3311,10 +3195,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/fourbri.c int adapter_num; DPRINTF(("divas: start Diva Server 4BRI")); -Index: linux-2.4.35.4/drivers/isdn/eicon/kprintf.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/kprintf.c -+++ linux-2.4.35.4/drivers/isdn/eicon/kprintf.c +--- a/drivers/isdn/eicon/kprintf.c ++++ b/drivers/isdn/eicon/kprintf.c @@ -18,6 +18,468 @@ #include "divalog.h" #include "uxio.h" @@ -3793,10 +3675,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/kprintf.c va_end(argptr); -Index: linux-2.4.35.4/drivers/isdn/eicon/lincfg.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/lincfg.c -+++ linux-2.4.35.4/drivers/isdn/eicon/lincfg.c +--- a/drivers/isdn/eicon/lincfg.c ++++ b/drivers/isdn/eicon/lincfg.c @@ -26,6 +26,9 @@ #include "uxio.h" @@ -3807,10 +3687,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/lincfg.c #include <linux/kernel.h> #include <linux/ioport.h> -Index: linux-2.4.35.4/drivers/isdn/eicon/linchr.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/linchr.c -+++ linux-2.4.35.4/drivers/isdn/eicon/linchr.c +--- a/drivers/isdn/eicon/linchr.c ++++ b/drivers/isdn/eicon/linchr.c @@ -154,17 +154,17 @@ ssize_t do_read(struct file *pFile, char klog_t *pHeadItem; @@ -3834,10 +3712,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/linchr.c kfree(pHeadItem); return sizeof(klog_t); } -Index: linux-2.4.35.4/drivers/isdn/eicon/linio.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/linio.c -+++ linux-2.4.35.4/drivers/isdn/eicon/linio.c +--- a/drivers/isdn/eicon/linio.c ++++ b/drivers/isdn/eicon/linio.c @@ -15,6 +15,7 @@ #include <linux/slab.h> #include <linux/pci.h> @@ -3846,10 +3722,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/linio.c #undef N_DATA #include "uxio.h" -Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/Makefile -+++ linux-2.4.35.4/drivers/isdn/hisax/Makefile +--- a/drivers/isdn/hisax/Makefile ++++ b/drivers/isdn/hisax/Makefile @@ -4,20 +4,17 @@ O_TARGET := vmlinux-obj.o @@ -3913,10 +3787,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?) CFLAGS_cert.o := -DCERTIFICATION=$(CERT) -Index: linux-2.4.35.4/drivers/isdn/hisax/amd7930.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/amd7930.c ++++ b/drivers/isdn/hisax/amd7930.c @@ -0,0 +1,755 @@ +/* $Id: amd7930.c,v 1.8 2001/09/24 13:22:55 kai Exp $ + * @@ -4673,30 +4545,24 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/amd7930.c + + return (1); +} -Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.c -+++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.c +--- a/drivers/isdn/hisax/arcofi.c ++++ b/drivers/isdn/hisax/arcofi.c @@ -1,4 +1,4 @@ -/* $Id: arcofi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: arcofi.c,v 1.14 2001/09/24 13:22:55 kai Exp $ * * Ansteuerung ARCOFI 2165 * -Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.h -+++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.h +--- a/drivers/isdn/hisax/arcofi.h ++++ b/drivers/isdn/hisax/arcofi.h @@ -1,4 +1,4 @@ -/* $Id: arcofi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ * * Ansteuerung ARCOFI 2165 * -Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/asuscom.c -+++ linux-2.4.35.4/drivers/isdn/hisax/asuscom.c +--- a/drivers/isdn/hisax/asuscom.c ++++ b/drivers/isdn/hisax/asuscom.c @@ -1,4 +1,4 @@ -/* $Id: asuscom.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: asuscom.c,v 1.14 2001/09/24 13:22:55 kai Exp $ @@ -4795,10 +4661,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c bytecnt = 8; cs->hw.asus.cfg_reg = card->para[1]; cs->irq = card->para[0]; -Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1.c -+++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c +--- a/drivers/isdn/hisax/avm_a1.c ++++ b/drivers/isdn/hisax/avm_a1.c @@ -1,4 +1,4 @@ -/* $Id: avm_a1.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: avm_a1.c,v 2.15 2001/09/24 13:22:55 kai Exp $ @@ -4814,10 +4678,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c #define AVM_A1_STAT_ISAC 0x01 #define AVM_A1_STAT_HSCX 0x02 -Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1p.c -+++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c +--- a/drivers/isdn/hisax/avm_a1p.c ++++ b/drivers/isdn/hisax/avm_a1p.c @@ -1,4 +1,4 @@ -/* $Id: avm_a1p.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: avm_a1p.c,v 2.9 2001/09/24 13:22:55 kai Exp $ @@ -4833,10 +4695,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c static inline u_char ReadISAC(struct IsdnCardState *cs, u_char offset) -Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_pci.c -+++ linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c +--- a/drivers/isdn/hisax/avm_pci.c ++++ b/drivers/isdn/hisax/avm_pci.c @@ -1,4 +1,4 @@ -/* $Id: avm_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: avm_pci.c,v 1.29 2001/09/24 13:22:55 kai Exp $ @@ -4953,10 +4813,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10; if (check_region((cs->hw.avm.cfg_reg), 32)) { printk(KERN_WARNING -Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a4t.c -+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c +--- a/drivers/isdn/hisax/bkm_a4t.c ++++ b/drivers/isdn/hisax/bkm_a4t.c @@ -1,4 +1,4 @@ -/* $Id: bkm_a4t.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: bkm_a4t.c,v 1.22 2001/09/24 13:22:55 kai Exp $ @@ -4994,10 +4852,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c cs->irq = dev_a4t->irq; break; } -Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a8.c -+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c +--- a/drivers/isdn/hisax/bkm_a8.c ++++ b/drivers/isdn/hisax/bkm_a8.c @@ -1,4 +1,4 @@ -/* $Id: bkm_a8.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: bkm_a8.c,v 1.22 2001/09/24 13:22:55 kai Exp $ @@ -5047,20 +4903,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c } #endif /* End HACK */ } -Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_ax.h -+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h +--- a/drivers/isdn/hisax/bkm_ax.h ++++ b/drivers/isdn/hisax/bkm_ax.h @@ -1,4 +1,4 @@ -/* $Id: bkm_ax.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ * * low level decls for T-Berkom cards A4T and Scitel Quadro (4*S0, passive) * -Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/callc.c -+++ linux-2.4.35.4/drivers/isdn/hisax/callc.c +--- a/drivers/isdn/hisax/callc.c ++++ b/drivers/isdn/hisax/callc.c @@ -1,4 +1,4 @@ -/* $Id: callc.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: callc.c,v 2.59 2002/02/09 21:19:11 keil Exp $ @@ -5153,20 +5005,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c case (CC_PROGRESS | INDICATION): case (CC_NOTIFY | INDICATION): break; -Index: linux-2.4.35.4/drivers/isdn/hisax/cert.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/cert.c -+++ linux-2.4.35.4/drivers/isdn/hisax/cert.c +--- a/drivers/isdn/hisax/cert.c ++++ b/drivers/isdn/hisax/cert.c @@ -1,4 +1,4 @@ -/* $Id: cert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: cert.c,v 2.6 2001/09/24 13:22:56 kai Exp $ * * Author Karsten Keil * Copyright by Karsten Keil <keil@isdn4linux.de> -Index: linux-2.4.35.4/drivers/isdn/hisax/config.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/config.c -+++ linux-2.4.35.4/drivers/isdn/hisax/config.c +--- a/drivers/isdn/hisax/config.c ++++ b/drivers/isdn/hisax/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.1.4.5 2001/12/09 19:19:26 kai Exp $ +/* $Id: config.c,v 2.84 2002/08/13 09:55:29 keil Exp $ @@ -5656,10 +5504,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c -EXPORT_SYMBOL(FsmInitTimer); -EXPORT_SYMBOL(FsmDelTimer); -EXPORT_SYMBOL(FsmRestartTimer); -Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/diva.c -+++ linux-2.4.35.4/drivers/isdn/hisax/diva.c +--- a/drivers/isdn/hisax/diva.c ++++ b/drivers/isdn/hisax/diva.c @@ -1,4 +1,4 @@ -/* $Id: diva.c,v 1.1.4.2 2002/08/30 11:21:00 keil Exp $ +/* $Id: diva.c,v 1.33 2001/09/24 13:22:56 kai Exp $ @@ -6080,10 +5926,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c } else { /* DIVA 2.0 */ cs->hw.diva.tl.function = (void *) diva_led_handler; cs->hw.diva.tl.data = (long) cs; -Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa.c -+++ linux-2.4.35.4/drivers/isdn/hisax/elsa.c +--- a/drivers/isdn/hisax/elsa.c ++++ b/drivers/isdn/hisax/elsa.c @@ -1,4 +1,4 @@ -/* $Id: elsa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: elsa.c,v 2.32 2001/09/24 13:22:56 kai Exp $ @@ -6229,10 +6073,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c case ELSA_QS3000PCI: bytecnt = 16; break; -Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_cs.c -+++ linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c +--- a/drivers/isdn/hisax/elsa_cs.c ++++ b/drivers/isdn/hisax/elsa_cs.c @@ -72,7 +72,7 @@ static int pc_debug = PCMCIA_DEBUG; MODULE_PARM(pc_debug, "i"); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); @@ -6242,10 +6084,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c #else #define DEBUG(n, args...) #endif -Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_ser.c -+++ linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c +--- a/drivers/isdn/hisax/elsa_ser.c ++++ b/drivers/isdn/hisax/elsa_ser.c @@ -1,4 +1,4 @@ -/* $Id: elsa_ser.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: elsa_ser.c,v 2.14 2001/09/24 13:22:56 kai Exp $ @@ -6327,10 +6167,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs) { -Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.c -+++ linux-2.4.35.4/drivers/isdn/hisax/fsm.c +--- a/drivers/isdn/hisax/fsm.c ++++ b/drivers/isdn/hisax/fsm.c @@ -1,4 +1,4 @@ -/* $Id: fsm.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ @@ -6352,20 +6190,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.c int __init FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount) { -Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.h -+++ linux-2.4.35.4/drivers/isdn/hisax/fsm.h +--- a/drivers/isdn/hisax/fsm.h ++++ b/drivers/isdn/hisax/fsm.h @@ -1,4 +1,4 @@ -/* $Id: fsm.h,v 1.1.2.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ * * Finite state machine * -Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/gazel.c -+++ linux-2.4.35.4/drivers/isdn/hisax/gazel.c +--- a/drivers/isdn/hisax/gazel.c ++++ b/drivers/isdn/hisax/gazel.c @@ -1,4 +1,4 @@ -/* $Id: gazel.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: gazel.c,v 2.19 2001/09/24 13:22:56 kai Exp $ @@ -6395,10 +6229,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c found = 1; } if (found) -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c +--- a/drivers/isdn/hisax/hfc_2bds0.c ++++ b/drivers/isdn/hisax/hfc_2bds0.c @@ -1,4 +1,4 @@ -/* $Id: hfc_2bds0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_2bds0.c,v 1.18 2001/09/24 13:22:56 kai Exp $ @@ -6477,40 +6309,32 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c } unsigned int __init -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h +--- a/drivers/isdn/hisax/hfc_2bds0.h ++++ b/drivers/isdn/hisax/hfc_2bds0.h @@ -1,4 +1,4 @@ -/* $Id: hfc_2bds0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_2bds0.h,v 1.6 2001/09/24 13:22:56 kai Exp $ * * specific defines for CCD's HFC 2BDS0 * -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c +--- a/drivers/isdn/hisax/hfc_2bs0.c ++++ b/drivers/isdn/hisax/hfc_2bs0.c @@ -1,4 +1,4 @@ -/* $Id: hfc_2bs0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_2bs0.c,v 1.20 2001/09/24 13:22:56 kai Exp $ * * specific routines for CCD's HFC 2BS0 * -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h +--- a/drivers/isdn/hisax/hfc_2bs0.h ++++ b/drivers/isdn/hisax/hfc_2bs0.h @@ -1,4 +1,4 @@ -/* $Id: hfc_2bs0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_2bs0.h,v 1.5 2001/09/24 13:22:56 kai Exp $ * * specific defines for CCD's HFC 2BS0 * -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c +--- a/drivers/isdn/hisax/hfc_pci.c ++++ b/drivers/isdn/hisax/hfc_pci.c @@ -1,4 +1,4 @@ -/* $Id: hfc_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_pci.c,v 1.48 2001/09/24 13:22:56 kai Exp $ @@ -6632,20 +6456,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c (((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000; pcibios_write_config_dword(cs->hw.hfcpci.pci_bus, cs->hw.hfcpci.pci_device_fn, 0x80, -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h +--- a/drivers/isdn/hisax/hfc_pci.h ++++ b/drivers/isdn/hisax/hfc_pci.h @@ -1,4 +1,4 @@ -/* $Id: hfc_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_pci.h,v 1.10 2001/09/24 13:22:56 kai Exp $ * * specific defines for CCD's HFC 2BDS0 PCI chips * -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c +--- a/drivers/isdn/hisax/hfc_sx.c ++++ b/drivers/isdn/hisax/hfc_sx.c @@ -1,4 +1,4 @@ -/* $Id: hfc_sx.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfc_sx.c,v 1.12 2001/09/24 13:22:56 kai Exp $ @@ -6776,20 +6596,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c + + + -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h +--- a/drivers/isdn/hisax/hfc_sx.h ++++ b/drivers/isdn/hisax/hfc_sx.h @@ -1,4 +1,4 @@ -/* $Id: hfc_sx.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id$ * * specific defines for CCD's HFC 2BDS0 S+,SP chips * -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c ++++ b/drivers/isdn/hisax/hfc_usb.c @@ -0,0 +1,1189 @@ +/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $ + * @@ -7980,10 +7796,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c + +module_init(hfc_usb_init); +module_exit(hfc_usb_exit); -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c ++++ b/drivers/isdn/hisax/hfc_usbr.c @@ -0,0 +1,471 @@ +/* $Id: hfc_usbr.c,v 2.5 2001/07/06 21:30:11 werner Exp $ + @@ -8456,10 +8270,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c + cs->cardmsg = &hfcusb_card_msg; + return (1); /* success */ +} -Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfcscard.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c +--- a/drivers/isdn/hisax/hfcscard.c ++++ b/drivers/isdn/hisax/hfcscard.c @@ -1,4 +1,4 @@ -/* $Id: hfcscard.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ +/* $Id: hfcscard.c,v 1.10 2001/09/24 13:22:56 kai Exp $ @@ -8566,10 +8378,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c cs->hw.hfcD.addr = card->para[1] & 0xfffe; cs->irq = card->para[0]; cs->hw.hfcD.cip = 0; -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax.h +--- a/drivers/isdn/hisax/hisax.h ++++ b/drivers/isdn/hisax/hisax.h @@ -1,4 +1,4 @@ -/* $Id: hisax.h,v 1.1.4.2 2001/12/09 19:15:28 kai Exp $ +/* $Id: hisax.h,v 2.64 2001/09/24 13:22:56 kai Exp $ @@ -8686,10 +8496,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h #define TEI_PER_CARD 1 /* L1 Debug */ -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_debug.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h +--- a/drivers/isdn/hisax/hisax_debug.h ++++ b/drivers/isdn/hisax/hisax_debug.h @@ -28,7 +28,7 @@ #define DBG(level, format, arg...) do { \ @@ -8699,10 +8507,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h } while (0) #define DBG_PACKET(level,data,count) \ -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c +--- a/drivers/isdn/hisax/hisax_fcpcipnp.c ++++ b/drivers/isdn/hisax/hisax_fcpcipnp.c @@ -20,22 +20,19 @@ * * o POWER PC @@ -9138,10 +8944,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c +#ifdef __ISAPNP__ +#include "hisax_isapnp.c" +#endif -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h +--- a/drivers/isdn/hisax/hisax_fcpcipnp.h ++++ b/drivers/isdn/hisax/hisax_fcpcipnp.h @@ -43,10 +43,12 @@ struct fritz_bcs { }; @@ -9156,10 +8960,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h struct isac isac; struct fritz_bcs bcs[2]; -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c +--- a/drivers/isdn/hisax/hisax_isac.c ++++ b/drivers/isdn/hisax/hisax_isac.c @@ -34,7 +34,7 @@ static int debug = 1; MODULE_PARM(debug, "i"); @@ -9265,10 +9067,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c module_init(hisax_isac_init); module_exit(hisax_isac_exit); -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h +--- a/drivers/isdn/hisax/hisax_isac.h ++++ b/drivers/isdn/hisax/hisax_isac.h @@ -8,7 +8,7 @@ #define TIMER3_VALUE 7000 #define MAX_DFRAME_LEN_L1 300 @@ -9290,10 +9090,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h +void isacsx_interrupt(struct isac *isac); #endif -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c ++++ b/drivers/isdn/hisax/hisax_isapnp.c @@ -0,0 +1,105 @@ +// FIXME copied +static const struct isapnp_device_id * @@ -9400,10 +9198,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c + } +} + -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h ++++ b/drivers/isdn/hisax/hisax_isapnp.h @@ -0,0 +1,33 @@ +#ifndef __HISAX_ISAPNP_H__ +#define __HISAX_ISAPNP_H__ @@ -9438,10 +9234,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h +#endif + +#endif -Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h ++++ b/drivers/isdn/hisax/hisax_loadable.h @@ -0,0 +1,74 @@ +/* $Id: hisax_loadable.h,v 2.1 2001/06/08 22:19:16 werner Exp $ + * @@ -9517,90 +9311,72 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h +/* definition of the register function */ +/***************************************/ +extern int hisax_register_hfcusb(struct hisax_drvreg *l1drv); -Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hscx.c +--- a/drivers/isdn/hisax/hscx.c ++++ b/drivers/isdn/hisax/hscx.c @@ -1,4 +1,4 @@ -/* $Id: hscx.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: hscx.c,v 1.24 2001/09/24 13:22:56 kai Exp $ * * HSCX specific routines * -Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.h -+++ linux-2.4.35.4/drivers/isdn/hisax/hscx.h +--- a/drivers/isdn/hisax/hscx.h ++++ b/drivers/isdn/hisax/hscx.h @@ -1,4 +1,4 @@ -/* $Id: hscx.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: hscx.h,v 1.8 2001/09/24 13:22:56 kai Exp $ * * HSCX specific defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx_irq.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c +--- a/drivers/isdn/hisax/hscx_irq.c ++++ b/drivers/isdn/hisax/hscx_irq.c @@ -1,4 +1,4 @@ -/* $Id: hscx_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: hscx_irq.c,v 1.18 2001/09/24 13:22:56 kai Exp $ * * low level b-channel stuff for Siemens HSCX * -Index: linux-2.4.35.4/drivers/isdn/hisax/icc.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.c -+++ linux-2.4.35.4/drivers/isdn/hisax/icc.c +--- a/drivers/isdn/hisax/icc.c ++++ b/drivers/isdn/hisax/icc.c @@ -1,4 +1,4 @@ -/* $Id: icc.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: icc.c,v 1.8 2001/09/24 13:22:56 kai Exp $ * * ICC specific routines * -Index: linux-2.4.35.4/drivers/isdn/hisax/icc.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.h -+++ linux-2.4.35.4/drivers/isdn/hisax/icc.h +--- a/drivers/isdn/hisax/icc.h ++++ b/drivers/isdn/hisax/icc.h @@ -1,4 +1,4 @@ -/* $Id: icc.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: icc.h,v 1.4 2001/09/24 13:22:56 kai Exp $ * * ICC specific routines * -Index: linux-2.4.35.4/drivers/isdn/hisax/ipac.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/ipac.h -+++ linux-2.4.35.4/drivers/isdn/hisax/ipac.h +--- a/drivers/isdn/hisax/ipac.h ++++ b/drivers/isdn/hisax/ipac.h @@ -1,4 +1,4 @@ -/* $Id: ipac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: ipac.h,v 1.7 2001/09/24 13:22:56 kai Exp $ * * IPAC specific defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/isac.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.c -+++ linux-2.4.35.4/drivers/isdn/hisax/isac.c +--- a/drivers/isdn/hisax/isac.c ++++ b/drivers/isdn/hisax/isac.c @@ -1,4 +1,4 @@ -/* $Id: isac.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isac.c,v 1.31 2001/09/24 13:22:56 kai Exp $ * * ISAC specific routines * -Index: linux-2.4.35.4/drivers/isdn/hisax/isac.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.h -+++ linux-2.4.35.4/drivers/isdn/hisax/isac.h +--- a/drivers/isdn/hisax/isac.h ++++ b/drivers/isdn/hisax/isac.h @@ -1,4 +1,4 @@ -/* $Id: isac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isac.h,v 1.9 2001/09/24 13:22:56 kai Exp $ * * ISAC specific defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.c -+++ linux-2.4.35.4/drivers/isdn/hisax/isar.c +--- a/drivers/isdn/hisax/isar.c ++++ b/drivers/isdn/hisax/isar.c @@ -1,4 +1,4 @@ -/* $Id: isar.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isar.c,v 1.22 2001/09/23 12:00:05 keil Exp $ @@ -10004,10 +9780,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c default: printk(KERN_DEBUG "HiSax: invalid ioctl %d\n", (int) ic->arg); -Index: linux-2.4.35.4/drivers/isdn/hisax/isar.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.h -+++ linux-2.4.35.4/drivers/isdn/hisax/isar.h +--- a/drivers/isdn/hisax/isar.h ++++ b/drivers/isdn/hisax/isar.h @@ -1,4 +1,4 @@ -/* $Id: isar.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isar.h,v 1.11 2001/09/24 13:22:56 kai Exp $ @@ -10043,10 +9817,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.h extern int ISARVersion(struct IsdnCardState *cs, char *s); extern void isar_int_main(struct IsdnCardState *cs); extern void initisar(struct IsdnCardState *cs); -Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.c -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c +--- a/drivers/isdn/hisax/isdnl1.c ++++ b/drivers/isdn/hisax/isdnl1.c @@ -1,4 +1,4 @@ -/* $Id: isdnl1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isdnl1.c,v 2.46 2001/09/24 13:22:56 kai Exp $ @@ -10062,20 +9834,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c #define __NO_VERSION__ #include <linux/init.h> -Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.h -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h +--- a/drivers/isdn/hisax/isdnl1.h ++++ b/drivers/isdn/hisax/isdnl1.h @@ -1,4 +1,4 @@ -/* $Id: isdnl1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isdnl1.h,v 2.12 2001/09/24 13:22:56 kai Exp $ * * Layer 1 defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.c -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c +--- a/drivers/isdn/hisax/isdnl2.c ++++ b/drivers/isdn/hisax/isdnl2.c @@ -1,4 +1,4 @@ -/* $Id: isdnl2.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isdnl2.c,v 2.30 2001/09/24 13:22:56 kai Exp $ @@ -10101,20 +9869,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c } static void -Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.h -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h +--- a/drivers/isdn/hisax/isdnl2.h ++++ b/drivers/isdn/hisax/isdnl2.h @@ -1,4 +1,4 @@ -/* $Id: isdnl2.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id$ * * Layer 2 defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.c -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c +--- a/drivers/isdn/hisax/isdnl3.c ++++ b/drivers/isdn/hisax/isdnl3.c @@ -1,4 +1,4 @@ -/* $Id: isdnl3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isdnl3.c,v 2.22 2001/09/24 13:22:56 kai Exp $ @@ -10130,20 +9894,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c static struct Fsm l3fsm; -Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.h -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h +--- a/drivers/isdn/hisax/isdnl3.h ++++ b/drivers/isdn/hisax/isdnl3.h @@ -1,4 +1,4 @@ -/* $Id: isdnl3.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id$ * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isurf.c -+++ linux-2.4.35.4/drivers/isdn/hisax/isurf.c +--- a/drivers/isdn/hisax/isurf.c ++++ b/drivers/isdn/hisax/isurf.c @@ -1,4 +1,4 @@ -/* $Id: isurf.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: isurf.c,v 1.12 2001/09/24 13:22:56 kai Exp $ @@ -10263,10 +10023,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c printk(KERN_INFO "ISurf: defined at 0x%x 0x%lx IRQ %d\n", cs->hw.isurf.reset, -Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/ix1_micro.c -+++ linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c +--- a/drivers/isdn/hisax/ix1_micro.c ++++ b/drivers/isdn/hisax/ix1_micro.c @@ -1,4 +1,4 @@ -/* $Id: ix1_micro.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: ix1_micro.c,v 2.12 2001/09/24 13:22:56 kai Exp $ @@ -10357,40 +10115,32 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c /* IO-Ports */ cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET; cs->hw.ix1.hscx_ale = card->para[1] + HSCX_COMMAND_OFFSET; -Index: linux-2.4.35.4/drivers/isdn/hisax/jade.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.c -+++ linux-2.4.35.4/drivers/isdn/hisax/jade.c +--- a/drivers/isdn/hisax/jade.c ++++ b/drivers/isdn/hisax/jade.c @@ -1,4 +1,4 @@ -/* $Id: jade.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: jade.c,v 1.9 2001/09/24 13:22:56 kai Exp $ * * JADE stuff (derived from original hscx.c) * -Index: linux-2.4.35.4/drivers/isdn/hisax/jade.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.h -+++ linux-2.4.35.4/drivers/isdn/hisax/jade.h +--- a/drivers/isdn/hisax/jade.h ++++ b/drivers/isdn/hisax/jade.h @@ -1,4 +1,4 @@ -/* $Id: jade.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: jade.h,v 1.5 2001/09/24 13:22:56 kai Exp $ * * JADE specific defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade_irq.c -+++ linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c +--- a/drivers/isdn/hisax/jade_irq.c ++++ b/drivers/isdn/hisax/jade_irq.c @@ -1,4 +1,4 @@ -/* $Id: jade_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: jade_irq.c,v 1.7 2001/09/24 13:22:56 kai Exp $ * * Low level JADE IRQ stuff (derived from original hscx_irq.c) * -Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.c -+++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c +--- a/drivers/isdn/hisax/l3_1tr6.c ++++ b/drivers/isdn/hisax/l3_1tr6.c @@ -1,4 +1,4 @@ -/* $Id: l3_1tr6.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: l3_1tr6.c,v 2.15 2001/09/24 13:22:56 kai Exp $ @@ -10406,20 +10156,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c #define MsgHead(ptr, cref, mty, dis) \ *ptr++ = dis; \ -Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.h -+++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h +--- a/drivers/isdn/hisax/l3_1tr6.h ++++ b/drivers/isdn/hisax/l3_1tr6.h @@ -1,4 +1,4 @@ -/* $Id: l3_1tr6.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id$ * * German 1TR6 D-channel protocol defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.c -+++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c +--- a/drivers/isdn/hisax/l3dss1.c ++++ b/drivers/isdn/hisax/l3dss1.c @@ -1,4 +1,4 @@ -/* $Id: l3dss1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: l3dss1.c,v 2.32 2001/09/24 13:22:56 kai Exp $ @@ -10435,20 +10181,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c #define EXT_BEARER_CAPS 1 -Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.h -+++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h +--- a/drivers/isdn/hisax/l3dss1.h ++++ b/drivers/isdn/hisax/l3dss1.h @@ -1,4 +1,4 @@ -/* $Id: l3dss1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id$ * * DSS1 (Euro) D-channel protocol defines * -Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.c -+++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c +--- a/drivers/isdn/hisax/l3ni1.c ++++ b/drivers/isdn/hisax/l3ni1.c @@ -1,4 +1,4 @@ -/* $Id: l3ni1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: l3ni1.c,v 2.8 2001/09/24 13:22:56 kai Exp $ @@ -10464,30 +10206,24 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c #define EXT_BEARER_CAPS 1 -Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.h -+++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h +--- a/drivers/isdn/hisax/l3ni1.h ++++ b/drivers/isdn/hisax/l3ni1.h @@ -1,4 +1,4 @@ -/* $Id: l3ni1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id$ * * NI1 D-channel protocol * -Index: linux-2.4.35.4/drivers/isdn/hisax/lmgr.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/lmgr.c -+++ linux-2.4.35.4/drivers/isdn/hisax/lmgr.c +--- a/drivers/isdn/hisax/lmgr.c ++++ b/drivers/isdn/hisax/lmgr.c @@ -1,4 +1,4 @@ -/* $Id: lmgr.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id$ * * Layermanagement module * -Index: linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/md5sums.asc -+++ linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc +--- a/drivers/isdn/hisax/md5sums.asc ++++ b/drivers/isdn/hisax/md5sums.asc @@ -1,33 +1,22 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 @@ -10538,10 +10274,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc -GIKgAEdRLzERmpt/bCCwAbY= -=FaHw ------END PGP SIGNATURE----- -Index: linux-2.4.35.4/drivers/isdn/hisax/mic.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/mic.c -+++ linux-2.4.35.4/drivers/isdn/hisax/mic.c +--- a/drivers/isdn/hisax/mic.c ++++ b/drivers/isdn/hisax/mic.c @@ -1,4 +1,4 @@ -/* $Id: mic.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: mic.c,v 1.12 2001/09/24 13:22:56 kai Exp $ @@ -10557,10 +10291,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/mic.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.c -+++ linux-2.4.35.4/drivers/isdn/hisax/netjet.c +--- a/drivers/isdn/hisax/netjet.c ++++ b/drivers/isdn/hisax/netjet.c @@ -1,4 +1,4 @@ -/* $Id: netjet.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: netjet.c,v 1.29 2001/09/24 13:22:56 kai Exp $ @@ -10640,20 +10372,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): -Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.h -+++ linux-2.4.35.4/drivers/isdn/hisax/netjet.h +--- a/drivers/isdn/hisax/netjet.h ++++ b/drivers/isdn/hisax/netjet.h @@ -1,4 +1,4 @@ -/* $Id: netjet.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: netjet.h,v 2.8 2001/09/24 13:22:56 kai Exp $ * * NETjet common header file * -Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/niccy.c -+++ linux-2.4.35.4/drivers/isdn/hisax/niccy.c +--- a/drivers/isdn/hisax/niccy.c ++++ b/drivers/isdn/hisax/niccy.c @@ -1,4 +1,4 @@ -/* $Id: niccy.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: niccy.c,v 1.21 2001/10/20 22:05:00 kai Exp $ @@ -10739,10 +10467,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c if (!pci_ioaddr) { printk(KERN_WARNING "Niccy: No IO-Adr for PCI card found\n"); return(0); -Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_s.c -+++ linux-2.4.35.4/drivers/isdn/hisax/nj_s.c +--- a/drivers/isdn/hisax/nj_s.c ++++ b/drivers/isdn/hisax/nj_s.c @@ -1,4 +1,4 @@ -/* $Id: nj_s.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: nj_s.c,v 2.13 2001/09/24 13:22:56 kai Exp $ @@ -10800,10 +10526,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c cs->readisac = &NETjet_ReadIC; cs->writeisac = &NETjet_WriteIC; cs->readisacfifo = &NETjet_ReadICfifo; -Index: linux-2.4.35.4/drivers/isdn/hisax/nj_u.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_u.c -+++ linux-2.4.35.4/drivers/isdn/hisax/nj_u.c +--- a/drivers/isdn/hisax/nj_u.c ++++ b/drivers/isdn/hisax/nj_u.c @@ -1,4 +1,4 @@ -/* $Id: nj_u.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: nj_u.c,v 2.14 2001/09/24 13:22:56 kai Exp $ @@ -10833,10 +10557,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_u.c if (!cs->hw.njet.base) { printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); return(0); -Index: linux-2.4.35.4/drivers/isdn/hisax/q931.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/q931.c -+++ linux-2.4.35.4/drivers/isdn/hisax/q931.c +--- a/drivers/isdn/hisax/q931.c ++++ b/drivers/isdn/hisax/q931.c @@ -1,4 +1,4 @@ -/* $Id: q931.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: q931.c,v 1.12 2001/09/24 13:22:56 kai Exp $ @@ -10875,10 +10597,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/q931.c static int prbits(char *dest, u_char b, int start, int len) -Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c ++++ b/drivers/isdn/hisax/rawhdlc.c @@ -0,0 +1,543 @@ +/* $Id: rawhdlc.c,v 1.7 2001/09/24 13:22:57 kai Exp $ + * @@ -11423,10 +11143,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c +} + +#endif -Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h ++++ b/drivers/isdn/hisax/rawhdlc.h @@ -0,0 +1,28 @@ +/* $Id: rawhdlc.h,v 1.5 2001/09/24 13:22:57 kai Exp $ + * @@ -11456,10 +11174,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h + u_char *src, u_int slen, u_char *dst, u_int dsize); +#define RAWHDLC_H +#endif -Index: linux-2.4.35.4/drivers/isdn/hisax/s0box.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/s0box.c -+++ linux-2.4.35.4/drivers/isdn/hisax/s0box.c +--- a/drivers/isdn/hisax/s0box.c ++++ b/drivers/isdn/hisax/s0box.c @@ -1,4 +1,4 @@ -/* $Id: s0box.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: s0box.c,v 2.6 2001/09/24 13:22:57 kai Exp $ @@ -11475,10 +11191,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/s0box.c static inline void writereg(unsigned int padr, signed int addr, u_char off, u_char val) { -Index: linux-2.4.35.4/drivers/isdn/hisax/saphir.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/saphir.c -+++ linux-2.4.35.4/drivers/isdn/hisax/saphir.c +--- a/drivers/isdn/hisax/saphir.c ++++ b/drivers/isdn/hisax/saphir.c @@ -1,4 +1,4 @@ -/* $Id: saphir.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: saphir.c,v 1.10 2001/09/24 13:22:57 kai Exp $ @@ -11494,10 +11208,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/saphir.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/sedlbauer.c -+++ linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c +--- a/drivers/isdn/hisax/sedlbauer.c ++++ b/drivers/isdn/hisax/sedlbauer.c @@ -1,4 +1,4 @@ -/* $Id: sedlbauer.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: sedlbauer.c,v 1.34 2002/02/09 21:00:57 keil Exp $ @@ -11664,10 +11376,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c /* In case of the sedlbauer pcmcia card, this region is in use, * reserved for us by the card manager. So we do not check it * here, it would fail. -Index: linux-2.4.35.4/drivers/isdn/hisax/sportster.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/sportster.c -+++ linux-2.4.35.4/drivers/isdn/hisax/sportster.c +--- a/drivers/isdn/hisax/sportster.c ++++ b/drivers/isdn/hisax/sportster.c @@ -1,4 +1,4 @@ -/* $Id: sportster.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: sportster.c,v 1.16 2001/09/24 13:22:57 kai Exp $ @@ -11683,10 +11393,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sportster.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -Index: linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h ++++ b/drivers/isdn/hisax/st5481-debug.h @@ -0,0 +1,103 @@ +#define ST5481_DEBUG 0x0 + @@ -11791,10 +11499,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h + + + -Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481.h -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481.h +--- a/drivers/isdn/hisax/st5481.h ++++ b/drivers/isdn/hisax/st5481.h @@ -219,15 +219,15 @@ enum { #define L1_EVENT_COUNT (EV_TIMER3 + 1) @@ -11894,10 +11600,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h { int i,j; int len,ofs; -Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_b.c -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c +--- a/drivers/isdn/hisax/st5481_b.c ++++ b/drivers/isdn/hisax/st5481_b.c @@ -67,28 +67,24 @@ static void usb_b_out(struct st5481_bcs bytes_sent = buf_size - len; if (skb->len < bytes_sent) @@ -11975,10 +11679,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c { DBG(4,""); -Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_d.c -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c +--- a/drivers/isdn/hisax/st5481_d.c ++++ b/drivers/isdn/hisax/st5481_d.c @@ -162,8 +162,8 @@ static struct FsmNode L1FnList[] __initd {ST_L1_F8, EV_TIMER3, l1_timer3}, {ST_L1_F8, EV_IND_DP, l1_go_f3}, @@ -12061,10 +11763,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c { DBG(2,""); -Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_init.c -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c +--- a/drivers/isdn/hisax/st5481_init.c ++++ b/drivers/isdn/hisax/st5481_init.c @@ -14,6 +14,7 @@ * TODO: * @@ -12082,10 +11782,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c id_table: st5481_ids, }; -Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_usb.c -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c +--- a/drivers/isdn/hisax/st5481_usb.c ++++ b/drivers/isdn/hisax/st5481_usb.c @@ -41,9 +41,9 @@ static void usb_next_ctrl_msg(struct urb (unsigned char *)&ctrl->msg_fifo.data[r_index]; @@ -12228,10 +11926,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c st5481_usb_device_ctrl_msg(in->adapter, in->counter, in->packet_size, NULL, NULL); -Index: linux-2.4.35.4/drivers/isdn/hisax/tei.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/tei.c -+++ linux-2.4.35.4/drivers/isdn/hisax/tei.c +--- a/drivers/isdn/hisax/tei.c ++++ b/drivers/isdn/hisax/tei.c @@ -1,4 +1,4 @@ -/* $Id: tei.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: tei.c,v 2.20 2001/09/24 13:22:57 kai Exp $ @@ -12247,10 +11943,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/tei.c #define ID_REQUEST 1 #define ID_ASSIGNED 2 -Index: linux-2.4.35.4/drivers/isdn/hisax/teleint.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/teleint.c -+++ linux-2.4.35.4/drivers/isdn/hisax/teleint.c +--- a/drivers/isdn/hisax/teleint.c ++++ b/drivers/isdn/hisax/teleint.c @@ -1,4 +1,4 @@ -/* $Id: teleint.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: teleint.c,v 1.16 2001/09/24 13:22:57 kai Exp $ @@ -12266,10 +11960,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teleint.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/teles0.c -+++ linux-2.4.35.4/drivers/isdn/hisax/teles0.c +--- a/drivers/isdn/hisax/teles0.c ++++ b/drivers/isdn/hisax/teles0.c @@ -1,4 +1,4 @@ -/* $Id: teles0.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: teles0.c,v 2.15 2001/09/24 13:22:57 kai Exp $ @@ -12314,10 +12006,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c printk(KERN_INFO "HiSax: %s config irq:%d mem:0x%lX cfg:0x%X\n", CardType[cs->typ], cs->irq, -Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/teles3.c -+++ linux-2.4.35.4/drivers/isdn/hisax/teles3.c +--- a/drivers/isdn/hisax/teles3.c ++++ b/drivers/isdn/hisax/teles3.c @@ -1,4 +1,4 @@ -/* $Id: teles3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: teles3.c,v 2.19 2001/09/24 13:22:57 kai Exp $ @@ -12413,10 +12103,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c if (cs->typ == ISDN_CTYPE_16_3) { cs->hw.teles3.cfg_reg = card->para[1]; switch (cs->hw.teles3.cfg_reg) { -Index: linux-2.4.35.4/drivers/isdn/hisax/telespci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/telespci.c -+++ linux-2.4.35.4/drivers/isdn/hisax/telespci.c +--- a/drivers/isdn/hisax/telespci.c ++++ b/drivers/isdn/hisax/telespci.c @@ -1,4 +1,4 @@ -/* $Id: telespci.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: telespci.c,v 2.23 2001/09/24 13:22:57 kai Exp $ @@ -12448,10 +12136,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/telespci.c } else { printk(KERN_WARNING "TelesPCI: No PCI card found\n"); return(0); -Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.c -+++ linux-2.4.35.4/drivers/isdn/hisax/w6692.c +--- a/drivers/isdn/hisax/w6692.c ++++ b/drivers/isdn/hisax/w6692.c @@ -1,4 +1,4 @@ -/* $Id: w6692.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: w6692.c,v 1.18 2001/09/24 13:22:57 kai Exp $ @@ -12633,20 +12319,16 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c cs->hw.w6692.iobase); cs->readW6692 = &ReadW6692; -Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.h -+++ linux-2.4.35.4/drivers/isdn/hisax/w6692.h +--- a/drivers/isdn/hisax/w6692.h ++++ b/drivers/isdn/hisax/w6692.h @@ -1,4 +1,4 @@ -/* $Id: w6692.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ +/* $Id: w6692.h,v 1.4 2001/09/24 13:22:57 kai Exp $ * * Winbond W6692 specific defines * -Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c +--- a/drivers/isdn/hysdn/boardergo.c ++++ b/drivers/isdn/hysdn/boardergo.c @@ -1,27 +1,41 @@ -/* $Id: boardergo.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ - * @@ -12850,10 +12532,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((50 * HZ) / 1000); /* Timeout 50ms */ } /* wait until timeout */ -Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.h -+++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h +--- a/drivers/isdn/hysdn/boardergo.h ++++ b/drivers/isdn/hysdn/boardergo.h @@ -1,4 +1,4 @@ -/* $Id: boardergo.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -12868,10 +12548,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h /************************************************/ /* defines for the dual port memory of the card */ -Index: linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hycapi.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c +--- a/drivers/isdn/hysdn/hycapi.c ++++ b/drivers/isdn/hysdn/hycapi.c @@ -1,4 +1,4 @@ -/* $Id: hycapi.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -12887,10 +12565,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c unsigned int hycapi_enable = 0xffffffff; MODULE_PARM(hycapi_enable, "i"); -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_boot.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c +--- a/drivers/isdn/hysdn/hysdn_boot.c ++++ b/drivers/isdn/hysdn/hysdn_boot.c @@ -1,4 +1,4 @@ -/* $Id: hysdn_boot.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -12906,10 +12582,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c return (boot->last_error); /* error writing data */ if (boot->pof_recoffset + datlen >= boot->pof_reclen) -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_defs.h -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h +--- a/drivers/isdn/hysdn/hysdn_defs.h ++++ b/drivers/isdn/hysdn/hysdn_defs.h @@ -1,4 +1,4 @@ -/* $Id: hysdn_defs.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id: hysdn_defs.h,v 1.10 2001/09/24 13:23:03 kai Exp $ @@ -12936,10 +12610,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h /* boot process */ void *boot; /* pointer to boot private data */ -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_init.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c +--- a/drivers/isdn/hysdn/hysdn_init.c ++++ b/drivers/isdn/hysdn/hysdn_init.c @@ -1,4 +1,4 @@ -/* $Id: hysdn_init.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -12984,10 +12656,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c card->brdtype = BD_NONE; /* unknown */ card->debug_flags = DEF_DEB_FLAGS; /* set default debug */ card->faxchans = 0; /* default no fax channels */ -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_net.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c +--- a/drivers/isdn/hysdn/hysdn_net.c ++++ b/drivers/isdn/hysdn/hysdn_net.c @@ -1,4 +1,4 @@ -/* $Id: hysdn_net.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -13207,20 +12877,16 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c unregister_netdev(dev); /* release the device */ kfree(dev); /* release the memory allocated */ -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_pof.h -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h +--- a/drivers/isdn/hysdn/hysdn_pof.h ++++ b/drivers/isdn/hysdn/hysdn_pof.h @@ -1,4 +1,4 @@ -/* $Id: hysdn_pof.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Linux driver for HYSDN cards, definitions used for handling pof-files. * -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_procconf.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c +--- a/drivers/isdn/hysdn/hysdn_procconf.c ++++ b/drivers/isdn/hysdn/hysdn_procconf.c @@ -1,4 +1,4 @@ -/* $Id: hysdn_procconf.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -13417,10 +13083,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c hysdn_proclog_init(card); /* init the log file entry */ } card = card->next; /* next entry */ -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_proclog.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c +--- a/drivers/isdn/hysdn/hysdn_proclog.c ++++ b/drivers/isdn/hysdn/hysdn_proclog.c @@ -1,4 +1,4 @@ -/* $Id: hysdn_proclog.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -13604,10 +13268,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c } init_waitqueue_head(&(pd->rd_queue)); -Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_sched.c -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c +--- a/drivers/isdn/hysdn/hysdn_sched.c ++++ b/drivers/isdn/hysdn/hysdn_sched.c @@ -1,4 +1,4 @@ -/* $Id: hysdn_sched.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id: hysdn_sched.c,v 1.9 2001/09/24 13:23:03 kai Exp $ @@ -13691,10 +13353,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c if (card->debug_flags & LOG_SCHED_ASYN) hysdn_addlog(card, "async tx-cfg data send"); -Index: linux-2.4.35.4/drivers/isdn/icn/icn.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/icn/icn.c -+++ linux-2.4.35.4/drivers/isdn/icn/icn.c +--- a/drivers/isdn/icn/icn.c ++++ b/drivers/isdn/icn/icn.c @@ -1,4 +1,4 @@ -/* $Id: icn.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -13747,20 +13407,16 @@ Index: linux-2.4.35.4/drivers/isdn/icn/icn.c #endif /* MODULE */ static int __init icn_init(void) -Index: linux-2.4.35.4/drivers/isdn/icn/icn.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/icn/icn.h -+++ linux-2.4.35.4/drivers/isdn/icn/icn.h +--- a/drivers/isdn/icn/icn.h ++++ b/drivers/isdn/icn/icn.h @@ -1,4 +1,4 @@ -/* $Id: icn.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * ISDN lowlevel-module for the ICN active ISDN-Card. * -Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.c -+++ linux-2.4.35.4/drivers/isdn/isdn_audio.c +--- a/drivers/isdn/isdn_audio.c ++++ b/drivers/isdn/isdn_audio.c @@ -1,9 +1,9 @@ -/* $Id: isdn_audio.c,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ +/* $Id: isdn_audio.c,v 1.24 2002/08/13 09:57:26 keil Exp $ @@ -13925,10 +13581,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c what = '.'; } if ((what != s->last) && (what != ' ') && (what != '.')) { -Index: linux-2.4.35.4/drivers/isdn/isdn_audio.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.h -+++ linux-2.4.35.4/drivers/isdn/isdn_audio.h +--- a/drivers/isdn/isdn_audio.h ++++ b/drivers/isdn/isdn_audio.h @@ -1,4 +1,4 @@ -/* $Id: isdn_audio.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_audio.h,v 1.10 2001/09/24 13:22:42 kai Exp $ @@ -13943,10 +13597,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.h int idx; int buf[DTMF_NPOINTS]; } dtmf_state; -Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_bsdcomp.c -+++ linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c +--- a/drivers/isdn/isdn_bsdcomp.c ++++ b/drivers/isdn/isdn_bsdcomp.c @@ -105,6 +105,14 @@ MODULE_LICENSE("Dual BSD/GPL"); #define DEBUG 1 @@ -14187,10 +13839,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c return skb_out->len; } -Index: linux-2.4.35.4/drivers/isdn/isdn_common.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_common.c -+++ linux-2.4.35.4/drivers/isdn/isdn_common.c +--- a/drivers/isdn/isdn_common.c ++++ b/drivers/isdn/isdn_common.c @@ -1,4 +1,4 @@ -/* $Id: isdn_common.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_common.c,v 1.137 2002/02/09 21:19:11 keil Exp $ @@ -15105,10 +14755,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c } module_init(isdn_init); -Index: linux-2.4.35.4/drivers/isdn/isdn_common.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_common.h -+++ linux-2.4.35.4/drivers/isdn/isdn_common.h +--- a/drivers/isdn/isdn_common.h ++++ b/drivers/isdn/isdn_common.h @@ -1,4 +1,4 @@ -/* $Id: isdn_common.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_common.h,v 1.22 2001/09/24 13:22:42 kai Exp $ @@ -15125,30 +14773,24 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.h /* Prototypes */ extern void isdn_MOD_INC_USE_COUNT(void); extern void isdn_MOD_DEC_USE_COUNT(void); -Index: linux-2.4.35.4/drivers/isdn/isdn_concap.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.c -+++ linux-2.4.35.4/drivers/isdn/isdn_concap.c +--- a/drivers/isdn/isdn_concap.c ++++ b/drivers/isdn/isdn_concap.c @@ -1,4 +1,4 @@ -/* $Id: isdn_concap.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_concap.c,v 1.9 2001/09/24 13:22:42 kai Exp $ * * Linux ISDN subsystem, protocol encapsulation * -Index: linux-2.4.35.4/drivers/isdn/isdn_concap.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.h -+++ linux-2.4.35.4/drivers/isdn/isdn_concap.h +--- a/drivers/isdn/isdn_concap.h ++++ b/drivers/isdn/isdn_concap.h @@ -1,4 +1,4 @@ -/* $Id: isdn_concap.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_concap.h,v 1.4 2001/09/24 13:22:42 kai Exp $ * * Linux ISDN subsystem, protocol encapsulation * -Index: linux-2.4.35.4/drivers/isdn/isdn_dwabc.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/isdn/isdn_dwabc.c ++++ b/drivers/isdn/isdn_dwabc.c @@ -0,0 +1,1053 @@ + +/* $Id: isdn_dwabc.c,v 1.27 2001/12/01 23:18:21 detabc Exp $ @@ -16203,10 +15845,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_dwabc.c +{ return(skb); } +#endif +#endif -Index: linux-2.4.35.4/drivers/isdn/isdn_net.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_net.c -+++ linux-2.4.35.4/drivers/isdn/isdn_net.c +--- a/drivers/isdn/isdn_net.c ++++ b/drivers/isdn/isdn_net.c @@ -1,4 +1,4 @@ -/* $Id: isdn_net.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_net.c,v 1.153 2002/08/17 18:35:23 detabc Exp $ @@ -17799,10 +17439,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c restore_flags(flags); kfree(p->local); kfree(p); -Index: linux-2.4.35.4/drivers/isdn/isdn_net.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_net.h -+++ linux-2.4.35.4/drivers/isdn/isdn_net.h +--- a/drivers/isdn/isdn_net.h ++++ b/drivers/isdn/isdn_net.h @@ -1,4 +1,4 @@ -/* $Id: isdn_net.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_net.h,v 1.23 2001/11/07 22:35:48 kai Exp $ @@ -17848,10 +17486,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.h spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags); } -Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.c -+++ linux-2.4.35.4/drivers/isdn/isdn_ppp.c +--- a/drivers/isdn/isdn_ppp.c ++++ b/drivers/isdn/isdn_ppp.c @@ -1,4 +1,4 @@ -/* $Id: isdn_ppp.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_ppp.c,v 1.94 2001/11/07 22:35:48 kai Exp $ @@ -18532,10 +18168,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c printk(KERN_DEBUG "isdn_ppp: Ouch! Master CCP sends on slave slot!\n"); switch(data[2]) { -Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.h -+++ linux-2.4.35.4/drivers/isdn/isdn_ppp.h +--- a/drivers/isdn/isdn_ppp.h ++++ b/drivers/isdn/isdn_ppp.h @@ -1,4 +1,4 @@ -/* $Id: isdn_ppp.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_ppp.h,v 1.18 2001/09/24 13:22:42 kai Exp $ @@ -18550,10 +18184,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.h extern int isdn_ppp_xmit(struct sk_buff *, struct net_device *); extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *); extern int isdn_ppp_dev_ioctl(struct net_device *, struct ifreq *, int); -Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.c -+++ linux-2.4.35.4/drivers/isdn/isdn_tty.c +--- a/drivers/isdn/isdn_tty.c ++++ b/drivers/isdn/isdn_tty.c @@ -1,4 +1,4 @@ -/* $Id: isdn_tty.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_tty.c,v 1.104 2002/02/09 21:19:11 keil Exp $ @@ -18713,10 +18345,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c if (dev->global_features & ISDN_FEATURE_L3_FCLASS2) strcat(rs, "2,"); -Index: linux-2.4.35.4/drivers/isdn/isdn_tty.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.h -+++ linux-2.4.35.4/drivers/isdn/isdn_tty.h +--- a/drivers/isdn/isdn_tty.h ++++ b/drivers/isdn/isdn_tty.h @@ -1,4 +1,4 @@ -/* $Id: isdn_tty.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_tty.h,v 1.25 2002/02/09 21:19:11 keil Exp $ @@ -18748,10 +18378,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.h #define TTY_IS_FCLASS2(info) \ ((info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_FAX) && \ (info->emu.mdmreg[REG_L3PROT] == ISDN_PROTO_L3_FCLASS2)) -Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.c -+++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c +--- a/drivers/isdn/isdn_ttyfax.c ++++ b/drivers/isdn/isdn_ttyfax.c @@ -1,4 +1,4 @@ -/* $Id: isdn_ttyfax.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_ttyfax.c,v 1.9 2001/09/24 13:22:43 kai Exp $ @@ -18969,20 +18597,16 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c +#endif PARSE_ERROR1; } -Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.h -+++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h +--- a/drivers/isdn/isdn_ttyfax.h ++++ b/drivers/isdn/isdn_ttyfax.h @@ -1,4 +1,4 @@ -/* $Id: isdn_ttyfax.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_ttyfax.h,v 1.3 2001/09/24 13:22:43 kai Exp $ * * header for Linux ISDN subsystem, tty_fax related functions (linklevel). * -Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.c -+++ linux-2.4.35.4/drivers/isdn/isdn_v110.c +--- a/drivers/isdn/isdn_v110.c ++++ b/drivers/isdn/isdn_v110.c @@ -1,4 +1,4 @@ -/* $Id: isdn_v110.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_v110.c,v 1.8 2001/09/24 13:22:43 kai Exp $ @@ -19013,40 +18637,32 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c #endif kfree(v->encodebuf); kfree(v); -Index: linux-2.4.35.4/drivers/isdn/isdn_v110.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.h -+++ linux-2.4.35.4/drivers/isdn/isdn_v110.h +--- a/drivers/isdn/isdn_v110.h ++++ b/drivers/isdn/isdn_v110.h @@ -1,4 +1,4 @@ -/* $Id: isdn_v110.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_v110.h,v 1.5 2001/09/24 13:22:43 kai Exp $ * * Linux ISDN subsystem, V.110 related functions (linklevel). * -Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.c -+++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.c +--- a/drivers/isdn/isdn_x25iface.c ++++ b/drivers/isdn/isdn_x25iface.c @@ -1,4 +1,4 @@ -/* $Id: isdn_x25iface.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_x25iface.c,v 1.10 2001/09/24 13:22:43 kai Exp $ * * Linux ISDN subsystem, X.25 related functions * -Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.h -+++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.h +--- a/drivers/isdn/isdn_x25iface.h ++++ b/drivers/isdn/isdn_x25iface.h @@ -1,4 +1,4 @@ -/* $Id: isdn_x25iface.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ +/* $Id: isdn_x25iface.h,v 1.4 2001/09/24 13:22:43 kai Exp $ * * header for Linux ISDN subsystem, x.25 related functions * -Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.c -+++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c +--- a/drivers/isdn/isdnloop/isdnloop.c ++++ b/drivers/isdn/isdnloop/isdnloop.c @@ -1,4 +1,4 @@ -/* $Id: isdnloop.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id: isdnloop.c,v 1.17 2001/08/30 10:45:42 kai Exp $ @@ -19086,20 +18702,16 @@ Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c } static void __exit -Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.h -+++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h +--- a/drivers/isdn/isdnloop/isdnloop.h ++++ b/drivers/isdn/isdnloop/isdnloop.h @@ -1,4 +1,4 @@ -/* $Id: isdnloop.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Loopback lowlevel module for testing of linklevel. * -Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.c -+++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c +--- a/drivers/isdn/pcbit/callbacks.c ++++ b/drivers/isdn/pcbit/callbacks.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19109,10 +18721,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.h -+++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h +--- a/drivers/isdn/pcbit/callbacks.h ++++ b/drivers/isdn/pcbit/callbacks.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19122,10 +18732,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.c -+++ linux-2.4.35.4/drivers/isdn/pcbit/capi.c +--- a/drivers/isdn/pcbit/capi.c ++++ b/drivers/isdn/pcbit/capi.c @@ -4,7 +4,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19135,10 +18743,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.c * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.h -+++ linux-2.4.35.4/drivers/isdn/pcbit/capi.h +--- a/drivers/isdn/pcbit/capi.h ++++ b/drivers/isdn/pcbit/capi.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19158,10 +18764,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.h capi_channel(struct pcbit_dev *dev, struct sk_buff *skb) { ushort callref; -Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/drv.c -+++ linux-2.4.35.4/drivers/isdn/pcbit/drv.c +--- a/drivers/isdn/pcbit/drv.c ++++ b/drivers/isdn/pcbit/drv.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19303,10 +18907,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c if (capi_decode_conn_conf(chan, skb, &complete)) { printk(KERN_DEBUG "conn_conf indicates error\n"); pcbit_fsm_event(dev, chan, EV_ERROR, NULL); -Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.c -+++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.c +--- a/drivers/isdn/pcbit/edss1.c ++++ b/drivers/isdn/pcbit/edss1.c @@ -4,7 +4,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19316,10 +18918,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.c * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.h -+++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.h +--- a/drivers/isdn/pcbit/edss1.h ++++ b/drivers/isdn/pcbit/edss1.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19329,10 +18929,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.h * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.c -+++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.c +--- a/drivers/isdn/pcbit/layer2.c ++++ b/drivers/isdn/pcbit/layer2.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19374,10 +18972,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c return; } -Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.h -+++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.h +--- a/drivers/isdn/pcbit/layer2.h ++++ b/drivers/isdn/pcbit/layer2.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19387,10 +18983,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.h * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/module.c -+++ linux-2.4.35.4/drivers/isdn/pcbit/module.c +--- a/drivers/isdn/pcbit/module.c ++++ b/drivers/isdn/pcbit/module.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19434,10 +19028,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c #endif module_init(pcbit_init); -Index: linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/pcbit.h -+++ linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h +--- a/drivers/isdn/pcbit/pcbit.h ++++ b/drivers/isdn/pcbit/pcbit.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19447,20 +19039,16 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -Index: linux-2.4.35.4/drivers/isdn/sc/card.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/card.h -+++ linux-2.4.35.4/drivers/isdn/sc/card.h +--- a/drivers/isdn/sc/card.h ++++ b/drivers/isdn/sc/card.h @@ -1,4 +1,4 @@ -/* $Id: card.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Driver parameters for SpellCaster ISA ISDN adapters * -Index: linux-2.4.35.4/drivers/isdn/sc/command.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/command.c -+++ linux-2.4.35.4/drivers/isdn/sc/command.c +--- a/drivers/isdn/sc/command.c ++++ b/drivers/isdn/sc/command.c @@ -1,4 +1,4 @@ -/* $Id: command.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -19476,40 +19064,32 @@ Index: linux-2.4.35.4/drivers/isdn/sc/command.c } /* -Index: linux-2.4.35.4/drivers/isdn/sc/debug.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/debug.c -+++ linux-2.4.35.4/drivers/isdn/sc/debug.c +--- a/drivers/isdn/sc/debug.c ++++ b/drivers/isdn/sc/debug.c @@ -1,4 +1,4 @@ -/* $Id: debug.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/debug.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/debug.h -+++ linux-2.4.35.4/drivers/isdn/sc/debug.h +--- a/drivers/isdn/sc/debug.h ++++ b/drivers/isdn/sc/debug.h @@ -1,4 +1,4 @@ -/* $Id: debug.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/event.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/event.c -+++ linux-2.4.35.4/drivers/isdn/sc/event.c +--- a/drivers/isdn/sc/event.c ++++ b/drivers/isdn/sc/event.c @@ -1,4 +1,4 @@ -/* $Id: event.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/init.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/init.c -+++ linux-2.4.35.4/drivers/isdn/sc/init.c +--- a/drivers/isdn/sc/init.c ++++ b/drivers/isdn/sc/init.c @@ -514,6 +514,15 @@ int identify_board(unsigned long rambase schedule_timeout(HZ); sig = readl(rambase + SIG_OFFSET); @@ -19536,20 +19116,16 @@ Index: linux-2.4.35.4/drivers/isdn/sc/init.c if(sig == SIGNATURE) return BRI_BOARD; -Index: linux-2.4.35.4/drivers/isdn/sc/interrupt.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/interrupt.c -+++ linux-2.4.35.4/drivers/isdn/sc/interrupt.c +--- a/drivers/isdn/sc/interrupt.c ++++ b/drivers/isdn/sc/interrupt.c @@ -1,4 +1,4 @@ -/* $Id: interrupt.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/ioctl.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/ioctl.c -+++ linux-2.4.35.4/drivers/isdn/sc/ioctl.c +--- a/drivers/isdn/sc/ioctl.c ++++ b/drivers/isdn/sc/ioctl.c @@ -23,6 +23,9 @@ extern int send_and_receive(int, unsigne extern board *adapter[]; @@ -19560,100 +19136,80 @@ Index: linux-2.4.35.4/drivers/isdn/sc/ioctl.c int GetStatus(int card, boardInfo *); -Index: linux-2.4.35.4/drivers/isdn/sc/message.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/message.c -+++ linux-2.4.35.4/drivers/isdn/sc/message.c +--- a/drivers/isdn/sc/message.c ++++ b/drivers/isdn/sc/message.c @@ -1,4 +1,4 @@ -/* $Id: message.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * functions for sending and receiving control messages * -Index: linux-2.4.35.4/drivers/isdn/sc/message.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/message.h -+++ linux-2.4.35.4/drivers/isdn/sc/message.h +--- a/drivers/isdn/sc/message.h ++++ b/drivers/isdn/sc/message.h @@ -1,4 +1,4 @@ -/* $Id: message.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/packet.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/packet.c -+++ linux-2.4.35.4/drivers/isdn/sc/packet.c +--- a/drivers/isdn/sc/packet.c ++++ b/drivers/isdn/sc/packet.c @@ -1,4 +1,4 @@ -/* $Id: packet.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/shmem.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/shmem.c -+++ linux-2.4.35.4/drivers/isdn/sc/shmem.c +--- a/drivers/isdn/sc/shmem.c ++++ b/drivers/isdn/sc/shmem.c @@ -1,4 +1,4 @@ -/* $Id: shmem.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/sc/timer.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/timer.c -+++ linux-2.4.35.4/drivers/isdn/sc/timer.c +--- a/drivers/isdn/sc/timer.c ++++ b/drivers/isdn/sc/timer.c @@ -1,4 +1,4 @@ -/* $Id: timer.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam.h -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam.h +--- a/drivers/isdn/tpam/tpam.h ++++ b/drivers/isdn/tpam/tpam.h @@ -1,4 +1,4 @@ -/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id: tpam.h,v 1.3 2001/09/24 13:23:12 kai Exp $ * * Turbo PAM ISDN driver for Linux. (Kernel Driver) * -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_commands.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c +--- a/drivers/isdn/tpam/tpam_commands.c ++++ b/drivers/isdn/tpam/tpam_commands.c @@ -1,4 +1,4 @@ -/* $Id: tpam_commands.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id: tpam_commands.c,v 1.3 2001/09/24 13:23:12 kai Exp $ * * Turbo PAM ISDN driver for Linux. (Kernel Driver - ISDN commands) * -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_crcpc.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c +--- a/drivers/isdn/tpam/tpam_crcpc.c ++++ b/drivers/isdn/tpam/tpam_crcpc.c @@ -1,4 +1,4 @@ -/* $Id: tpam_crcpc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Turbo PAM ISDN driver for Linux. (Kernel Driver - CRC encoding) * -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_hdlc.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c +--- a/drivers/isdn/tpam/tpam_hdlc.c ++++ b/drivers/isdn/tpam/tpam_hdlc.c @@ -1,4 +1,4 @@ -/* $Id: tpam_hdlc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id: tpam_hdlc.c,v 1.3 2001/09/24 13:23:12 kai Exp $ * * Turbo PAM ISDN driver for Linux. (Kernel Driver - HDLC encoding) * -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_main.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c +--- a/drivers/isdn/tpam/tpam_main.c ++++ b/drivers/isdn/tpam/tpam_main.c @@ -1,4 +1,4 @@ -/* $Id: tpam_main.c,v 1.1.2.2 2001/12/09 18:45:14 kai Exp $ +/* $Id$ @@ -19669,30 +19225,24 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c }; static int __init tpam_init(void) { -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_memory.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c +--- a/drivers/isdn/tpam/tpam_memory.c ++++ b/drivers/isdn/tpam/tpam_memory.c @@ -1,4 +1,4 @@ -/* $Id: tpam_memory.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Turbo PAM ISDN driver for Linux. (Kernel Driver - Board Memory Access) * -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_nco.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c +--- a/drivers/isdn/tpam/tpam_nco.c ++++ b/drivers/isdn/tpam/tpam_nco.c @@ -1,4 +1,4 @@ -/* $Id: tpam_nco.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ * * Turbo PAM ISDN driver for Linux. * (Kernel Driver - Low Level NCO Manipulation) -Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_queues.c -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c +--- a/drivers/isdn/tpam/tpam_queues.c ++++ b/drivers/isdn/tpam/tpam_queues.c @@ -1,4 +1,4 @@ -/* $Id: tpam_queues.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ +/* $Id$ @@ -19707,40 +19257,32 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c spin_unlock(&card->lock); printk(KERN_ERR "TurboPAM(tpam_irq): " "waiting too long...\n"); -Index: linux-2.4.35.4/include/linux/b1lli.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/b1lli.h -+++ linux-2.4.35.4/include/linux/b1lli.h +--- a/include/linux/b1lli.h ++++ b/include/linux/b1lli.h @@ -1,4 +1,4 @@ -/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $ +/* $Id$ * * ISDN lowlevel-module for AVM B1-card. * -Index: linux-2.4.35.4/include/linux/b1pcmcia.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/b1pcmcia.h -+++ linux-2.4.35.4/include/linux/b1pcmcia.h +--- a/include/linux/b1pcmcia.h ++++ b/include/linux/b1pcmcia.h @@ -1,4 +1,4 @@ -/* $Id: b1pcmcia.h,v 1.1.8.2 2001/09/23 22:25:05 kai Exp $ +/* $Id$ * * Exported functions of module b1pcmcia to be called by * avm_cs card services module. -Index: linux-2.4.35.4/include/linux/capi.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/capi.h -+++ linux-2.4.35.4/include/linux/capi.h +--- a/include/linux/capi.h ++++ b/include/linux/capi.h @@ -1,4 +1,4 @@ -/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ +/* $Id$ * * CAPI 2.0 Interface for Linux * -Index: linux-2.4.35.4/include/linux/concap.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/concap.h -+++ linux-2.4.35.4/include/linux/concap.h +--- a/include/linux/concap.h ++++ b/include/linux/concap.h @@ -1,4 +1,4 @@ -/* $Id: concap.h,v 1.2.8.1 2001/09/23 22:25:05 kai Exp $ +/* $Id: concap.h,v 1.3 2001/09/24 13:23:13 kai Exp $ @@ -19755,30 +19297,24 @@ Index: linux-2.4.35.4/include/linux/concap.h /* Stuff to support encapsulation protocols genericly. The encapsulation protocol is processed at the uppermost layer of the network interface. -Index: linux-2.4.35.4/include/linux/hysdn_if.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/hysdn_if.h -+++ linux-2.4.35.4/include/linux/hysdn_if.h +--- a/include/linux/hysdn_if.h ++++ b/include/linux/hysdn_if.h @@ -1,4 +1,4 @@ -/* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $ +/* $Id$ * * Linux driver for HYSDN cards * ioctl definitions shared by hynetmgr and driver. -Index: linux-2.4.35.4/include/linux/isdn/tpam.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn/tpam.h -+++ linux-2.4.35.4/include/linux/isdn/tpam.h +--- a/include/linux/isdn/tpam.h ++++ b/include/linux/isdn/tpam.h @@ -1,4 +1,4 @@ -/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:38 kai Exp $ +/* $Id$ * * Turbo PAM ISDN driver for Linux. (Kernel Driver) * -Index: linux-2.4.35.4/include/linux/isdn.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn.h -+++ linux-2.4.35.4/include/linux/isdn.h +--- a/include/linux/isdn.h ++++ b/include/linux/isdn.h @@ -1,4 +1,4 @@ -/* $Id: isdn.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ +/* $Id: isdn.h,v 1.125 2001/12/01 23:18:21 detabc Exp $ @@ -20001,10 +19537,8 @@ Index: linux-2.4.35.4/include/linux/isdn.h #endif /* __KERNEL__ */ -Index: linux-2.4.35.4/include/linux/isdn_compat.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/isdn_compat.h ++++ b/include/linux/isdn_compat.h @@ -0,0 +1,261 @@ +/* $Id: isdn_compat.h,v 1.53 2001/09/24 13:23:13 kai Exp $ + * @@ -20267,10 +19801,8 @@ Index: linux-2.4.35.4/include/linux/isdn_compat.h + +#endif /* __KERNEL__ */ +#endif /* _LINUX_ISDN_COMPAT_H */ -Index: linux-2.4.35.4/include/linux/isdn_divertif.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn_divertif.h -+++ linux-2.4.35.4/include/linux/isdn_divertif.h +--- a/include/linux/isdn_divertif.h ++++ b/include/linux/isdn_divertif.h @@ -1,4 +1,4 @@ -/* $Id: isdn_divertif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ +/* $Id$ @@ -20294,10 +19826,8 @@ Index: linux-2.4.35.4/include/linux/isdn_divertif.h } isdn_divert_if; /*********************/ -Index: linux-2.4.35.4/include/linux/isdn_dwabc.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/isdn_dwabc.h ++++ b/include/linux/isdn_dwabc.h @@ -0,0 +1,84 @@ +/* $Id: isdn_dwabc.h,v 1.9 2001/09/26 20:32:08 detabc Exp $ + * @@ -20383,20 +19913,16 @@ Index: linux-2.4.35.4/include/linux/isdn_dwabc.h +}; + +#endif -Index: linux-2.4.35.4/include/linux/isdn_lzscomp.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn_lzscomp.h -+++ linux-2.4.35.4/include/linux/isdn_lzscomp.h +--- a/include/linux/isdn_lzscomp.h ++++ b/include/linux/isdn_lzscomp.h @@ -1,4 +1,4 @@ -/* $Id: isdn_lzscomp.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ +/* $Id$ * * Header for isdn_lzscomp.c * Concentrated here to not mess up half a dozen kernel headers with code -Index: linux-2.4.35.4/include/linux/isdn_ppp.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn_ppp.h -+++ linux-2.4.35.4/include/linux/isdn_ppp.h +--- a/include/linux/isdn_ppp.h ++++ b/include/linux/isdn_ppp.h @@ -8,6 +8,7 @@ #ifndef _LINUX_ISDN_PPP_H #define _LINUX_ISDN_PPP_H @@ -20438,10 +19964,8 @@ Index: linux-2.4.35.4/include/linux/isdn_ppp.h unsigned long debug; struct isdn_ppp_compressor *compressor,*decompressor; struct isdn_ppp_compressor *link_compressor,*link_decompressor; -Index: linux-2.4.35.4/include/linux/isdnif.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/isdnif.h -+++ linux-2.4.35.4/include/linux/isdnif.h +--- a/include/linux/isdnif.h ++++ b/include/linux/isdnif.h @@ -1,4 +1,4 @@ -/* $Id: isdnif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ +/* $Id: isdnif.h,v 1.43 2002/02/09 21:19:11 keil Exp $ @@ -20465,10 +19989,8 @@ Index: linux-2.4.35.4/include/linux/isdnif.h /* * Audio commands -Index: linux-2.4.35.4/include/linux/kernelcapi.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/kernelcapi.h -+++ linux-2.4.35.4/include/linux/kernelcapi.h +--- a/include/linux/kernelcapi.h ++++ b/include/linux/kernelcapi.h @@ -1,12 +1,10 @@ -/* $Id: kernelcapi.h,v 1.1.4.2 2002/01/28 18:25:10 kai Exp $ +/* diff --git a/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch b/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch index af084d8197..c2d62f6107 100644 --- a/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch +++ b/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/Makefile -+++ linux-2.4.35.4/drivers/Makefile +--- a/drivers/Makefile ++++ b/drivers/Makefile @@ -38,7 +38,7 @@ subdir-$(CONFIG_FUSION) += message/fusi subdir-$(CONFIG_MD) += md subdir-$(CONFIG_IEEE1394) += ieee1394 @@ -11,10 +9,8 @@ Index: linux-2.4.35.4/drivers/Makefile subdir-$(CONFIG_ATM) += atm subdir-$(CONFIG_FC4) += fc4 -Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c +--- a/drivers/isdn/hisax/hfc_usb.c ++++ b/drivers/isdn/hisax/hfc_usb.c @@ -1,13 +1,11 @@ -/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $ +/* diff --git a/target/linux/generic-2.4/patches/202-pl2303_backport.patch b/target/linux/generic-2.4/patches/202-pl2303_backport.patch index 7c5b5ebaee..84cc006bd9 100644 --- a/target/linux/generic-2.4/patches/202-pl2303_backport.patch +++ b/target/linux/generic-2.4/patches/202-pl2303_backport.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c -+++ linux-2.4.35.4/drivers/usb/serial/pl2303.c +--- a/drivers/usb/serial/pl2303.c ++++ b/drivers/usb/serial/pl2303.c @@ -78,6 +78,11 @@ static struct usb_device_id id_table [] { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, @@ -14,10 +12,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c { } /* Terminating entry */ }; -Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h -+++ linux-2.4.35.4/drivers/usb/serial/pl2303.h +--- a/drivers/usb/serial/pl2303.h ++++ b/drivers/usb/serial/pl2303.h @@ -41,3 +41,21 @@ #define SITECOM_VENDOR_ID 0x6189 diff --git a/target/linux/generic-2.4/patches/203-hfsplus_fix.patch b/target/linux/generic-2.4/patches/203-hfsplus_fix.patch index 23fcca49a9..4710c863d2 100644 --- a/target/linux/generic-2.4/patches/203-hfsplus_fix.patch +++ b/target/linux/generic-2.4/patches/203-hfsplus_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/fs/hfsplus/super.c -=================================================================== ---- linux-2.4.35.4.orig/fs/hfsplus/super.c -+++ linux-2.4.35.4/fs/hfsplus/super.c +--- a/fs/hfsplus/super.c ++++ b/fs/hfsplus/super.c @@ -240,8 +240,7 @@ int hfsplus_remount(struct super_block * if (!(*flags & MS_RDONLY)) { struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; diff --git a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch index a73be75a76..bdf6501561 100644 --- a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch +++ b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/arch/mips/kernel/signal.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/signal.c -+++ linux-2.4.35.4/arch/mips/kernel/signal.c +--- a/arch/mips/kernel/signal.c ++++ b/arch/mips/kernel/signal.c @@ -6,8 +6,10 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994 - 1999 Ralf Baechle @@ -35,10 +33,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c { sigset_t *unewset, saveset, newset; size_t sigsetsize; -Index: linux-2.4.35.4/arch/mips/kernel/syscall.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c -+++ linux-2.4.35.4/arch/mips/kernel/syscall.c +--- a/arch/mips/kernel/syscall.c ++++ b/arch/mips/kernel/syscall.c @@ -5,6 +5,7 @@ * * Copyright (C) 1995 - 2000 by Ralf Baechle @@ -69,10 +65,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c { unsigned long clone_flags; unsigned long newsp; -Index: linux-2.4.35.4/arch/mips/ld.script.in -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/ld.script.in -+++ linux-2.4.35.4/arch/mips/ld.script.in +--- a/arch/mips/ld.script.in ++++ b/arch/mips/ld.script.in @@ -9,6 +9,7 @@ SECTIONS { _ftext = . ; @@ -81,10 +75,8 @@ Index: linux-2.4.35.4/arch/mips/ld.script.in *(.rodata) *(.rodata.*) *(.rodata1) -Index: linux-2.4.35.4/arch/mips64/kernel/signal.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c -+++ linux-2.4.35.4/arch/mips64/kernel/signal.c +--- a/arch/mips64/kernel/signal.c ++++ b/arch/mips64/kernel/signal.c @@ -6,8 +6,10 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994 - 2000 Ralf Baechle @@ -107,10 +99,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal.c { sigset_t *unewset, saveset, newset; size_t sigsetsize; -Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c -+++ linux-2.4.35.4/arch/mips64/kernel/signal32.c +--- a/arch/mips64/kernel/signal32.c ++++ b/arch/mips64/kernel/signal32.c @@ -6,7 +6,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994 - 2000 Ralf Baechle @@ -143,10 +133,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c { sigset32_t *uset; sigset_t newset, saveset; -Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c -+++ linux-2.4.35.4/arch/mips64/kernel/syscall.c +--- a/arch/mips64/kernel/syscall.c ++++ b/arch/mips64/kernel/syscall.c @@ -6,7 +6,9 @@ * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. @@ -179,10 +167,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c { unsigned long clone_flags; unsigned long newsp; -Index: linux-2.4.35.4/include/asm-mips/ptrace.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/ptrace.h -+++ linux-2.4.35.4/include/asm-mips/ptrace.h +--- a/include/asm-mips/ptrace.h ++++ b/include/asm-mips/ptrace.h @@ -4,6 +4,7 @@ * for more details. * @@ -205,10 +191,8 @@ Index: linux-2.4.35.4/include/asm-mips/ptrace.h #endif /* !__ASSEMBLY__ */ /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ -Index: linux-2.4.35.4/include/asm-mips64/ptrace.h -=================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h -+++ linux-2.4.35.4/include/asm-mips64/ptrace.h +--- a/include/asm-mips64/ptrace.h ++++ b/include/asm-mips64/ptrace.h @@ -5,6 +5,7 @@ * * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle diff --git a/target/linux/generic-2.4/patches/208-usb2_fix.patch b/target/linux/generic-2.4/patches/208-usb2_fix.patch index b210bdb1be..5c90e63e0c 100644 --- a/target/linux/generic-2.4/patches/208-usb2_fix.patch +++ b/target/linux/generic-2.4/patches/208-usb2_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c -+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c +--- a/drivers/usb/host/ehci-q.c ++++ b/drivers/usb/host/ehci-q.c @@ -782,6 +782,11 @@ static void qh_link_async (struct ehci_h if (!(cmd & CMD_ASE)) { /* in case a clear of CMD_ASE didn't take yet */ diff --git a/target/linux/generic-2.4/patches/209-build_fixes.patch b/target/linux/generic-2.4/patches/209-build_fixes.patch index 30af60f83f..70f62e5038 100644 --- a/target/linux/generic-2.4/patches/209-build_fixes.patch +++ b/target/linux/generic-2.4/patches/209-build_fixes.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Makefile -=================================================================== ---- linux-2.4.35.4.orig/Makefile -+++ linux-2.4.35.4/Makefile +--- a/Makefile ++++ b/Makefile @@ -362,7 +362,7 @@ include/linux/compile.h: $(CONFIGURATION @rm -f .ver1 @@ -20,10 +18,8 @@ Index: linux-2.4.35.4/Makefile scripts/mkdep -- init/*.c > .depend ifdef CONFIG_MODVERSIONS -Index: linux-2.4.35.4/Rules.make -=================================================================== ---- linux-2.4.35.4.orig/Rules.make -+++ linux-2.4.35.4/Rules.make +--- a/Rules.make ++++ b/Rules.make @@ -126,7 +126,7 @@ endif # This make dependencies quickly # diff --git a/target/linux/generic-2.4/patches/210-fix-irq-serial.patch b/target/linux/generic-2.4/patches/210-fix-irq-serial.patch index d98e65c322..3b8a01f1d6 100644 --- a/target/linux/generic-2.4/patches/210-fix-irq-serial.patch +++ b/target/linux/generic-2.4/patches/210-fix-irq-serial.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/char/serial.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/char/serial.c -+++ linux-2.4.35.4/drivers/char/serial.c +--- a/drivers/char/serial.c ++++ b/drivers/char/serial.c @@ -5458,18 +5458,6 @@ static int __init rs_init(void) sizeof(struct rs_multiport_struct)); #endif diff --git a/target/linux/generic-2.4/patches/212-htb_time_fix.patch b/target/linux/generic-2.4/patches/212-htb_time_fix.patch index faef690a47..8c1d11eedb 100644 --- a/target/linux/generic-2.4/patches/212-htb_time_fix.patch +++ b/target/linux/generic-2.4/patches/212-htb_time_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/sched/sch_htb.c -=================================================================== ---- linux-2.4.35.4.orig/net/sched/sch_htb.c -+++ linux-2.4.35.4/net/sched/sch_htb.c +--- a/net/sched/sch_htb.c ++++ b/net/sched/sch_htb.c @@ -369,7 +369,7 @@ static void htb_debug_dump (struct htb_s struct list_head *l; list_for_each (l,q->hash+i) { diff --git a/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch b/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch index 6ea3074457..eac74cda8b 100644 --- a/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch +++ b/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/sched/sch_htb.c -=================================================================== ---- linux-2.4.35.4.orig/net/sched/sch_htb.c -+++ linux-2.4.35.4/net/sched/sch_htb.c +--- a/net/sched/sch_htb.c ++++ b/net/sched/sch_htb.c @@ -74,7 +74,7 @@ #define HTB_EWMAC 2 /* rate average over HTB_EWMAC*HTB_HSIZE sec */ #define HTB_DEBUG 1 /* compile debugging support (activated by tc tool) */ diff --git a/target/linux/generic-2.4/patches/222-sound.patch b/target/linux/generic-2.4/patches/222-sound.patch index 48c03a3721..7f3a1a331b 100644 --- a/target/linux/generic-2.4/patches/222-sound.patch +++ b/target/linux/generic-2.4/patches/222-sound.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/sound/sound_core.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/sound/sound_core.c -+++ linux-2.4.35.4/drivers/sound/sound_core.c +--- a/drivers/sound/sound_core.c ++++ b/drivers/sound/sound_core.c @@ -174,9 +174,9 @@ static int sound_insert_unit(struct soun } diff --git a/target/linux/generic-2.4/patches/224-atm_hotplug.patch b/target/linux/generic-2.4/patches/224-atm_hotplug.patch index 64dd3e8a3b..b1238ed015 100644 --- a/target/linux/generic-2.4/patches/224-atm_hotplug.patch +++ b/target/linux/generic-2.4/patches/224-atm_hotplug.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/atmdev.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/atmdev.h -+++ linux-2.4.35.4/include/linux/atmdev.h +--- a/include/linux/atmdev.h ++++ b/include/linux/atmdev.h @@ -400,6 +400,7 @@ extern rwlock_t vcc_sklist_lock; struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops, int number,atm_dev_flags_t *flags); /* number == -1: pick first available */ @@ -10,10 +8,8 @@ Index: linux-2.4.35.4/include/linux/atmdev.h void atm_dev_deregister(struct atm_dev *dev); void shutdown_atm_dev(struct atm_dev *dev); void vcc_insert_socket(struct sock *sk); -Index: linux-2.4.35.4/net/atm/resources.c -=================================================================== ---- linux-2.4.35.4.orig/net/atm/resources.c -+++ linux-2.4.35.4/net/atm/resources.c +--- a/net/atm/resources.c ++++ b/net/atm/resources.c @@ -10,6 +10,7 @@ #include <linux/sonet.h> #include <linux/kernel.h> /* for barrier */ diff --git a/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch b/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch index 0d6d1fadb1..8ba194b6fe 100644 --- a/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch +++ b/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/lib/string.c -=================================================================== ---- linux-2.4.35.4.orig/lib/string.c -+++ linux-2.4.35.4/lib/string.c +--- a/lib/string.c ++++ b/lib/string.c @@ -50,6 +50,7 @@ int strnicmp(const char *s1, const char } return (int)c1 - (int)c2; diff --git a/target/linux/generic-2.4/patches/226-atm_br2684.patch b/target/linux/generic-2.4/patches/226-atm_br2684.patch index 9ec555ed33..bfff13afa6 100644 --- a/target/linux/generic-2.4/patches/226-atm_br2684.patch +++ b/target/linux/generic-2.4/patches/226-atm_br2684.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/atm/br2684.c -=================================================================== ---- linux-2.4.35.4.orig/net/atm/br2684.c -+++ linux-2.4.35.4/net/atm/br2684.c +--- a/net/atm/br2684.c ++++ b/net/atm/br2684.c @@ -55,36 +55,55 @@ static void skb_debug(const struct sk_bu #define skb_debug(skb) do {} while (0) #endif @@ -486,10 +484,8 @@ Index: linux-2.4.35.4/net/atm/br2684.c while (!list_empty(&br2684_devs)) { brdev = list_entry_brdev(br2684_devs.next); unregister_netdev(&brdev->net_dev); -Index: linux-2.4.35.4/net/atm/common.c -=================================================================== ---- linux-2.4.35.4.orig/net/atm/common.c -+++ linux-2.4.35.4/net/atm/common.c +--- a/net/atm/common.c ++++ b/net/atm/common.c @@ -158,6 +158,7 @@ void br2684_ioctl_set(int (*hook)(struct } #ifdef CONFIG_ATM_BR2684_MODULE @@ -498,10 +494,8 @@ Index: linux-2.4.35.4/net/atm/common.c #endif #endif -Index: linux-2.4.35.4/include/linux/atmbr2684.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/atmbr2684.h -+++ linux-2.4.35.4/include/linux/atmbr2684.h +--- a/include/linux/atmbr2684.h ++++ b/include/linux/atmbr2684.h @@ -3,6 +3,7 @@ #include <linux/atm.h> diff --git a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch index 29a0e5e856..196693d0da 100644 --- a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch +++ b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/fs/jffs2/build.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/build.c -+++ linux-2.4.35.4/fs/jffs2/build.c +--- a/fs/jffs2/build.c ++++ b/fs/jffs2/build.c @@ -31,6 +31,10 @@ * provisions above, a recipient may use your version of this file * under either the RHEPL or the GPL. @@ -40,10 +38,8 @@ Index: linux-2.4.35.4/fs/jffs2/build.c D1(printk(KERN_DEBUG "Scanned flash completely\n")); /* Now build the data map for each inode, marking obsoleted nodes as such, and also increase nlink of any children. */ -Index: linux-2.4.35.4/fs/jffs2/scan.c -=================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/scan.c -+++ linux-2.4.35.4/fs/jffs2/scan.c +--- a/fs/jffs2/scan.c ++++ b/fs/jffs2/scan.c @@ -31,6 +31,10 @@ * provisions above, a recipient may use your version of this file * under either the RHEPL or the GPL. diff --git a/target/linux/generic-2.4/patches/228-more_usb_fixes.patch b/target/linux/generic-2.4/patches/228-more_usb_fixes.patch index 7c475ffb58..16b554a805 100644 --- a/target/linux/generic-2.4/patches/228-more_usb_fixes.patch +++ b/target/linux/generic-2.4/patches/228-more_usb_fixes.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/scsi/hosts.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/scsi/hosts.c -+++ linux-2.4.35.4/drivers/scsi/hosts.c +--- a/drivers/scsi/hosts.c ++++ b/drivers/scsi/hosts.c @@ -107,8 +107,21 @@ scsi_unregister(struct Scsi_Host * sh){ if (shn) shn->host_registered = 0; /* else {} : This should not happen, we should panic here... */ @@ -25,10 +23,8 @@ Index: linux-2.4.35.4/drivers/scsi/hosts.c kfree((char *) sh); } -Index: linux-2.4.35.4/drivers/usb/hcd.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/hcd.c -+++ linux-2.4.35.4/drivers/usb/hcd.c +--- a/drivers/usb/hcd.c ++++ b/drivers/usb/hcd.c @@ -1105,7 +1105,8 @@ static int hcd_submit_urb (struct urb *u break; case PIPE_BULK: @@ -49,10 +45,8 @@ Index: linux-2.4.35.4/drivers/usb/hcd.c urb->transfer_dma = pci_map_single ( hcd->pdev, urb->transfer_buffer, -Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c -+++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c @@ -399,6 +399,27 @@ static int ehci_start (struct usb_hcd *h ehci_mem_cleanup (ehci); return retval; @@ -81,10 +75,8 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c writel (INTR_MASK, &ehci->regs->intr_enable); writel (ehci->periodic_dma, &ehci->regs->frame_list); -Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c -+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c +--- a/drivers/usb/host/ehci-q.c ++++ b/drivers/usb/host/ehci-q.c @@ -791,6 +791,8 @@ static void qh_link_async (struct ehci_h writel (cmd, &ehci->regs->command); ehci->hcd.state = USB_STATE_RUNNING; @@ -94,10 +86,8 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c } } -Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c -+++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c +--- a/drivers/usb/host/usb-uhci.c ++++ b/drivers/usb/host/usb-uhci.c @@ -3034,6 +3034,21 @@ uhci_pci_probe (struct pci_dev *dev, con pci_set_master(dev); @@ -120,10 +110,8 @@ Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c /* Search for the IO base address.. */ for (i = 0; i < 6; i++) { -Index: linux-2.4.35.4/drivers/usb/storage/transport.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/storage/transport.c -+++ linux-2.4.35.4/drivers/usb/storage/transport.c +--- a/drivers/usb/storage/transport.c ++++ b/drivers/usb/storage/transport.c @@ -54,6 +54,22 @@ #include <linux/sched.h> #include <linux/errno.h> @@ -752,10 +740,8 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c } } else -Index: linux-2.4.35.4/drivers/usb/storage/transport.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/storage/transport.h -+++ linux-2.4.35.4/drivers/usb/storage/transport.h +--- a/drivers/usb/storage/transport.h ++++ b/drivers/usb/storage/transport.h @@ -127,6 +127,16 @@ struct bulk_cs_wrap { #define US_BULK_TRANSFER_ABORTED 3 /* transfer canceled */ @@ -773,10 +759,8 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.h * Transport return codes */ -Index: linux-2.4.35.4/drivers/usb/storage/usb.h -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/storage/usb.h -+++ linux-2.4.35.4/drivers/usb/storage/usb.h +--- a/drivers/usb/storage/usb.h ++++ b/drivers/usb/storage/usb.h @@ -111,6 +111,60 @@ typedef int (*trans_reset)(struct us_dat typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*); typedef void (*extra_data_destructor)(void *); /* extra data destructor */ @@ -846,10 +830,8 @@ Index: linux-2.4.35.4/drivers/usb/storage/usb.h /* the semaphore for sleeping the control thread */ struct semaphore sema; /* to sleep thread on */ -Index: linux-2.4.35.4/include/linux/usb.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/usb.h -+++ linux-2.4.35.4/include/linux/usb.h +--- a/include/linux/usb.h ++++ b/include/linux/usb.h @@ -483,6 +483,8 @@ struct usb_driver { #define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt needed */ /* ... less overhead for QUEUE_BULK */ diff --git a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch index acddc0182e..2fcfd23d5a 100644 --- a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch +++ b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/skbuff.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/skbuff.h -+++ linux-2.4.35.4/include/linux/skbuff.h +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h @@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk skb->tail+=len; } @@ -52,10 +50,8 @@ Index: linux-2.4.35.4/include/linux/skbuff.h extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc); static inline void __skb_trim(struct sk_buff *skb, unsigned int len) -Index: linux-2.4.35.4/drivers/net/tun.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/tun.c -+++ linux-2.4.35.4/drivers/net/tun.c +--- a/drivers/net/tun.c ++++ b/drivers/net/tun.c @@ -185,22 +185,31 @@ static __inline__ ssize_t tun_get_user(s { struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) }; diff --git a/target/linux/generic-2.4/patches/231-mini_fo.patch b/target/linux/generic-2.4/patches/231-mini_fo.patch index 864cb70add..8605cd3e53 100644 --- a/target/linux/generic-2.4/patches/231-mini_fo.patch +++ b/target/linux/generic-2.4/patches/231-mini_fo.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/fs/Config.in -=================================================================== ---- linux-2.4.35.4.orig/fs/Config.in -+++ linux-2.4.35.4/fs/Config.in +--- a/fs/Config.in ++++ b/fs/Config.in @@ -77,6 +77,7 @@ dep_mbool ' JFS debugging' CONFIG_JFS_D dep_mbool ' JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS @@ -10,10 +8,8 @@ Index: linux-2.4.35.4/fs/Config.in tristate 'FreeVxFS file system support (VERITAS VxFS(TM) compatible)' CONFIG_VXFS_FS tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS -Index: linux-2.4.35.4/fs/Makefile -=================================================================== ---- linux-2.4.35.4.orig/fs/Makefile -+++ linux-2.4.35.4/fs/Makefile +--- a/fs/Makefile ++++ b/fs/Makefile @@ -31,6 +31,7 @@ subdir-$(CONFIG_RAMFS) += ramfs subdir-$(CONFIG_CODA_FS) += coda subdir-$(CONFIG_INTERMEZZO_FS) += intermezzo @@ -22,10 +18,8 @@ Index: linux-2.4.35.4/fs/Makefile subdir-$(CONFIG_FAT_FS) += fat subdir-$(CONFIG_UMSDOS_FS) += umsdos subdir-$(CONFIG_MSDOS_FS) += msdos -Index: linux-2.4.35.4/fs/mini_fo/aux.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/aux.c ++++ b/fs/mini_fo/aux.c @@ -0,0 +1,580 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -607,10 +601,8 @@ Index: linux-2.4.35.4/fs/mini_fo/aux.c + +#endif /* unused */ + -Index: linux-2.4.35.4/fs/mini_fo/ChangeLog -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/ChangeLog ++++ b/fs/mini_fo/ChangeLog @@ -0,0 +1,281 @@ +2006-01-24 Markus Klotzbuecher <mk@mary.denx.de> + @@ -893,10 +885,8 @@ Index: linux-2.4.35.4/fs/mini_fo/ChangeLog + * Implementation of mini_fo_mknod and mini_fo_rename, support + for device files. + -Index: linux-2.4.35.4/fs/mini_fo/dentry.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/dentry.c ++++ b/fs/mini_fo/dentry.c @@ -0,0 +1,244 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1142,10 +1132,8 @@ Index: linux-2.4.35.4/fs/mini_fo/dentry.c + d_delete: mini_fo_d_delete, + d_iput: mini_fo_d_iput, +}; -Index: linux-2.4.35.4/fs/mini_fo/file.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/file.c ++++ b/fs/mini_fo/file.c @@ -0,0 +1,717 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1864,10 +1852,8 @@ Index: linux-2.4.35.4/fs/mini_fo/file.c + /* not implemented: sendpage */ + /* not implemented: get_unmapped_area */ + }; -Index: linux-2.4.35.4/fs/mini_fo/fist.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/fist.h ++++ b/fs/mini_fo/fist.h @@ -0,0 +1,248 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -2117,10 +2103,8 @@ Index: linux-2.4.35.4/fs/mini_fo/fist.h +# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int) + +#endif /* not __FIST_H_ */ -Index: linux-2.4.35.4/fs/mini_fo/inode.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/inode.c ++++ b/fs/mini_fo/inode.c @@ -0,0 +1,1573 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -3695,10 +3679,8 @@ Index: linux-2.4.35.4/fs/mini_fo/inode.c + removexattr: mini_fo_removexattr +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */ + }; -Index: linux-2.4.35.4/fs/mini_fo/main.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/main.c ++++ b/fs/mini_fo/main.c @@ -0,0 +1,414 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -4114,10 +4096,8 @@ Index: linux-2.4.35.4/fs/mini_fo/main.c + +module_init(init_mini_fo_fs) +module_exit(exit_mini_fo_fs) -Index: linux-2.4.35.4/fs/mini_fo/Makefile -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/Makefile ++++ b/fs/mini_fo/Makefile @@ -0,0 +1,22 @@ +# +# Makefile for mini_fo 2.4 and 2.6 Linux kernels @@ -4141,10 +4121,8 @@ Index: linux-2.4.35.4/fs/mini_fo/Makefile +# dependencies +${mini_fo-objs}: mini_fo.h fist.h + -Index: linux-2.4.35.4/fs/mini_fo/meta.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/meta.c ++++ b/fs/mini_fo/meta.c @@ -0,0 +1,1000 @@ +/* + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de> @@ -5146,10 +5124,8 @@ Index: linux-2.4.35.4/fs/mini_fo/meta.c + return 0; +} + -Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/mini_fo.h ++++ b/fs/mini_fo/mini_fo.h @@ -0,0 +1,503 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -5654,10 +5630,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h +/* ioctls */ + +#endif /* not __MINI_FO_H_ */ -Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge ++++ b/fs/mini_fo/mini_fo-merge @@ -0,0 +1,180 @@ +#!/bin/bash +# @@ -5839,10 +5813,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge +#rm $TMP/$SKIP_DEL_LIST + +echo "Done!" -Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay ++++ b/fs/mini_fo/mini_fo-overlay @@ -0,0 +1,130 @@ +#!/bin/bash +# @@ -5974,10 +5946,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay +if [ $? -ne 0 ]; then + echo "Error, mounting failed, maybe no permisson to mount?" +fi -Index: linux-2.4.35.4/fs/mini_fo/mmap.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/mmap.c ++++ b/fs/mini_fo/mmap.c @@ -0,0 +1,637 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -6616,10 +6586,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mmap.c + print_exit_status(err); + return err; +} -Index: linux-2.4.35.4/fs/mini_fo/README -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/README ++++ b/fs/mini_fo/README @@ -0,0 +1,163 @@ +README for the mini_fo overlay file system +========================================= @@ -6784,10 +6752,8 @@ Index: linux-2.4.35.4/fs/mini_fo/README +2 of the License, or (at your option) any later version. + + -Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES ++++ b/fs/mini_fo/RELEASE_NOTES @@ -0,0 +1,111 @@ +Release: mini_fo-0.6.1 (v0-6-1) +Date: 21.09.2005 @@ -6900,10 +6866,8 @@ Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES +original state. I hope to fix this someday. Please note that this does +not effect the special hard links '.' and '..', that are handled +seperately by the lower fs. -Index: linux-2.4.35.4/fs/mini_fo/state.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/state.c ++++ b/fs/mini_fo/state.c @@ -0,0 +1,620 @@ +/* + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de> @@ -7525,10 +7489,8 @@ Index: linux-2.4.35.4/fs/mini_fo/state.c + return err; +} + -Index: linux-2.4.35.4/fs/mini_fo/super.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/fs/mini_fo/super.c ++++ b/fs/mini_fo/super.c @@ -0,0 +1,259 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok diff --git a/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch b/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch index 1c9ce76477..ed7601edd7 100644 --- a/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch +++ b/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h ++++ b/include/linux/netfilter_ipv4/ipt_ipp2p.h @@ -0,0 +1,31 @@ +#ifndef __IPT_IPP2P_H +#define __IPT_IPP2P_H @@ -34,10 +32,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h +#define IPP2P_MUTE (1 << 14) +#define IPP2P_WASTE (1 << 15) +#define IPP2P_XDCC (1 << 16) -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -26,6 +26,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES @@ -46,10 +42,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_ obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o @@ -58,10 +52,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c ++++ b/net/ipv4/netfilter/ipt_ipp2p.c @@ -0,0 +1,868 @@ +#if defined(MODVERSIONS) +#include <linux/modversions.h> diff --git a/target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch b/target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch index e7a7d8772a..11a3e1e86e 100644 --- a/target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch +++ b/target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch @@ -1,6 +1,6 @@ --- a/Documentation/Configure.help +++ b/Documentation/Configure.help -@@ -29207,6 +29207,18 @@ +@@ -29207,6 +29207,18 @@ CONFIG_SOUND_WM97XX If unsure, say N. @@ -21,7 +21,7 @@ # capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h -@@ -207,6 +207,17 @@ +@@ -207,6 +207,17 @@ struct ip_conntrack } nat; #endif /* CONFIG_IP_NF_NAT_NEEDED */ @@ -70,7 +70,7 @@ +#endif /* _IPT_LAYER7_H */ --- a/net/ipv4/netfilter/Config.in +++ b/net/ipv4/netfilter/Config.in -@@ -44,6 +44,9 @@ +@@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES @@ -82,7 +82,7 @@ dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile -@@ -87,6 +87,7 @@ +@@ -87,6 +87,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o @@ -92,7 +92,7 @@ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c -@@ -346,6 +346,14 @@ +@@ -346,6 +346,14 @@ destroy_conntrack(struct nf_conntrack *n } kfree(ct->master); } @@ -109,7 +109,7 @@ if (master) --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c -@@ -107,6 +107,13 @@ +@@ -107,6 +107,13 @@ print_conntrack(char *buffer, struct ip_ len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "use=%u ", atomic_read(&conntrack->ct_general.use)); diff --git a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch index b635f41a17..7e54a7027f 100644 --- a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch +++ b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -50,16 +50,19 @@ enum ip_conntrack_status { #include <linux/netfilter_ipv4/ip_conntrack_tcp.h> @@ -56,10 +54,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h }; #endif -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h @@ -0,0 +1,313 @@ +/* PPTP constants and structs */ +#ifndef _CONNTRACK_PPTP_H @@ -374,10 +370,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h + +#endif /* __KERNEL__ */ +#endif /* _CONNTRACK_PPTP_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h @@ -0,0 +1,123 @@ +#ifndef _CONNTRACK_PROTO_GRE_H +#define _CONNTRACK_PROTO_GRE_H @@ -502,10 +496,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h +#endif /* __KERNEL__ */ + +#endif /* _CONNTRACK_PROTO_GRE_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h +--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h @@ -14,7 +14,7 @@ union ip_conntrack_manip_proto { @@ -564,10 +556,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL) -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h ++++ b/include/linux/netfilter_ipv4/ip_nat_pptp.h @@ -0,0 +1,11 @@ +/* PPTP constants and structs */ +#ifndef _NAT_PPTP_H @@ -580,10 +570,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h +}; + +#endif /* _NAT_PPTP_H */ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -10,6 +10,8 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK @@ -614,10 +602,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_IP_NF_AMANDA" = "m" ]; then define_tristate CONFIG_IP_NF_NAT_AMANDA m else -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c +--- a/net/ipv4/netfilter/ip_conntrack_core.c ++++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -143,6 +143,8 @@ ip_ct_get_tuple(const struct iphdr *iph, tuple->dst.ip = iph->daddr; tuple->dst.protonum = iph->protocol; @@ -667,10 +653,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c && LIST_FIND(&ip_conntrack_expect_list, expect_clash, struct ip_conntrack_expect *, newtuple, &expect->mask)) { /* Force NAT to find an unused tuple */ -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h ++++ b/net/ipv4/netfilter/ip_conntrack_pptp_priv.h @@ -0,0 +1,24 @@ +#ifndef _IP_CT_PPTP_PRIV_H +#define _IP_CT_PPTP_PRIV_H @@ -696,10 +680,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h +}; + +#endif -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c ++++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c @@ -0,0 +1,333 @@ +/* + * ip_conntrack_proto_gre.c - Version 1.2 @@ -1034,10 +1016,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c +--- a/net/ipv4/netfilter/ip_nat_core.c ++++ b/net/ipv4/netfilter/ip_nat_core.c @@ -424,7 +424,7 @@ get_unique_tuple(struct ip_conntrack_tup *tuple = *orig_tuple; while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum)) @@ -1059,10 +1039,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c #endif /* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT): -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c ++++ b/net/ipv4/netfilter/ip_nat_pptp.c @@ -0,0 +1,482 @@ +/* + * ip_nat_pptp.c - Version 1.5 @@ -1546,10 +1524,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c ++++ b/net/ipv4/netfilter/ip_nat_proto_gre.c @@ -0,0 +1,202 @@ +/* + * ip_nat_proto_gre.c - Version 1.2 @@ -1753,10 +1729,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -36,23 +36,32 @@ obj-$(CONFIG_IP_NF_AMANDA) += ip_conntra ifdef CONFIG_IP_NF_AMANDA export-objs += ip_conntrack_amanda.o @@ -1792,10 +1766,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c ++++ b/net/ipv4/netfilter/ip_conntrack_pptp.c @@ -0,0 +1,635 @@ +/* + * ip_conntrack_pptp.c - Version 1.9 diff --git a/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch b/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch index cbf61e7113..38e75f7aa6 100644 --- a/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch +++ b/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c +--- a/net/ipv4/netfilter/ip_conntrack_core.c ++++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -1410,7 +1410,7 @@ void ip_conntrack_cleanup(void) nf_unregister_sockopt(&so_getorigdst); } diff --git a/target/linux/generic-2.4/patches/605-netfilter_TTL.patch b/target/linux/generic-2.4/patches/605-netfilter_TTL.patch index 4e297b1b9d..0171505269 100644 --- a/target/linux/generic-2.4/patches/605-netfilter_TTL.patch +++ b/target/linux/generic-2.4/patches/605-netfilter_TTL.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -3209,6 +3209,15 @@ CONFIG_IP_NF_TARGET_LOG If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -18,10 +16,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help ipchains (2.2-style) support CONFIG_IP_NF_COMPAT_IPCHAINS This option places ipchains (with masquerading and redirection -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h ++++ b/include/linux/netfilter_ipv4/ipt_TTL.h @@ -0,0 +1,21 @@ +/* TTL modification module for IP tables + * (C) 2000 by Harald Welte <laforge@gnumonks.org> */ @@ -44,10 +40,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h + + +#endif -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -125,6 +125,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE fi @@ -56,10 +50,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES dep_tristate ' TCPMSS target support' CONFIG_IP_NF_TARGET_TCPMSS $CONFIG_IP_NF_IPTABLES fi -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c ++++ b/net/ipv4/netfilter/ipt_TTL.c @@ -0,0 +1,110 @@ +/* TTL modification target for IP tables + * (C) 2000 by Harald Welte <laforge@gnumonks.org> @@ -171,10 +163,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -109,6 +109,7 @@ obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o diff --git a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch index c0e3cfaa9e..f7be0727ef 100644 --- a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch +++ b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -3086,6 +3086,17 @@ CONFIG_IP_NF_TARGET_REDIRECT If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -20,10 +18,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help Packet mangling CONFIG_IP_NF_MANGLE This option adds a `mangle' table to iptables: see the man page for -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -65,6 +65,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_bool CONFIG_IP_NF_NAT_NEEDED y dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT @@ -32,10 +28,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then define_tristate CONFIG_IP_NF_NAT_PPTP m else -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c ++++ b/net/ipv4/netfilter/ipt_NETMAP.c @@ -0,0 +1,112 @@ +/* NETMAP - static NAT mapping of IP network addresses (1:1). + The mapping can be applied to source (POSTROUTING), @@ -149,10 +143,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -107,6 +107,7 @@ obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_D obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o diff --git a/target/linux/generic-2.4/patches/607-netfilter_connmark.patch b/target/linux/generic-2.4/patches/607-netfilter_connmark.patch index cbc5f93c05..bafdfffc84 100644 --- a/target/linux/generic-2.4/patches/607-netfilter_connmark.patch +++ b/target/linux/generic-2.4/patches/607-netfilter_connmark.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -226,6 +226,9 @@ struct ip_conntrack unsigned int app_data_len; } layer7; @@ -12,10 +10,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h }; /* get master conntrack via master expectation */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h ++++ b/include/linux/netfilter_ipv4/ipt_CONNMARK.h @@ -0,0 +1,25 @@ +#ifndef _IPT_CONNMARK_H_target +#define _IPT_CONNMARK_H_target @@ -42,10 +38,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h +}; + +#endif /*_IPT_CONNMARK_H_target*/ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h ++++ b/include/linux/netfilter_ipv4/ipt_connmark.h @@ -0,0 +1,18 @@ +#ifndef _IPT_CONNMARK_H +#define _IPT_CONNMARK_H @@ -65,10 +59,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h +}; + +#endif /*_IPT_CONNMARK_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -6,7 +6,8 @@ comment ' IP: Netfilter Configuration' tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK @@ -99,10 +91,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES dep_tristate ' TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -93,6 +93,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o @@ -119,10 +109,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c +--- a/net/ipv4/netfilter/ip_conntrack_core.c ++++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -754,6 +754,9 @@ init_conntrack(const struct ip_conntrack __set_bit(IPS_EXPECTED_BIT, &conntrack->status); conntrack->master = expected; @@ -133,10 +121,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c LIST_DELETE(&ip_conntrack_expect_list, expected); expected->expectant->expecting--; nf_conntrack_get(&master_ct(conntrack)->infos[0]); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c +--- a/net/ipv4/netfilter/ip_conntrack_standalone.c ++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -107,6 +107,9 @@ print_conntrack(char *buffer, struct ip_ len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "use=%u ", @@ -147,10 +133,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c #if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE) if(conntrack->layer7.app_proto) -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c ++++ b/net/ipv4/netfilter/ipt_CONNMARK.c @@ -0,0 +1,118 @@ +/* This kernel module is used to modify the connection mark values, or + * to optionally restore the skb nfmark from the connection mark @@ -270,10 +254,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c ++++ b/net/ipv4/netfilter/ipt_connmark.c @@ -0,0 +1,83 @@ +/* This kernel module matches connection mark values set by the + * CONNMARK target diff --git a/target/linux/generic-2.4/patches/608-netfilter_ipset.patch b/target/linux/generic-2.4/patches/608-netfilter_ipset.patch index 1338a056dd..df2df33ae7 100644 --- a/target/linux/generic-2.4/patches/608-netfilter_ipset.patch +++ b/target/linux/generic-2.4/patches/608-netfilter_ipset.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -3220,6 +3220,75 @@ CONFIG_IP_NF_TARGET_LOG If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -78,10 +76,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help TTL target support CONFIG_IP_NF_TARGET_TTL This option adds a `TTL' target, which enables the user to set -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h ++++ b/include/linux/netfilter_ipv4/ip_set.h @@ -0,0 +1,489 @@ +#ifndef _IP_SET_H +#define _IP_SET_H @@ -572,10 +568,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_H*/ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h ++++ b/include/linux/netfilter_ipv4/ip_set_iphash.h @@ -0,0 +1,30 @@ +#ifndef __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H @@ -607,10 +601,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h +}; + +#endif /* __IP_SET_IPHASH_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h ++++ b/include/linux/netfilter_ipv4/ip_set_ipmap.h @@ -0,0 +1,56 @@ +#ifndef __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H @@ -668,10 +660,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h +} + +#endif /* __IP_SET_IPMAP_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h ++++ b/include/linux/netfilter_ipv4/ip_set_iptree.h @@ -0,0 +1,39 @@ +#ifndef __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H @@ -712,10 +702,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h +}; + +#endif /* __IP_SET_IPTREE_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h ++++ b/include/linux/netfilter_ipv4/ip_set_jhash.h @@ -0,0 +1,148 @@ +#ifndef _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H @@ -865,10 +853,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h +} + +#endif /* _LINUX_IPSET_JHASH_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h ++++ b/include/linux/netfilter_ipv4/ip_set_macipmap.h @@ -0,0 +1,38 @@ +#ifndef __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H @@ -908,10 +894,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h +}; + +#endif /* __IP_SET_MACIPMAP_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h ++++ b/include/linux/netfilter_ipv4/ip_set_malloc.h @@ -0,0 +1,27 @@ +#ifndef _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H @@ -940,10 +924,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h +#endif /* __KERNEL__ */ + +#endif /*_IP_SET_MALLOC_H*/ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h ++++ b/include/linux/netfilter_ipv4/ip_set_nethash.h @@ -0,0 +1,55 @@ +#ifndef __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H @@ -1000,10 +982,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h +} + +#endif /* __IP_SET_NETHASH_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h ++++ b/include/linux/netfilter_ipv4/ip_set_portmap.h @@ -0,0 +1,25 @@ +#ifndef __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H @@ -1030,10 +1010,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h +}; + +#endif /* __IP_SET_PORTMAP_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h ++++ b/include/linux/netfilter_ipv4/ip_set_prime.h @@ -0,0 +1,34 @@ +#ifndef __IP_SET_PRIME_H +#define __IP_SET_PRIME_H @@ -1069,10 +1047,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h +} + +#endif /* __IP_SET_PRIME_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h ++++ b/include/linux/netfilter_ipv4/ipt_set.h @@ -0,0 +1,21 @@ +#ifndef _IPT_SET_H +#define _IPT_SET_H @@ -1095,10 +1071,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h +}; + +#endif /*_IPT_SET_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -22,6 +22,20 @@ tristate 'IP tables support (required fo if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then # The simple matches. @@ -1120,10 +1094,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' MAC address match support' CONFIG_IP_NF_MATCH_MAC $CONFIG_IP_NF_IPTABLES dep_tristate ' Packet type match support' CONFIG_IP_NF_MATCH_PKTTYPE $CONFIG_IP_NF_IPTABLES dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c ++++ b/net/ipv4/netfilter/ip_set.c @@ -0,0 +1,2002 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -3127,10 +3099,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c ++++ b/net/ipv4/netfilter/ip_set_iphash.c @@ -0,0 +1,379 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -3511,10 +3481,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c ++++ b/net/ipv4/netfilter/ip_set_ipmap.c @@ -0,0 +1,314 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -3830,10 +3798,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c ++++ b/net/ipv4/netfilter/ip_set_iptree.c @@ -0,0 +1,511 @@ +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -4346,10 +4312,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c ++++ b/net/ipv4/netfilter/ip_set_macipmap.c @@ -0,0 +1,340 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -4691,10 +4655,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c ++++ b/net/ipv4/netfilter/ip_set_nethash.c @@ -0,0 +1,450 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -5146,10 +5108,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c ++++ b/net/ipv4/netfilter/ip_set_portmap.c @@ -0,0 +1,321 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -5472,10 +5432,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c ++++ b/net/ipv4/netfilter/ipt_set.c @@ -0,0 +1,114 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -5591,10 +5549,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c ++++ b/net/ipv4/netfilter/ipt_SET.c @@ -0,0 +1,127 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -5723,10 +5679,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -75,6 +75,18 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o diff --git a/target/linux/generic-2.4/patches/609-netfilter_string.patch b/target/linux/generic-2.4/patches/609-netfilter_string.patch index 040ef48ebe..04637f7141 100644 --- a/target/linux/generic-2.4/patches/609-netfilter_string.patch +++ b/target/linux/generic-2.4/patches/609-netfilter_string.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h ++++ b/include/linux/netfilter_ipv4/ipt_string.h @@ -0,0 +1,18 @@ +#ifndef _IPT_STRING_H +#define _IPT_STRING_H @@ -21,10 +19,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h +}; + +#endif /*_IPT_STRING_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -63,6 +63,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then @@ -33,10 +29,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES dep_tristate ' Layer 7 match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7 $CONFIG_IP_NF_CONNTRACK dep_mbool ' Layer 7 debugging output (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7_DEBUG $CONFIG_IP_NF_MATCH_LAYER7 -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c ++++ b/net/ipv4/netfilter/ipt_string.c @@ -0,0 +1,99 @@ +/* String matching match for iptables + * @@ -137,10 +131,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -108,6 +108,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o @@ -149,10 +141,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o -Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c ++++ b/net/ipv4/netfilter/textsearch/textsearch.c @@ -0,0 +1,305 @@ +/* + * lib/textsearch.c Generic text search interface @@ -459,10 +449,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c + kfree(conf); +} + -Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h ++++ b/net/ipv4/netfilter/textsearch/textsearch.h @@ -0,0 +1,182 @@ +#ifndef __LINUX_TEXTSEARCH_H +#define __LINUX_TEXTSEARCH_H @@ -646,10 +634,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h +#endif /* __KERNEL__ */ + +#endif -Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c ++++ b/net/ipv4/netfilter/textsearch/ts_bm.c @@ -0,0 +1,190 @@ +/* + * lib/ts_bm.c Boyer-Moore text search implementation @@ -841,10 +827,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c +{ + textsearch_unregister(&bm_ops); +} -Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c ++++ b/net/ipv4/netfilter/textsearch/ts_kmp.c @@ -0,0 +1,141 @@ +/* + * lib/ts_kmp.c Knuth-Morris-Pratt text search implementation diff --git a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch index 42932f7276..99f81c1665 100644 --- a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch +++ b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -11,6 +11,8 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK @@ -11,10 +9,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE fi -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -106,6 +106,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o @@ -23,10 +19,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_amanda.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c +--- a/net/ipv4/netfilter/ip_conntrack_amanda.c ++++ b/net/ipv4/netfilter/ip_conntrack_amanda.c @@ -75,7 +75,7 @@ static int help(const struct iphdr *iph, /* increase the UDP timeout of the master connection as replies from @@ -36,10 +30,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c /* Search for "CONNECT " string */ do { -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c ++++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -211,7 +211,7 @@ static int tcp_packet(struct ip_conntrac set_bit(IPS_ASSURED_BIT, &conntrack->status); @@ -49,10 +41,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c } return NF_ACCEPT; -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_udp.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c +--- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c ++++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c @@ -47,16 +47,16 @@ static unsigned int udp_print_conntrack( /* Returns verdict for packet, and may modify conntracktype */ static int udp_packet(struct ip_conntrack *conntrack, @@ -73,10 +63,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c return NF_ACCEPT; } -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c +--- a/net/ipv4/netfilter/ip_conntrack_standalone.c ++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -79,6 +79,18 @@ print_expect(char *buffer, const struct return len; } @@ -121,10 +109,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c EXPORT_SYMBOL(ip_ct_find_proto); EXPORT_SYMBOL(__ip_ct_find_proto); EXPORT_SYMBOL(ip_ct_find_helper); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_generic.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c +--- a/net/ipv4/netfilter/ip_conntrack_proto_generic.c ++++ b/net/ipv4/netfilter/ip_conntrack_proto_generic.c @@ -41,9 +41,9 @@ static unsigned int generic_print_conntr /* Returns verdict for packet, or -1 for invalid. */ static int established(struct ip_conntrack *conntrack, @@ -137,10 +123,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c return NF_ACCEPT; } -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +--- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c ++++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c @@ -82,7 +82,7 @@ static int icmp_packet(struct ip_conntra ct->timeout.function((unsigned long)ct); } else { @@ -150,10 +134,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c } return NF_ACCEPT; -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c +--- a/net/ipv4/netfilter/ip_conntrack_core.c ++++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -1196,22 +1196,40 @@ void ip_conntrack_helper_unregister(stru MOD_DEC_USE_COUNT; @@ -198,10 +180,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c } WRITE_UNLOCK(&ip_conntrack_lock); } -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -164,6 +164,12 @@ struct ip_conntrack_expect union ip_conntrack_expect_help help; }; @@ -241,10 +221,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* These are for NAT. Icky. */ /* Call me when a conntrack is destroyed. */ -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c ++++ b/net/ipv4/netfilter/ipt_connbytes.c @@ -0,0 +1,163 @@ +/* Kernel module to match connection tracking byte counter. + * GPL (C) 2002 Martin Devera (devik@cdi.cz). @@ -409,10 +387,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c +module_init(init); +module_exit(fini); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h ++++ b/include/linux/netfilter_ipv4/ipt_connbytes.h @@ -0,0 +1,25 @@ +#ifndef _IPT_CONNBYTES_H +#define _IPT_CONNBYTES_H @@ -439,10 +415,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h +}; + +#endif -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_gre.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c +--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c ++++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c @@ -237,16 +237,16 @@ static unsigned int gre_print_conntrack( /* Returns verdict for packet, and may modify conntrack */ static int gre_packet(struct ip_conntrack *ct, diff --git a/target/linux/generic-2.4/patches/611-netfilter_condition.patch b/target/linux/generic-2.4/patches/611-netfilter_condition.patch index c6ffe5b325..de76f876d4 100644 --- a/target/linux/generic-2.4/patches/611-netfilter_condition.patch +++ b/target/linux/generic-2.4/patches/611-netfilter_condition.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -2979,6 +2979,14 @@ CONFIG_IP_NF_MATCH_TOS If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -32,10 +30,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help Multiple port match support CONFIG_IP6_NF_MATCH_MULTIPORT Multiport matching allows you to match TCP or UDP packets based on -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h ++++ b/include/linux/netfilter_ipv4/ipt_condition.h @@ -0,0 +1,11 @@ +#ifndef __IPT_CONDITION_MATCH__ +#define __IPT_CONDITION_MATCH__ @@ -48,10 +44,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h +}; + +#endif -Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h ++++ b/include/linux/netfilter_ipv6/ip6t_condition.h @@ -0,0 +1,11 @@ +#ifndef __IP6T_CONDITION_MATCH__ +#define __IP6T_CONDITION_MATCH__ @@ -64,10 +58,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h +}; + +#endif -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -43,6 +43,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES @@ -76,10 +68,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES dep_tristate ' peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -94,6 +94,7 @@ obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o @@ -88,10 +78,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c ++++ b/net/ipv4/netfilter/ipt_condition.c @@ -0,0 +1,256 @@ +/*-------------------------------------------*\ +| Netfilter Condition Module | @@ -349,10 +337,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in +--- a/net/ipv6/netfilter/Config.in ++++ b/net/ipv6/netfilter/Config.in @@ -17,6 +17,7 @@ tristate 'IP6 tables support (required f if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then # The simple matches. @@ -361,10 +347,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile +--- a/net/ipv6/netfilter/Makefile ++++ b/net/ipv6/netfilter/Makefile @@ -14,6 +14,7 @@ export-objs := ip6_tables.o # Link order matters here. obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o @@ -373,10 +357,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o obj-$(CONFIG_IP6_NF_MATCH_LENGTH) += ip6t_length.o obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o -Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c ++++ b/net/ipv6/netfilter/ip6t_condition.c @@ -0,0 +1,254 @@ +/*-------------------------------------------*\ +| Netfilter Condition Module for IPv6 | diff --git a/target/linux/generic-2.4/patches/612-netfilter_quota.patch b/target/linux/generic-2.4/patches/612-netfilter_quota.patch index 6e5f75d3d3..e38e12e8a7 100644 --- a/target/linux/generic-2.4/patches/612-netfilter_quota.patch +++ b/target/linux/generic-2.4/patches/612-netfilter_quota.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -2888,6 +2888,13 @@ CONFIG_IP_NF_MATCH_LIMIT If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -16,10 +14,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help skb->pkt_type packet match support CONFIG_IP_NF_MATCH_PKTTYPE This patch allows you to match packet in accrodance -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h ++++ b/include/linux/netfilter_ipv4/ipt_quota.h @@ -0,0 +1,12 @@ +#ifndef _IPT_QUOTA_H +#define _IPT_QUOTA_H @@ -33,10 +29,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h +}; + +#endif /*_IPT_QUOTA_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -24,6 +24,7 @@ tristate 'IP tables support (required fo if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then # The simple matches. @@ -45,10 +39,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES if [ "$CONFIG_IP_NF_SET" != "n" ]; then -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -74,6 +74,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o # matches obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o @@ -57,10 +49,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c ++++ b/net/ipv4/netfilter/ipt_quota.c @@ -0,0 +1,88 @@ +/* + * netfilter module to enforce network quotas diff --git a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch index 996b21fb4b..cb23abde6d 100644 --- a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch +++ b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -15,6 +15,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; dep_tristate ' Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK @@ -24,10 +22,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT fi -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -53,6 +53,10 @@ obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack ifdef CONFIG_IP_NF_NAT_PPTP export-objs += ip_conntrack_pptp.o @@ -47,10 +43,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c ++++ b/net/ipv4/netfilter/ip_conntrack_h323.c @@ -0,0 +1,302 @@ +/* + * H.323 'brute force' extension for H.323 connection tracking. @@ -354,10 +348,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c ++++ b/net/ipv4/netfilter/ip_nat_h323.c @@ -0,0 +1,403 @@ +/* + * H.323 'brute force' extension for NAT alteration. @@ -762,10 +754,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -71,6 +71,7 @@ union ip_conntrack_expect_proto { #include <linux/netfilter_ipv4/ip_conntrack_ftp.h> #include <linux/netfilter_ipv4/ip_conntrack_irc.h> @@ -790,10 +780,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h }; #ifdef CONFIG_IP_NF_NAT_NEEDED -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h @@ -0,0 +1,30 @@ +#ifndef _IP_CONNTRACK_H323_H +#define _IP_CONNTRACK_H323_H diff --git a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch index 7fd2c8b3cb..289682dee7 100644 --- a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch +++ b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -16,6 +16,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE @@ -24,10 +22,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT fi -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -57,6 +57,11 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack ifdef CONFIG_IP_NF_NAT_H323 export-objs += ip_conntrack_h323.o @@ -48,10 +44,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c ++++ b/net/ipv4/netfilter/ip_conntrack_rtsp.c @@ -0,0 +1,507 @@ +/* + * RTSP extension for IP connection tracking @@ -560,10 +554,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c ++++ b/net/ipv4/netfilter/ip_nat_rtsp.c @@ -0,0 +1,621 @@ +/* + * RTSP extension for TCP NAT alteration @@ -1186,10 +1178,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c -=================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c -+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c +--- a/arch/mips/kernel/mips_ksyms.c ++++ b/arch/mips/kernel/mips_ksyms.c @@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus); /* * String functions @@ -1198,10 +1188,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c EXPORT_SYMBOL_NOVERS(memcmp); EXPORT_SYMBOL_NOVERS(memset); EXPORT_SYMBOL_NOVERS(memcpy); -Index: linux-2.4.35.4/include/linux/netfilter_helpers.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_helpers.h ++++ b/include/linux/netfilter_helpers.h @@ -0,0 +1,133 @@ +/* + * Helpers for netfiler modules. This file provides implementations for basic @@ -1336,10 +1324,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_helpers.h +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_HELPERS_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h @@ -0,0 +1,68 @@ +/* + * RTSP extension for IP connection tracking. @@ -1409,10 +1395,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h +#endif /* __KERNEL__ */ + +#endif /* _IP_CONNTRACK_RTSP_H */ -Index: linux-2.4.35.4/include/linux/netfilter_mime.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_mime.h ++++ b/include/linux/netfilter_mime.h @@ -0,0 +1,90 @@ +/* + * MIME functions for netfilter modules. This file provides implementations @@ -1504,10 +1488,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_mime.h +#endif /* __KERNEL__ */ + +#endif /* _NETFILTER_MIME_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -72,6 +72,7 @@ union ip_conntrack_expect_proto { #include <linux/netfilter_ipv4/ip_conntrack_irc.h> #include <linux/netfilter_ipv4/ip_conntrack_pptp.h> diff --git a/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch b/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch index 8fe407582e..a95b652ef3 100644 --- a/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch +++ b/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -17,6 +17,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK @@ -24,10 +22,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT fi -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -61,6 +61,10 @@ obj-$(CONFIG_IP_NF_RTSP) += ip_conntrack ifdef CONFIG_IP_NF_NAT_RTSP export-objs += ip_conntrack_rtsp.o @@ -47,10 +43,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # generic IP tables obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c ++++ b/net/ipv4/netfilter/ip_conntrack_mms.c @@ -0,0 +1,292 @@ +/* MMS extension for IP connection tracking + * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be> @@ -344,10 +338,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c ++++ b/net/ipv4/netfilter/ip_nat_mms.c @@ -0,0 +1,330 @@ +/* MMS extension for TCP NAT alteration. + * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be> @@ -679,10 +671,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h +--- a/include/linux/netfilter_ipv4/ip_conntrack.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -73,6 +73,7 @@ union ip_conntrack_expect_proto { #include <linux/netfilter_ipv4/ip_conntrack_pptp.h> #include <linux/netfilter_ipv4/ip_conntrack_h323.h> @@ -707,10 +697,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h }; #ifdef CONFIG_IP_NF_NAT_NEEDED -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h ++++ b/include/linux/netfilter_ipv4/ip_conntrack_mms.h @@ -0,0 +1,31 @@ +#ifndef _IP_CONNTRACK_MMS_H +#define _IP_CONNTRACK_MMS_H diff --git a/target/linux/generic-2.4/patches/616-netfilter_imq.patch b/target/linux/generic-2.4/patches/616-netfilter_imq.patch index e0cf1b9bda..b8c0523df1 100644 --- a/target/linux/generic-2.4/patches/616-netfilter_imq.patch +++ b/target/linux/generic-2.4/patches/616-netfilter_imq.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -3160,6 +3160,22 @@ CONFIG_IP_NF_TARGET_TOS If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -46,10 +44,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help SLIP (serial line) support CONFIG_SLIP Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to -Index: linux-2.4.35.4/drivers/net/Config.in -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/Config.in -+++ linux-2.4.35.4/drivers/net/Config.in +--- a/drivers/net/Config.in ++++ b/drivers/net/Config.in @@ -7,6 +7,11 @@ source drivers/net/arcnet/Config.in tristate 'Dummy net driver support' CONFIG_DUMMY tristate 'Bonding driver support' CONFIG_BONDING @@ -62,10 +58,8 @@ Index: linux-2.4.35.4/drivers/net/Config.in tristate 'Universal TUN/TAP device driver support' CONFIG_TUN bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -Index: linux-2.4.35.4/drivers/net/Makefile -=================================================================== ---- linux-2.4.35.4.orig/drivers/net/Makefile -+++ linux-2.4.35.4/drivers/net/Makefile +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile @@ -176,6 +176,7 @@ endif obj-$(CONFIG_STRIP) += strip.o @@ -74,10 +68,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o obj-$(CONFIG_AT1500) += lance.o -Index: linux-2.4.35.4/drivers/net/imq.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/drivers/net/imq.c ++++ b/drivers/net/imq.c @@ -0,0 +1,321 @@ +/* + * Pseudo-driver for the intermediate queue device. @@ -400,10 +392,8 @@ Index: linux-2.4.35.4/drivers/net/imq.c +module_init(imq_init_module); +module_exit(imq_cleanup_module); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/include/linux/imq.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/imq.h ++++ b/include/linux/imq.h @@ -0,0 +1,9 @@ +#ifndef _IMQ_H +#define _IMQ_H @@ -414,10 +404,8 @@ Index: linux-2.4.35.4/include/linux/imq.h +#define IMQ_F_ENQUEUE 0x80 + +#endif /* _IMQ_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h ++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IPT_IMQ_H +#define _IPT_IMQ_H @@ -427,10 +415,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h +}; + +#endif /* _IPT_IMQ_H */ -Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h ++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IP6T_IMQ_H +#define _IP6T_IMQ_H @@ -440,10 +426,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h +}; + +#endif /* _IP6T_IMQ_H */ -Index: linux-2.4.35.4/include/linux/skbuff.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/skbuff.h -+++ linux-2.4.35.4/include/linux/skbuff.h +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h @@ -93,6 +93,9 @@ struct nf_ct_info { struct nf_conntrack *master; }; @@ -473,10 +457,8 @@ Index: linux-2.4.35.4/include/linux/skbuff.h }; #ifdef __KERNEL__ -Index: linux-2.4.35.4/net/core/skbuff.c -=================================================================== ---- linux-2.4.35.4.orig/net/core/skbuff.c -+++ linux-2.4.35.4/net/core/skbuff.c +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c @@ -202,6 +202,10 @@ struct sk_buff *alloc_skb(unsigned int s /* Set up other state */ skb->len = 0; @@ -521,10 +503,8 @@ Index: linux-2.4.35.4/net/core/skbuff.c } /** -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -171,6 +171,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE @@ -533,10 +513,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then dep_tristate ' CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -138,6 +138,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o @@ -545,10 +523,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c ++++ b/net/ipv4/netfilter/ipt_IMQ.c @@ -0,0 +1,78 @@ +/* This target marks packets to be enqueued to an imq device */ +#include <linux/module.h> @@ -628,10 +604,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c +module_init(init); +module_exit(fini); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in +--- a/net/ipv6/netfilter/Config.in ++++ b/net/ipv6/netfilter/Config.in @@ -72,6 +72,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then # dep_tristate ' TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE @@ -640,10 +614,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in fi #dep_tristate ' LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_IPTABLES fi -Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile +--- a/net/ipv6/netfilter/Makefile ++++ b/net/ipv6/netfilter/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o @@ -652,10 +624,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o -Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c ++++ b/net/ipv6/netfilter/ip6t_IMQ.c @@ -0,0 +1,78 @@ +/* This target marks packets to be enqueued to an imq device */ +#include <linux/module.h> @@ -735,10 +705,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c +module_init(init); +module_exit(fini); +MODULE_LICENSE("GPL"); -Index: linux-2.4.35.4/net/sched/sch_generic.c -=================================================================== ---- linux-2.4.35.4.orig/net/sched/sch_generic.c -+++ linux-2.4.35.4/net/sched/sch_generic.c +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c @@ -29,6 +29,9 @@ #include <linux/skbuff.h> #include <linux/rtnetlink.h> diff --git a/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch b/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch index 38ac94a562..cc1d898102 100644 --- a/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch +++ b/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ipt_multiport.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h +--- a/include/linux/netfilter_ipv4/ipt_multiport.h ++++ b/include/linux/netfilter_ipv4/ipt_multiport.h @@ -11,11 +11,12 @@ enum ipt_multiport_flags #define IPT_MULTI_PORTS 15 @@ -17,10 +15,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h + u_int8_t invert; /* Invert flag */ }; #endif /*_IPT_MULTIPORT_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c +--- a/net/ipv4/netfilter/ipt_multiport.c ++++ b/net/ipv4/netfilter/ipt_multiport.c @@ -1,5 +1,14 @@ /* Kernel module to match one of a list of TCP/UDP ports: ports are in the same place so we can treat them as equal. */ diff --git a/target/linux/generic-2.4/patches/619-netfilter_classify.patch b/target/linux/generic-2.4/patches/619-netfilter_classify.patch index 084c85cf8d..7003537d2e 100644 --- a/target/linux/generic-2.4/patches/619-netfilter_classify.patch +++ b/target/linux/generic-2.4/patches/619-netfilter_classify.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h ++++ b/include/linux/netfilter_ipv4/ipt_CLASSIFY.h @@ -0,0 +1,8 @@ +#ifndef _IPT_CLASSIFY_H +#define _IPT_CLASSIFY_H @@ -11,11 +9,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h +}; + +#endif /*_IPT_CLASSIFY_H */ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in -@@ -172,6 +172,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in +@@ -171,6 +171,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE @@ -23,10 +19,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' IMQ target support' CONFIG_IP_NF_TARGET_IMQ $CONFIG_IP_NF_MANGLE fi if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c ++++ b/net/ipv4/netfilter/ipt_CLASSIFY.c @@ -0,0 +1,82 @@ +/* + * This is a module which is used for setting the skb->priority field @@ -110,11 +104,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile -@@ -134,6 +134,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_ +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -133,6 +133,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_ # targets obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o diff --git a/target/linux/generic-2.4/patches/620-netfilter_iprange.patch b/target/linux/generic-2.4/patches/620-netfilter_iprange.patch index ed1927fb51..505d22ee1a 100644 --- a/target/linux/generic-2.4/patches/620-netfilter_iprange.patch +++ b/target/linux/generic-2.4/patches/620-netfilter_iprange.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -2986,6 +2986,14 @@ CONFIG_IP_NF_MATCH_TOS If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -17,10 +15,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help Condition variable match support CONFIG_IP_NF_MATCH_CONDITION This option allows you to match firewall rules against condition -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h ++++ b/include/linux/netfilter_ipv4/ipt_iprange.h @@ -0,0 +1,23 @@ +#ifndef _IPT_IPRANGE_H +#define _IPT_IPRANGE_H @@ -45,10 +41,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h +}; + +#endif /* _IPT_IPRANGE_H */ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -27,6 +27,7 @@ tristate 'IP tables support (required fo if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then # The simple matches. @@ -57,10 +51,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' quota match support' CONFIG_IP_NF_MATCH_QUOTA $CONFIG_IP_NF_IPTABLES dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c ++++ b/net/ipv4/netfilter/ipt_iprange.c @@ -0,0 +1,101 @@ +/* + * iptables module to match IP address ranges @@ -163,10 +155,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile @@ -90,6 +90,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o # matches obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o diff --git a/target/linux/generic-2.4/patches/621-netfilter_random.patch b/target/linux/generic-2.4/patches/621-netfilter_random.patch index b76272dd54..2ede6432b9 100644 --- a/target/linux/generic-2.4/patches/621-netfilter_random.patch +++ b/target/linux/generic-2.4/patches/621-netfilter_random.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -2914,6 +2914,15 @@ CONFIG_IP_NF_MATCH_MAC If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -41,10 +39,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help length match support CONFIG_IP6_NF_MATCH_LENGTH This option allows you to match the length of a packet against a -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h ++++ b/include/linux/netfilter_ipv4/ipt_random.h @@ -0,0 +1,11 @@ +#ifndef _IPT_RAND_H +#define _IPT_RAND_H @@ -57,10 +53,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h +}; + +#endif /*_IPT_RAND_H*/ -Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h ++++ b/include/linux/netfilter_ipv6/ip6t_random.h @@ -0,0 +1,11 @@ +#ifndef _IP6T_RAND_H +#define _IP6T_RAND_H @@ -73,10 +67,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h +}; + +#endif /*_IP6T_RAND_H*/ -Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +--- a/net/ipv4/netfilter/Config.in ++++ b/net/ipv4/netfilter/Config.in @@ -48,6 +48,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES @@ -85,10 +77,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' condition match support' CONFIG_IP_NF_MATCH_CONDITION $CONFIG_IP_NF_IPTABLES dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c ++++ b/net/ipv4/netfilter/ipt_random.c @@ -0,0 +1,96 @@ +/* + This is a module which is used for a "random" match support. @@ -186,12 +176,10 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile -@@ -115,6 +115,8 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos - obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o +--- a/net/ipv4/netfilter/Makefile ++++ b/net/ipv4/netfilter/Makefile +@@ -114,6 +114,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o + obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o +obj-$(CONFIG_IP_NF_MATCH_RANDOM) += ipt_random.o @@ -199,10 +187,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o -Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in +--- a/net/ipv6/netfilter/Config.in ++++ b/net/ipv6/netfilter/Config.in @@ -19,6 +19,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES dep_tristate ' condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES @@ -211,10 +197,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES fi -Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c ++++ b/net/ipv6/netfilter/ip6t_random.c @@ -0,0 +1,97 @@ +/* + This is a module which is used for a "random" match support. @@ -313,10 +297,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile +--- a/net/ipv6/netfilter/Makefile ++++ b/net/ipv6/netfilter/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o diff --git a/target/linux/generic-2.4/patches/622-tc_esfq.patch b/target/linux/generic-2.4/patches/622-tc_esfq.patch index 2a05f03456..7889d7fd93 100644 --- a/target/linux/generic-2.4/patches/622-tc_esfq.patch +++ b/target/linux/generic-2.4/patches/622-tc_esfq.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/Documentation/Configure.help -=================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help -+++ linux-2.4.35.4/Documentation/Configure.help +--- a/Documentation/Configure.help ++++ b/Documentation/Configure.help @@ -11153,6 +11153,24 @@ CONFIG_NET_SCH_HFSC whenever you want). If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. @@ -27,10 +25,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help CSZ packet scheduler CONFIG_NET_SCH_CSZ Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet -Index: linux-2.4.35.4/include/linux/pkt_sched.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/pkt_sched.h -+++ linux-2.4.35.4/include/linux/pkt_sched.h +--- a/include/linux/pkt_sched.h ++++ b/include/linux/pkt_sched.h @@ -173,8 +173,36 @@ struct tc_sfq_qopt * * The only reason for this is efficiency, it is possible @@ -68,10 +64,8 @@ Index: linux-2.4.35.4/include/linux/pkt_sched.h /* RED section */ enum -Index: linux-2.4.35.4/net/sched/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/sched/Config.in -+++ linux-2.4.35.4/net/sched/Config.in +--- a/net/sched/Config.in ++++ b/net/sched/Config.in @@ -12,6 +12,7 @@ fi tristate ' The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO tristate ' RED queue' CONFIG_NET_SCH_RED @@ -80,10 +74,8 @@ Index: linux-2.4.35.4/net/sched/Config.in tristate ' TEQL queue' CONFIG_NET_SCH_TEQL tristate ' TBF queue' CONFIG_NET_SCH_TBF tristate ' GRED queue' CONFIG_NET_SCH_GRED -Index: linux-2.4.35.4/net/sched/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/sched/Makefile -+++ linux-2.4.35.4/net/sched/Makefile +--- a/net/sched/Makefile ++++ b/net/sched/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o @@ -92,10 +84,8 @@ Index: linux-2.4.35.4/net/sched/Makefile obj-$(CONFIG_NET_SCH_RED) += sch_red.o obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o -Index: linux-2.4.35.4/net/sched/sch_esfq.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/sched/sch_esfq.c ++++ b/net/sched/sch_esfq.c @@ -0,0 +1,649 @@ +/* + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. diff --git a/target/linux/generic-2.4/patches/623-netfilter_ipset_porthash.patch b/target/linux/generic-2.4/patches/623-netfilter_ipset_porthash.patch index 0fc1ec6219..19529ca66b 100644 --- a/target/linux/generic-2.4/patches/623-netfilter_ipset_porthash.patch +++ b/target/linux/generic-2.4/patches/623-netfilter_ipset_porthash.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h -=================================================================== --- /dev/null -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h ++++ b/include/linux/netfilter_ipv4/ip_set_ipporthash.h @@ -0,0 +1,34 @@ +#ifndef __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H diff --git a/target/linux/generic-2.4/patches/624-netfilter_ip6t_reject.patch b/target/linux/generic-2.4/patches/624-netfilter_ip6t_reject.patch index 2caae3ab01..1960e9c010 100644 --- a/target/linux/generic-2.4/patches/624-netfilter_ip6t_reject.patch +++ b/target/linux/generic-2.4/patches/624-netfilter_ip6t_reject.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c -=================================================================== --- /dev/null -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c ++++ b/net/ipv6/netfilter/ip6t_REJECT.c @@ -0,0 +1,301 @@ +/* + * This is a module which is used for rejecting packets. @@ -304,10 +302,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c + +module_init(init); +module_exit(fini); -Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h +--- a/include/linux/netfilter_ipv6/ip6t_REJECT.h ++++ b/include/linux/netfilter_ipv6/ip6t_REJECT.h @@ -2,15 +2,17 @@ #define _IP6T_REJECT_H @@ -332,10 +328,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h -#endif /*_IPT_REJECT_H*/ +#endif /*_IP6T_REJECT_H*/ -Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile +--- a/net/ipv6/netfilter/Makefile ++++ b/net/ipv6/netfilter/Makefile @@ -34,5 +34,7 @@ obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue. obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o obj-$(CONFIG_IP6_NF_MATCH_RANDOM) += ip6t_random.o @@ -344,10 +338,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile + include $(TOPDIR)/Rules.make -Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in -=================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in +--- a/net/ipv6/netfilter/Config.in ++++ b/net/ipv6/netfilter/Config.in @@ -61,6 +61,9 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then dep_tristate ' LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_FILTER diff --git a/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch b/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch index 7d5895e6f0..ec62aa2194 100644 --- a/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch +++ b/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_nat.h -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h +--- a/include/linux/netfilter_ipv4/ip_nat.h ++++ b/include/linux/netfilter_ipv4/ip_nat.h @@ -121,5 +121,13 @@ extern int ip_nat_used_tuple(const struc extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv, u_int32_t newval, @@ -16,10 +14,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h + #endif /*__KERNEL__*/ #endif -Index: linux-2.4.35.4/include/linux/rtnetlink.h -=================================================================== ---- linux-2.4.35.4.orig/include/linux/rtnetlink.h -+++ linux-2.4.35.4/include/linux/rtnetlink.h +--- a/include/linux/rtnetlink.h ++++ b/include/linux/rtnetlink.h @@ -234,6 +234,8 @@ struct rtnexthop #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */ #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */ @@ -29,10 +25,8 @@ Index: linux-2.4.35.4/include/linux/rtnetlink.h /* Macros to handle hexthops */ -Index: linux-2.4.35.4/include/net/ip_fib.h -=================================================================== ---- linux-2.4.35.4.orig/include/net/ip_fib.h -+++ linux-2.4.35.4/include/net/ip_fib.h +--- a/include/net/ip_fib.h ++++ b/include/net/ip_fib.h @@ -162,7 +162,8 @@ static inline int fib_lookup(const struc static inline void fib_select_default(const struct rt_key *key, struct fib_result *res) @@ -58,10 +52,8 @@ Index: linux-2.4.35.4/include/net/ip_fib.h +extern rwlock_t fib_nhflags_lock; #endif /* _NET_FIB_H */ -Index: linux-2.4.35.4/include/net/route.h -=================================================================== ---- linux-2.4.35.4.orig/include/net/route.h -+++ linux-2.4.35.4/include/net/route.h +--- a/include/net/route.h ++++ b/include/net/route.h @@ -49,6 +49,8 @@ struct rt_key { __u32 dst; @@ -95,10 +87,8 @@ Index: linux-2.4.35.4/include/net/route.h static inline void ip_rt_put(struct rtable * rt) { if (rt) -Index: linux-2.4.35.4/net/ipv4/fib_frontend.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c -+++ linux-2.4.35.4/net/ipv4/fib_frontend.c +--- a/net/ipv4/fib_frontend.c ++++ b/net/ipv4/fib_frontend.c @@ -54,6 +54,8 @@ struct fib_table *local_table; struct fib_table *main_table; @@ -197,10 +187,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c rt_cache_flush(-1); break; case NETDEV_DOWN: -Index: linux-2.4.35.4/net/ipv4/fib_hash.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/fib_hash.c -+++ linux-2.4.35.4/net/ipv4/fib_hash.c +--- a/net/ipv4/fib_hash.c ++++ b/net/ipv4/fib_hash.c @@ -71,6 +71,7 @@ struct fib_node struct fib_info *fn_info; #define FIB_INFO(f) ((f)->fn_info) @@ -414,10 +402,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c new_f->fn_key = key; #ifdef CONFIG_IP_ROUTE_TOS new_f->fn_tos = tos; -Index: linux-2.4.35.4/net/ipv4/fib_rules.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/fib_rules.c -+++ linux-2.4.35.4/net/ipv4/fib_rules.c +--- a/net/ipv4/fib_rules.c ++++ b/net/ipv4/fib_rules.c @@ -307,6 +307,11 @@ static void fib_rules_attach(struct net_ } } @@ -443,10 +429,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_rules.c struct fib_table *tb; if ((tb = fib_get_table(res->r->r_table)) != NULL) tb->tb_select_default(tb, key, res); -Index: linux-2.4.35.4/net/ipv4/fib_semantics.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c -+++ linux-2.4.35.4/net/ipv4/fib_semantics.c +--- a/net/ipv4/fib_semantics.c ++++ b/net/ipv4/fib_semantics.c @@ -48,6 +48,7 @@ static struct fib_info *fib_info_list; static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED; @@ -802,10 +786,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c spin_unlock_bh(&fib_multipath_lock); } #endif -Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c -+++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c +--- a/net/ipv4/ip_nat_dumb.c ++++ b/net/ipv4/ip_nat_dumb.c @@ -124,6 +124,7 @@ ip_do_nat(struct sk_buff *skb) key.dst = ciph->saddr; key.iif = skb->dev->ifindex; @@ -814,10 +796,8 @@ Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c #ifdef CONFIG_IP_ROUTE_TOS key.tos = RT_TOS(ciph->tos); #endif -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_fw_compat_masq.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c +--- a/net/ipv4/netfilter/ip_fw_compat_masq.c ++++ b/net/ipv4/netfilter/ip_fw_compat_masq.c @@ -41,6 +41,10 @@ do_masquerade(struct sk_buff **pskb, con enum ip_conntrack_info ctinfo; struct ip_conntrack *ct; @@ -895,10 +875,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c } void -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c +--- a/net/ipv4/netfilter/ip_nat_core.c ++++ b/net/ipv4/netfilter/ip_nat_core.c @@ -994,6 +994,60 @@ icmp_reply_translation(struct sk_buff *s return NF_ACCEPT; } @@ -960,10 +938,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c int __init ip_nat_init(void) { size_t i; -Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_standalone.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c +--- a/net/ipv4/netfilter/ip_nat_standalone.c ++++ b/net/ipv4/netfilter/ip_nat_standalone.c @@ -245,6 +245,9 @@ ip_nat_local_fn(unsigned int hooknum, /* Before packet filtering, change destination */ static struct nf_hook_ops ip_nat_in_ops @@ -1000,10 +976,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c cleanup_inops: nf_unregister_hook(&ip_nat_in_ops); cleanup_nat: -Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c +--- a/net/ipv4/netfilter/ipt_MASQUERADE.c ++++ b/net/ipv4/netfilter/ipt_MASQUERADE.c @@ -87,7 +87,8 @@ masquerade_target(struct sk_buff **pskb, key.dst = (*pskb)->nh.iph->daddr; key.src = 0; /* Unknown: that's what we're trying to establish */ @@ -1028,10 +1002,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c newsrc = rt->rt_src; DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc)); -Index: linux-2.4.35.4/net/ipv4/route.c -=================================================================== ---- linux-2.4.35.4.orig/net/ipv4/route.c -+++ linux-2.4.35.4/net/ipv4/route.c +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c @@ -919,6 +919,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd /* Gateway is different ... */ @@ -1300,10 +1272,8 @@ Index: linux-2.4.35.4/net/ipv4/route.c #ifdef CONFIG_IP_ROUTE_FWMARK rth->key.fwmark == key->fwmark && #endif -Index: linux-2.4.35.4/net/netsyms.c -=================================================================== ---- linux-2.4.35.4.orig/net/netsyms.c -+++ linux-2.4.35.4/net/netsyms.c +--- a/net/netsyms.c ++++ b/net/netsyms.c @@ -260,6 +260,7 @@ EXPORT_SYMBOL(inet_register_protosw); EXPORT_SYMBOL(inet_unregister_protosw); EXPORT_SYMBOL(ip_route_output_key); diff --git a/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch index 5cc0d844a5..2e436f0fa5 100644 --- a/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c -+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c +--- a/drivers/usb/serial/usbserial.c ++++ b/drivers/usb/serial/usbserial.c @@ -331,6 +331,7 @@ static void generic_shutdown (struct us #ifdef CONFIG_USB_SERIAL_GENERIC static __u16 vendor = 0x05f9; diff --git a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch index 24c6888de2..808e49c430 100644 --- a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch +++ b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch @@ -1,7 +1,5 @@ -Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c -=================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c -+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c +--- a/drivers/usb/serial/usbserial.c ++++ b/drivers/usb/serial/usbserial.c @@ -333,7 +333,7 @@ static __u16 vendor = 0x05f9; static __u16 product = 0xffff; static int maxSize = 0; diff --git a/target/linux/generic-2.4/patches/803-mii_ioctl.patch b/target/linux/generic-2.4/patches/803-mii_ioctl.patch index 9c74a58bac..86b0309d4a 100644 --- a/target/linux/generic-2.4/patches/803-mii_ioctl.patch +++ b/target/linux/generic-2.4/patches/803-mii_ioctl.patch @@ -1,6 +1,5 @@ -diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mii.h ---- linux-2.4.35.4/include/linux/mii.h 2007-11-17 18:23:15.000000000 +0100 -+++ linux-2.4.35.4.new/include/linux/mii.h 2009-03-15 17:32:45.000000000 +0100 +--- a/include/linux/mii.h ++++ b/include/linux/mii.h @@ -9,7 +9,6 @@ #define __LINUX_MII_H__ @@ -29,7 +28,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi struct mii_if_info { int phy_id; -@@ -119,9 +131,6 @@ +@@ -119,9 +131,6 @@ struct mii_if_info { void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); }; @@ -39,7 +38,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi extern int mii_link_ok (struct mii_if_info *mii); extern int mii_nway_restart (struct mii_if_info *mii); extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); -@@ -136,15 +145,6 @@ +@@ -136,15 +145,6 @@ extern int generic_mii_ioctl(struct mii_ @@ -55,7 +54,7 @@ diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mi static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) { return (struct mii_ioctl_data *) &rq->ifr_ifru; -@@ -202,5 +202,5 @@ +@@ -202,5 +202,5 @@ static inline unsigned int mii_duplex (u return 0; } |