r1101 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-14 13:57:06 -0600 (Sat, 14 Aug 2004)
New Revision: 1101

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
merge them here too

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-14 19:55:34 UTC (rev 1100)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-14 19:57:06 UTC (rev 1101)
@@ -188,6 +188,7 @@
   * Remove non-free firmware blob from tg3.c. Post-sarge, this will be
     done with a new orig tarball, per consultation with Steve Langasek
     and Joshua Kwan.
+  * Merge in some patches from kernel-image-sparc-2.4.
 
  -- Simon Horman <horms@debian.org>  Sat, 14 Aug 2004 15:04:50 +0900
 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-14 19:55:34 UTC (rev 1100)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-14 19:57:06 UTC (rev 1101)
@@ -19361,3 +19361,78 @@
  	pci_unregister_driver(&tg3_driver);
  }
  
+Enable I2C for sparc64 to resolve module dep issues.
+
+--- kernel-source-2.4.26/arch/sparc64/config.in~	2004-04-19 12:13:17.000000000 -0400
++++ kernel-source-2.4.26/arch/sparc64/config.in	2004-04-19 12:13:39.000000000 -0400
+@@ -21,6 +21,8 @@
+ mainmenu_option next_comment
+ comment 'General setup'
+ 
++source drivers/i2c/Config.in
++
+ tristate 'UltraSPARC-III bootbus i2c controller driver' CONFIG_BBC_I2C
+ 
+ define_bool CONFIG_VT y
+Many GPL'd modules are not marked as such for Sun stuff; also remove
+obsoleted EXPORT_NO_SYMBOLS. Verified with DaveM, this is not 'changing' the
+license. 
+
+ -- Josh 8/14/04
+
+--- kernel-source-2.4.26/drivers/fc4/fc.c~	2004-08-02 10:09:54.000000000 -0700
++++ kernel-source-2.4.26/drivers/fc4/fc.c	2004-08-02 10:10:09.000000000 -0700
+@@ -1155,3 +1155,5 @@
+ 	kfree(p);
+ 	return status;
+ }
++
++MODULE_LICENSE("GPL");
+--- kernel-source-2.4.26/drivers/sbus/char/bpp.c~	2004-08-02 10:08:31.000000000 -0700
++++ kernel-source-2.4.26/drivers/sbus/char/bpp.c	2004-08-02 10:10:33.000000000 -0700
+@@ -1073,3 +1073,5 @@
+ 
+ module_init(bpp_init);
+ module_exit(bpp_cleanup);
++
++MODULE_LICENSE("GPL");
+--- kernel-source-2.4.26/drivers/sbus/char/vfc_dev.c~	2004-08-02 10:08:39.000000000 -0700
++++ kernel-source-2.4.26/drivers/sbus/char/vfc_dev.c	2004-08-02 10:10:48.000000000 -0700
+@@ -743,4 +743,4 @@
+ }
+ #endif
+ 
+-
++MODULE_LICENSE("GPL");
+--- kernel-source-2.4.26/drivers/scsi/esp.c~	2004-08-02 10:04:30.000000000 -0700
++++ kernel-source-2.4.26/drivers/scsi/esp.c	2004-08-02 10:06:45.000000000 -0700
+@@ -4368,4 +4368,4 @@
+ 
+ #include "scsi_module.c"
+ 
+-EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");
+--- kernel-source-2.4.26/drivers/scsi/fcal.c~	2004-08-02 10:08:51.000000000 -0700
++++ kernel-source-2.4.26/drivers/scsi/fcal.c	2004-08-02 10:11:13.000000000 -0700
+@@ -300,4 +300,4 @@
+ 
+ #include "scsi_module.c"
+ 
+-EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");
+--- kernel-source-2.4.26/drivers/scsi/pluto.c~	2004-08-02 10:09:25.000000000 -0700
++++ kernel-source-2.4.26/drivers/scsi/pluto.c	2004-08-02 10:11:33.000000000 -0700
+@@ -339,4 +339,4 @@
+ 
+ #include "scsi_module.c"
+ 
+-EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");
+--- kernel-source-2.4.26/drivers/scsi/qlogicpti.c~	2004-08-02 10:09:30.000000000 -0700
++++ kernel-source-2.4.26/drivers/scsi/qlogicpti.c	2004-08-02 10:11:53.000000000 -0700
+@@ -1533,4 +1533,4 @@
+ 
+ #include "scsi_module.c"
+ 
+-EXPORT_NO_SYMBOLS;
++MODULE_LICENSE("GPL");