r1105 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches: . series

[Joshua Kwan]

Author: joshk
Date: 2004-08-14 14:07:59 -0600 (Sat, 14 Aug 2004)
New Revision: 1105

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_driver_MODULE_LICENSE.diff
Removed:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_sparc64_i2c.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_driver_MODULE_LICENSE.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1
Log:
oops, this WAS merged already

Copied: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_driver_MODULE_LICENSE.diff (from rev 1104, trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_driver_MODULE_LICENSE.diff)

Deleted: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_sparc64_i2c.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_sparc64_i2c.diff	2004-08-14 20:02:22 UTC (rev 1104)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_sparc64_i2c.diff	2004-08-14 20:07:59 UTC (rev 1105)
@@ -1,13 +0,0 @@
-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

Deleted: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_driver_MODULE_LICENSE.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_driver_MODULE_LICENSE.diff	2004-08-14 20:02:22 UTC (rev 1104)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_driver_MODULE_LICENSE.diff	2004-08-14 20:07:59 UTC (rev 1105)
@@ -1,62 +0,0 @@
-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");

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1	2004-08-14 20:02:22 UTC (rev 1104)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-1	2004-08-14 20:07:59 UTC (rev 1105)
@@ -62,7 +62,6 @@
 + 061_devmapper_1.00.19-2.diff
 + 062_ide_stroke_runtime.diff
 + 063_firmwareless_tg3.diff
-+ 064_sparc64_i2c.diff
-+ 065_driver_MODULE_LICENSE.diff
++ 064_driver_MODULE_LICENSE.diff
 + 900_changelog.diff
 + 999_spelling_mistakes.diff