diff -u -rN linux-2.4.23/arch/i386/boot/Makefile linux/arch/i386/boot/Makefile --- linux-2.4.23/arch/i386/boot/Makefile 2001-08-05 22:13:19.000000000 +0200 +++ linux/arch/i386/boot/Makefile 2003-11-30 18:28:51.000000000 +0100 @@ -30,10 +30,10 @@ dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0 zlilo: $(CONFIGURE) $(BOOTIMAGE) - if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi - if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi - cat $(BOOTIMAGE) > $(INSTALL_PATH)/vmlinuz - cp $(TOPDIR)/System.map $(INSTALL_PATH)/ + if [ -f $(INSTALL_PATH)/vmlinuz ]; then cp -p $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi + if [ -f $(INSTALL_PATH)/System.map ]; then cp -p $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi + cp -p $(BOOTIMAGE) $(INSTALL_PATH)/vmlinuz + cp -p $(TOPDIR)/System.map $(INSTALL_PATH)/ if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi install: $(CONFIGURE) $(BOOTIMAGE) diff -u -rN linux-2.4.23/drivers/isdn/isdn_net.c linux/drivers/isdn/isdn_net.c --- linux-2.4.23/drivers/isdn/isdn_net.c 2003-08-25 13:44:42.000000000 +0200 +++ linux/drivers/isdn/isdn_net.c 2003-11-30 18:28:51.000000000 +0100 @@ -346,8 +346,10 @@ else l->cps = (l->transcount * HZ) / (jiffies - last_jiffies); l->transcount = 0; +#if 0 if (dev->net_verbose > 3) printk(KERN_DEBUG "%s: %d bogocps\n", l->name, l->cps); +#endif 0 if ((l->flags & ISDN_NET_CONNECTED) && (!l->dialstate)) { anymore = 1; l->huptimer++; diff -u -rN linux-2.4.23/drivers/media/video/bttv-driver.c linux/drivers/media/video/bttv-driver.c --- linux-2.4.23/drivers/media/video/bttv-driver.c 2003-11-28 19:26:20.000000000 +0100 +++ linux/drivers/media/video/bttv-driver.c 2003-11-30 18:31:37.000000000 +0100 @@ -401,9 +401,11 @@ input %= bttv_tvcards[btv->type].video_inputs; if (input == btv->svhs) { +#if 0 btor(BT848_CONTROL_COMP, BT848_E_CONTROL); btor(BT848_CONTROL_COMP, BT848_O_CONTROL); } else { +#endif btand(~BT848_CONTROL_COMP, BT848_E_CONTROL); btand(~BT848_CONTROL_COMP, BT848_O_CONTROL); } @@ -3108,7 +3110,7 @@ btwrite(0, BT848_INT_MASK); result = request_irq(btv->dev->irq, bttv_irq, - SA_SHIRQ | SA_INTERRUPT,"bttv",(void *)btv); + SA_SHIRQ,"bttv",(void *)btv); if (result==-EINVAL) { printk(KERN_ERR "bttv%d: Bad irq number or handler\n", diff -u -rN linux-2.4.23/drivers/media/video/meye.c linux/drivers/media/video/meye.c --- linux-2.4.23/drivers/media/video/meye.c 2003-11-28 19:26:20.000000000 +0100 +++ linux/drivers/media/video/meye.c 2003-11-30 18:28:51.000000000 +0100 @@ -1344,7 +1344,7 @@ pci_write_config_byte(meye.mchip_dev, PCI_LATENCY_TIMER, 64); if ((ret = request_irq(meye.mchip_irq, meye_irq, - SA_INTERRUPT | SA_SHIRQ, "meye", meye_irq))) { + SA_SHIRQ, "meye", meye_irq))) { printk(KERN_ERR "meye: request_irq failed (ret=%d)\n", ret); goto out4; } diff -u -rN linux-2.4.23/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c --- linux-2.4.23/drivers/parport/parport_pc.c 2003-06-13 16:51:35.000000000 +0200 +++ linux/drivers/parport/parport_pc.c 2003-11-30 18:28:51.000000000 +0100 @@ -94,7 +94,7 @@ static int user_specified __devinitdata = 0; #if defined(CONFIG_PARPORT_PC_FIFO) || defined(CONFIG_PARPORT_PC_SUPERIO) -static int verbose_probing; +static int verbose_probing = 1; #endif static int registered_parport; diff -u -rN linux-2.4.23/drivers/scsi/ncr53c8xx.c linux/drivers/scsi/ncr53c8xx.c --- linux-2.4.23/drivers/scsi/ncr53c8xx.c 2002-11-29 00:53:14.000000000 +0100 +++ linux/drivers/scsi/ncr53c8xx.c 2003-11-30 18:28:51.000000000 +0100 @@ -3785,13 +3785,7 @@ ** Install the interrupt handler. */ - if (request_irq(device->slot.irq, ncr53c8xx_intr, - ((driver_setup.irqm & 0x10) ? 0 : SA_SHIRQ) | -#if LINUX_VERSION_CODE < LinuxVersionCode(2,2,0) - ((driver_setup.irqm & 0x20) ? 0 : SA_INTERRUPT), -#else - 0, -#endif + if (request_irq(device->slot.irq, ncr53c8xx_intr, SA_SHIRQ, "ncr53c8xx", np)) { #ifdef __sparc__ printk(KERN_ERR "%s: request irq %s failure\n", diff -u -rN linux-2.4.23/drivers/scsi/st_options.h linux/drivers/scsi/st_options.h --- linux-2.4.23/drivers/scsi/st_options.h 2003-08-25 13:44:42.000000000 +0200 +++ linux/drivers/scsi/st_options.h 2003-11-30 18:28:51.000000000 +0100 @@ -37,7 +37,7 @@ driver initialisation. The number is also constrained by the number of drives detected. If more buffers are needed, they are allocated at run time and freed after use. */ -#define ST_MAX_BUFFERS 4 +#define ST_MAX_BUFFERS 8 /* Maximum number of scatter/gather segments */ #define ST_MAX_SG 16 @@ -77,13 +77,13 @@ /* If ST_AUTO_LOCK is non-zero, the drive door is locked at the first read or write command after the device is opened. The door is opened when the device is closed. */ -#define ST_AUTO_LOCK 0 +#define ST_AUTO_LOCK 1 /* If ST_FAST_MTEOM is non-zero, the MTEOM ioctl is done using the direct SCSI command. The file number status is lost but this method is fast with some drives. Otherwise MTEOM is done by spacing over files and the file number status is retained. */ -#define ST_FAST_MTEOM 0 +#define ST_FAST_MTEOM 1 /* If ST_SCSI2LOGICAL is nonzero, the logical block addresses are used for MTIOCPOS and MTSEEK by default. Vendor addresses are used if ST_SCSI2LOGICAL diff -u -rN linux-2.4.23/drivers/scsi/sym53c8xx.c linux/drivers/scsi/sym53c8xx.c --- linux-2.4.23/drivers/scsi/sym53c8xx.c 2003-06-13 16:51:36.000000000 +0200 +++ linux/drivers/scsi/sym53c8xx.c 2003-11-30 18:28:51.000000000 +0100 @@ -5822,17 +5822,7 @@ ** If we synchonize the C code with SCRIPTS on interrupt, ** we donnot want to share the INTR line at all. */ - if (request_irq(device->slot.irq, sym53c8xx_intr, -#ifdef SCSI_NCR_PCIQ_SYNC_ON_INTR - ((driver_setup.irqm & 0x20) ? 0 : SA_INTERRUPT), -#else - ((driver_setup.irqm & 0x10) ? 0 : SA_SHIRQ) | -#if LINUX_VERSION_CODE < LinuxVersionCode(2,2,0) - ((driver_setup.irqm & 0x20) ? 0 : SA_INTERRUPT), -#else - 0, -#endif -#endif +if (request_irq(device->slot.irq, sym53c8xx_intr, SA_SHIRQ, NAME53C8XX, np)) { printk(KERN_ERR "%s: request irq %d failure\n", ncr_name(np), device->slot.irq); diff -u -rN linux-2.4.23/drivers/sound/mad16.c linux/drivers/sound/mad16.c --- linux-2.4.23/drivers/sound/mad16.c 2003-06-13 16:51:36.000000000 +0200 +++ linux/drivers/sound/mad16.c 2003-11-30 18:28:51.000000000 +0100 @@ -73,6 +73,8 @@ * 82C930 uses 0xE4 as the password and indirect addressing to access * the config registers. */ +#define MAD16_CONF 0x06 +#define MAD16_CDSEL 0x03 #define MC0_PORT 0xf8c /* Dummy port */ #define MC1_PORT 0xf8d /* SB address, CD-ROM interface type, joystick */ diff -u -rN linux-2.4.23/include/asm-i386/serial.h linux/include/asm-i386/serial.h --- linux-2.4.23/include/asm-i386/serial.h 2002-08-03 02:39:45.000000000 +0200 +++ linux/include/asm-i386/serial.h 2003-11-30 18:28:51.000000000 +0100 @@ -54,8 +54,8 @@ /* UART CLK PORT IRQ FLAGS */ \ { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ - { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ - { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ + { 0, BASE_BAUD, 0x3E8, 5, STD_COM_FLAGS }, /* ttyS2 */ \ + { 0, BASE_BAUD, 0x2E8, 5, STD_COM4_FLAGS }, /* ttyS3 */ /* * HCDP_SERIAL_PORT_DEFNS should be placed in exactly the same slot diff -u -rN linux-2.4.23/include/linux/ide.h linux/include/linux/ide.h --- linux-2.4.23/include/linux/ide.h 2003-11-28 19:26:21.000000000 +0100 +++ linux/include/linux/ide.h 2003-11-30 18:28:51.000000000 +0100 @@ -63,7 +63,7 @@ * REALLY_SLOW_IO can be defined in ide.c and ide-cd.c, if necessary */ #undef REALLY_FAST_IO /* define if ide ports are perfect */ -#define INITIAL_MULT_COUNT 0 /* off=0; on=2,4,8,16,32, etc.. */ +#define INITIAL_MULT_COUNT 32 /* off=0; on=2,4,8,16,32, etc.. */ #ifndef SUPPORT_SLOW_DATA_PORTS /* 1 to support slow data ports */ #define SUPPORT_SLOW_DATA_PORTS 1 /* 0 to reduce kernel size */