r1012 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches
Joshua Kwan
joshk@haydn.debian.org
Wed, 11 Aug 2004 11:40:05 -0600
Author: joshk
Date: 2004-08-11 11:39:54 -0600 (Wed, 11 Aug 2004)
New Revision: 1012
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
more splits
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff 2004-08-11 16:55:42 UTC (rev 1011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff 2004-08-11 17:39:54 UTC (rev 1012)
@@ -0,0 +1,42 @@
+diff -urN kernel-source-2.4.26/drivers/net/amd8111e.h kernel-source-2.4.26-1/drivers/net/amd8111e.h
+--- kernel-source-2.4.26/drivers/net/amd8111e.h 2003-08-25 21:44:42.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/net/amd8111e.h 2003-10-19 20:40:36.000000000 +1000
+@@ -606,7 +606,7 @@
+ /* ipg parameters */
+ #define DEFAULT_IPG 0x60
+ #define IFS1_DELTA 36
+-#define IPG_CONVERGE_TIME 0.5
++#define IPG_CONVERGE_JIFFIES (HZ / 2)
+ #define IPG_STABLE_TIME 5
+ #define MIN_IPG 96
+ #define MAX_IPG 255
+
+--- kernel-source-2.4.27-2.4.27/drivers/net/amd8111e.c~ 2004-08-11 10:35:57.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/net/amd8111e.c 2004-08-11 10:37:10.000000000 -0700
+@@ -1726,7 +1726,7 @@
+ /* Restart ipg timer */
+ if(lp->options & OPTION_DYN_IPG_ENABLE)
+ mod_timer(&lp->ipg_data.ipg_timer,
+- jiffies + (IPG_CONVERGE_TIME * HZ));
++ jiffies + IPG_CONVERGE_JIFFIES);
+ spin_unlock_irq(&lp->lock);
+
+ return 0;
+@@ -1800,7 +1800,7 @@
+ writew((u32)tmp_ipg, mmio + IPG);
+ writew((u32)(tmp_ipg - IFS1_DELTA), mmio + IFS1);
+ }
+- mod_timer(&lp->ipg_data.ipg_timer, jiffies + (IPG_CONVERGE_TIME * HZ));
++ mod_timer(&lp->ipg_data.ipg_timer, jiffies + IPG_CONVERGE_JIFFIES);
+ return;
+
+ }
+@@ -1938,7 +1938,7 @@
+ lp->ipg_data.ipg_timer.data = (unsigned long) dev;
+ lp->ipg_data.ipg_timer.function = (void *)&amd8111e_config_ipg;
+ lp->ipg_data.ipg_timer.expires = jiffies +
+- IPG_CONVERGE_TIME * HZ;
++ IPG_CONVERGE_JIFFIES;
+ lp->ipg_data.ipg = DEFAULT_IPG;
+ lp->ipg_data.ipg_state = CSTATE;
+ };
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff 2004-08-11 16:55:42 UTC (rev 1011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff 2004-08-11 17:39:54 UTC (rev 1012)
@@ -0,0 +1,72 @@
+diff -urN kernel-source-2.4.26/drivers/net/Config.in kernel-source-2.4.26-1/drivers/net/Config.in
+--- kernel-source-2.4.26/drivers/net/Config.in 2004-04-14 23:05:30.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/net/Config.in 2004-02-22 20:28:19.000000000 +1100
+@@ -184,7 +184,6 @@
+ fi
+ if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
+ tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+- tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
+ fi
+ dep_tristate ' Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
+ dep_tristate ' EtherExpressPro/100 support (eepro100, original Becker driver)' CONFIG_EEPRO100 $CONFIG_PCI
+@@ -258,10 +257,6 @@
+ mainmenu_option next_comment
+ comment 'Ethernet (1000 Mbit)'
+
+-dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
+-if [ "$CONFIG_ACENIC" != "n" ]; then
+- bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
+-fi
+ dep_tristate 'D-Link DL2000-based Gigabit Ethernet support' CONFIG_DL2K $CONFIG_PCI
+ dep_tristate 'Intel(R) PRO/1000 Gigabit Ethernet support' CONFIG_E1000 $CONFIG_PCI
+ if [ "$CONFIG_E1000" != "n" ]; then
+
+diff -urN kernel-source-2.4.26/drivers/net/tokenring/Config.in kernel-source-2.4.26-1/drivers/net/tokenring/Config.in
+--- kernel-source-2.4.26/drivers/net/tokenring/Config.in 2004-02-19 00:36:31.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/net/tokenring/Config.in 2004-02-22 20:28:23.000000000 +1100
+@@ -25,10 +25,6 @@
+ dep_tristate ' Generic TMS380 ISA support' CONFIG_TMSISA $CONFIG_ISA $CONFIG_TMS380TR
+ dep_tristate ' Madge Smart 16/4 PCI Mk2 support' CONFIG_ABYSS $CONFIG_PCI $CONFIG_TMS380TR
+ dep_tristate ' Madge Smart 16/4 Ringnode MicroChannel' CONFIG_MADGEMC $CONFIG_MCA $CONFIG_TMS380TR
+-
+- if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
+- tristate ' SMC ISA/MCA adapter support' CONFIG_SMCTR
+- fi
+ fi
+
+ endmenu
+diff -urN kernel-source-2.4.26/drivers/usb/Config.in kernel-source-2.4.26-1/drivers/usb/Config.in
+--- kernel-source-2.4.26/drivers/usb/Config.in 2004-02-19 00:36:31.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/usb/Config.in 2004-02-22 20:28:26.000000000 +1100
+@@ -81,7 +81,6 @@
+ dep_tristate ' USB W996[87]CF Camera support' CONFIG_USB_W9968CF $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_I2C
+ dep_tristate ' USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
+ dep_tristate ' D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
+- dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
+ fi
+
+ comment 'USB Network adaptors'
+diff -urN kernel-source-2.4.26/drivers/usb/serial/Config.in kernel-source-2.4.26-1/drivers/usb/serial/Config.in
+--- kernel-source-2.4.26/drivers/usb/serial/Config.in 2003-06-14 00:51:36.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/usb/serial/Config.in 2003-06-01 20:43:53.000000000 +1000
+@@ -20,20 +20,6 @@
+ dep_tristate ' USB Inside Out Edgeport Serial Driver (TI devices)' CONFIG_USB_SERIAL_EDGEPORT_TI $CONFIG_USB_SERIAL
+ dep_tristate ' USB Keyspan PDA Single Port Serial Driver (EXPERIMENTAL)' CONFIG_USB_SERIAL_KEYSPAN_PDA $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+ dep_tristate ' USB Keyspan USA-xxx Serial Driver' CONFIG_USB_SERIAL_KEYSPAN $CONFIG_USB_SERIAL
+- if [ "$CONFIG_USB_SERIAL_KEYSPAN" != "n" ]; then
+- bool ' USB Keyspan USA-28 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28
+- bool ' USB Keyspan USA-28X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28X
+- bool ' USB Keyspan USA-28XA Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28XA
+- bool ' USB Keyspan USA-28XB Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28XB
+- bool ' USB Keyspan USA-19 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19
+- bool ' USB Keyspan USA-18X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA18X
+- bool ' USB Keyspan USA-19W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19W
+- bool ' USB Keyspan USA-19QW Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19QW
+- bool ' USB Keyspan USA-19QI Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19QI
+- bool ' USB Keyspan MPR Firmware' CONFIG_USB_SERIAL_KEYSPAN_MPR
+- bool ' USB Keyspan USA-49W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA49W
+- bool ' USB Keyspan USA-49WLC Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
+- fi
+ dep_tristate ' USB MCT Single Port Serial Driver' CONFIG_USB_SERIAL_MCT_U232 $CONFIG_USB_SERIAL
+ dep_tristate ' USB KL5KUSB105 (Palmconnect) Driver' CONFIG_USB_SERIAL_KLSI $CONFIG_USB_SERIAL
+ dep_tristate ' USB KOBIL chipcard reader (EXPERIMENTAL)' CONFIG_USB_SERIAL_KOBIL_SCT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff 2004-08-11 16:55:42 UTC (rev 1011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff 2004-08-11 17:39:54 UTC (rev 1012)
@@ -0,0 +1,37 @@
+diff -urN kernel-source-2.4.26/drivers/video/vesafb.c kernel-source-2.4.26-1/drivers/video/vesafb.c
+--- kernel-source-2.4.26/drivers/video/vesafb.c 2003-11-29 05:26:21.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/video/vesafb.c 2003-11-29 20:53:45.000000000 +1100
+@@ -696,6 +696,13 @@
+ return 0;
+ }
+
++static void __exit vesafb_exit(void)
++{
++ unregister_framebuffer(&fb_info);
++ iounmap(video_vbase);
++ release_mem_region(video_base, video_size);
++}
++
+ /*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+@@ -705,3 +712,7 @@
+ */
+
+ MODULE_LICENSE("GPL");
++#ifdef MODULE
++module_init(vesafb_init);
++#endif
++module_exit(vesafb_exit);
+diff -urN kernel-source-2.4.26/drivers/video/Config.in kernel-source-2.4.26-1/drivers/video/Config.in
+--- kernel-source-2.4.26/drivers/video/Config.in 2004-02-19 00:36:31.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/video/Config.in 2004-02-22 20:28:28.000000000 +1100
+@@ -91,7 +91,7 @@
+ tristate ' TGA framebuffer support' CONFIG_FB_TGA
+ fi
+ if [ "$CONFIG_X86" = "y" ]; then
+- bool ' VESA VGA graphics console' CONFIG_FB_VESA
++ tristate ' VESA VGA graphics console' CONFIG_FB_VESA
+ tristate ' VGA 16-color graphics console' CONFIG_FB_VGA16
+ tristate ' Hercules mono graphics console (EXPERIMENTAL)' CONFIG_FB_HGA
+ define_bool CONFIG_VIDEO_SELECT y
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1 2004-08-11 16:55:42 UTC (rev 1011)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1 2004-08-11 17:39:54 UTC (rev 1012)
@@ -6457,75 +6457,7 @@
if (!skb_shinfo(skb)->nr_frags) {
vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data,
-diff -urN kernel-source-2.4.26/drivers/net/Config.in kernel-source-2.4.26-1/drivers/net/Config.in
---- kernel-source-2.4.26/drivers/net/Config.in 2004-04-14 23:05:30.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/net/Config.in 2004-02-22 20:28:19.000000000 +1100
-@@ -184,7 +184,6 @@
- fi
- if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
- tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
-- tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
- fi
- dep_tristate ' Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
- dep_tristate ' EtherExpressPro/100 support (eepro100, original Becker driver)' CONFIG_EEPRO100 $CONFIG_PCI
-@@ -258,10 +257,6 @@
- mainmenu_option next_comment
- comment 'Ethernet (1000 Mbit)'
-
--dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
--if [ "$CONFIG_ACENIC" != "n" ]; then
-- bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
--fi
- dep_tristate 'D-Link DL2000-based Gigabit Ethernet support' CONFIG_DL2K $CONFIG_PCI
- dep_tristate 'Intel(R) PRO/1000 Gigabit Ethernet support' CONFIG_E1000 $CONFIG_PCI
- if [ "$CONFIG_E1000" != "n" ]; then
-diff -urN kernel-source-2.4.26/drivers/net/amd8111e.c kernel-source-2.4.26-1/drivers/net/amd8111e.c
---- kernel-source-2.4.26/drivers/net/amd8111e.c 2003-08-25 21:44:42.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/net/amd8111e.c 2003-10-19 20:40:36.000000000 +1000
-@@ -1694,7 +1694,7 @@
- /* Restart ipg timer */
- if(lp->options & OPTION_DYN_IPG_ENABLE)
- mod_timer(&lp->ipg_data.ipg_timer,
-- jiffies + (IPG_CONVERGE_TIME * HZ));
-+ jiffies + IPG_CONVERGE_JIFFIES);
- spin_unlock_irq(&lp->lock);
-
- return 0;
-@@ -1768,7 +1768,7 @@
- writew((u32)tmp_ipg, mmio + IPG);
- writew((u32)(tmp_ipg - IFS1_DELTA), mmio + IFS1);
- }
-- mod_timer(&lp->ipg_data.ipg_timer, jiffies + (IPG_CONVERGE_TIME * HZ));
-+ mod_timer(&lp->ipg_data.ipg_timer, jiffies + IPG_CONVERGE_JIFFIES);
- return;
-
- }
-@@ -1904,8 +1904,8 @@
- init_timer(&lp->ipg_data.ipg_timer);
- lp->ipg_data.ipg_timer.data = (unsigned long) dev;
- lp->ipg_data.ipg_timer.function = (void *)&amd8111e_config_ipg;
-- lp->ipg_data.ipg_timer.expires = jiffies +
-- IPG_CONVERGE_TIME * HZ;
-+ lp->ipg_data.ipg_timer.expires = jiffies +
-+ IPG_CONVERGE_JIFFIES;
- lp->ipg_data.ipg = DEFAULT_IPG;
- lp->ipg_data.ipg_state = CSTATE;
- };
-diff -urN kernel-source-2.4.26/drivers/net/amd8111e.h kernel-source-2.4.26-1/drivers/net/amd8111e.h
---- kernel-source-2.4.26/drivers/net/amd8111e.h 2003-08-25 21:44:42.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/net/amd8111e.h 2003-10-19 20:40:36.000000000 +1000
-@@ -606,7 +606,7 @@
- /* ipg parameters */
- #define DEFAULT_IPG 0x60
- #define IFS1_DELTA 36
--#define IPG_CONVERGE_TIME 0.5
-+#define IPG_CONVERGE_JIFFIES (HZ / 2)
- #define IPG_STABLE_TIME 5
- #define MIN_IPG 96
- #define MAX_IPG 255
-diff -urN kernel-source-2.4.26/drivers/net/arcnet/com20020-isa.c kernel-source-2.4.26-1/drivers/net/arcnet/com20020-isa.c
-diff -urN kernel-source-2.4.26/drivers/net/arcnet/com20020-pci.c kernel-source-2.4.26-1/drivers/net/arcnet/com20020-pci.c
-diff -urN kernel-source-2.4.26/drivers/net/arcnet/com20020.c kernel-source-2.4.26-1/drivers/net/arcnet/com20020.c
+
diff -urN kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h
--- kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h 2002-08-03 10:39:44.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h 2002-03-06 19:49:48.000000000 +1100
@@ -6604,20 +6536,7 @@
};
/*
-diff -urN kernel-source-2.4.26/drivers/net/tokenring/Config.in kernel-source-2.4.26-1/drivers/net/tokenring/Config.in
---- kernel-source-2.4.26/drivers/net/tokenring/Config.in 2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/net/tokenring/Config.in 2004-02-22 20:28:23.000000000 +1100
-@@ -25,10 +25,6 @@
- dep_tristate ' Generic TMS380 ISA support' CONFIG_TMSISA $CONFIG_ISA $CONFIG_TMS380TR
- dep_tristate ' Madge Smart 16/4 PCI Mk2 support' CONFIG_ABYSS $CONFIG_PCI $CONFIG_TMS380TR
- dep_tristate ' Madge Smart 16/4 Ringnode MicroChannel' CONFIG_MADGEMC $CONFIG_MCA $CONFIG_TMS380TR
--
-- if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
-- tristate ' SMC ISA/MCA adapter support' CONFIG_SMCTR
-- fi
- fi
-
- endmenu
+
diff -urN kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c
--- kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c 2001-11-10 09:02:24.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c 2003-03-22 12:13:25.000000000 +1100
@@ -6767,17 +6686,7 @@
(-1),(-1)
#endif
-diff -urN kernel-source-2.4.26/drivers/usb/Config.in kernel-source-2.4.26-1/drivers/usb/Config.in
---- kernel-source-2.4.26/drivers/usb/Config.in 2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/usb/Config.in 2004-02-22 20:28:26.000000000 +1100
-@@ -81,7 +81,6 @@
- dep_tristate ' USB W996[87]CF Camera support' CONFIG_USB_W9968CF $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_I2C
- dep_tristate ' USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
- dep_tristate ' D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
-- dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
- fi
-
- comment 'USB Network adaptors'
+
diff -urN kernel-source-2.4.26/drivers/usb/hid-core.c kernel-source-2.4.26-1/drivers/usb/hid-core.c
--- kernel-source-2.4.26/drivers/usb/hid-core.c 2004-04-14 23:05:32.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/usb/hid-core.c 2004-04-17 14:24:00.000000000 +1000
@@ -6862,42 +6771,8 @@
}
static u8 mii_phy_probe(pegasus_t * pegasus)
-diff -urN kernel-source-2.4.26/drivers/usb/serial/Config.in kernel-source-2.4.26-1/drivers/usb/serial/Config.in
---- kernel-source-2.4.26/drivers/usb/serial/Config.in 2003-06-14 00:51:36.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/usb/serial/Config.in 2003-06-01 20:43:53.000000000 +1000
-@@ -20,20 +20,6 @@
- dep_tristate ' USB Inside Out Edgeport Serial Driver (TI devices)' CONFIG_USB_SERIAL_EDGEPORT_TI $CONFIG_USB_SERIAL
- dep_tristate ' USB Keyspan PDA Single Port Serial Driver (EXPERIMENTAL)' CONFIG_USB_SERIAL_KEYSPAN_PDA $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Keyspan USA-xxx Serial Driver' CONFIG_USB_SERIAL_KEYSPAN $CONFIG_USB_SERIAL
-- if [ "$CONFIG_USB_SERIAL_KEYSPAN" != "n" ]; then
-- bool ' USB Keyspan USA-28 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28
-- bool ' USB Keyspan USA-28X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28X
-- bool ' USB Keyspan USA-28XA Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28XA
-- bool ' USB Keyspan USA-28XB Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28XB
-- bool ' USB Keyspan USA-19 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19
-- bool ' USB Keyspan USA-18X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA18X
-- bool ' USB Keyspan USA-19W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19W
-- bool ' USB Keyspan USA-19QW Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19QW
-- bool ' USB Keyspan USA-19QI Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19QI
-- bool ' USB Keyspan MPR Firmware' CONFIG_USB_SERIAL_KEYSPAN_MPR
-- bool ' USB Keyspan USA-49W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA49W
-- bool ' USB Keyspan USA-49WLC Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
-- fi
- dep_tristate ' USB MCT Single Port Serial Driver' CONFIG_USB_SERIAL_MCT_U232 $CONFIG_USB_SERIAL
- dep_tristate ' USB KL5KUSB105 (Palmconnect) Driver' CONFIG_USB_SERIAL_KLSI $CONFIG_USB_SERIAL
- dep_tristate ' USB KOBIL chipcard reader (EXPERIMENTAL)' CONFIG_USB_SERIAL_KOBIL_SCT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
-diff -urN kernel-source-2.4.26/drivers/video/Config.in kernel-source-2.4.26-1/drivers/video/Config.in
---- kernel-source-2.4.26/drivers/video/Config.in 2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/video/Config.in 2004-02-22 20:28:28.000000000 +1100
-@@ -91,7 +91,7 @@
- tristate ' TGA framebuffer support' CONFIG_FB_TGA
- fi
- if [ "$CONFIG_X86" = "y" ]; then
-- bool ' VESA VGA graphics console' CONFIG_FB_VESA
-+ tristate ' VESA VGA graphics console' CONFIG_FB_VESA
- tristate ' VGA 16-color graphics console' CONFIG_FB_VGA16
- tristate ' Hercules mono graphics console (EXPERIMENTAL)' CONFIG_FB_HGA
- define_bool CONFIG_VIDEO_SELECT y
+
+
diff -urN kernel-source-2.4.26/drivers/video/radeonfb.c kernel-source-2.4.26-1/drivers/video/radeonfb.c
--- kernel-source-2.4.26/drivers/video/radeonfb.c 2004-04-14 23:05:39.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/video/radeonfb.c 2004-04-17 14:24:02.000000000 +1000
@@ -6918,31 +6793,7 @@
v.red.length = v.green.length = v.blue.length = 5;
v.transp.offset = v.transp.length = 0;
break;
-diff -urN kernel-source-2.4.26/drivers/video/vesafb.c kernel-source-2.4.26-1/drivers/video/vesafb.c
---- kernel-source-2.4.26/drivers/video/vesafb.c 2003-11-29 05:26:21.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/video/vesafb.c 2003-11-29 20:53:45.000000000 +1100
-@@ -696,6 +696,13 @@
- return 0;
- }
-
-+static void __exit vesafb_exit(void)
-+{
-+ unregister_framebuffer(&fb_info);
-+ iounmap(video_vbase);
-+ release_mem_region(video_base, video_size);
-+}
-+
- /*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
-@@ -705,3 +712,7 @@
- */
-
- MODULE_LICENSE("GPL");
-+#ifdef MODULE
-+module_init(vesafb_init);
-+#endif
-+module_exit(vesafb_exit);
+
diff -urN kernel-source-2.4.26/fs/Config.in kernel-source-2.4.26-1/fs/Config.in
--- kernel-source-2.4.26/fs/Config.in 2004-02-19 00:36:31.000000000 +1100
+++ kernel-source-2.4.26-1/fs/Config.in 2004-04-17 13:32:34.000000000 +1000