aboutsummaryrefslogtreecommitdiffstats
path: root/gregkh
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-05 09:21:34 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-05 09:21:34 -0800
commit3c5bdf48c8d492dfdcbb3ac3a7c1242bd1a6e6e1 (patch)
treee442b9a742271bce0cf60901006a2a0cee63e0f9 /gregkh
parent7c5bb7c46c50b7a008ed3401c1d018dcd192d288 (diff)
downloadpatches-3c5bdf48c8d492dfdcbb3ac3a7c1242bd1a6e6e1.tar.gz
refresh for 2.6.15-git1
Diffstat (limited to 'gregkh')
-rw-r--r--gregkh/gregkh-usb-hacking.patch2
-rw-r--r--gregkh/no-random.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/gregkh/gregkh-usb-hacking.patch b/gregkh/gregkh-usb-hacking.patch
index bfe5264c9ba4a..aaf1214ba6381 100644
--- a/gregkh/gregkh-usb-hacking.patch
+++ b/gregkh/gregkh-usb-hacking.patch
@@ -321,7 +321,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+MODULE_LICENSE("GPL");
--- gregkh-2.6.orig/drivers/usb/Makefile
+++ gregkh-2.6/drivers/usb/Makefile
-@@ -76,3 +76,5 @@ obj-$(CONFIG_USB_SISUSBVGA) += misc/
+@@ -77,3 +77,5 @@ obj-$(CONFIG_USB_SISUSBVGA) += misc/
obj-$(CONFIG_USB_ATM) += atm/
obj-$(CONFIG_USB_SPEEDTOUCH) += atm/
diff --git a/gregkh/no-random.patch b/gregkh/no-random.patch
index 25d5fca2df6f7..6e85008809362 100644
--- a/gregkh/no-random.patch
+++ b/gregkh/no-random.patch
@@ -4,7 +4,7 @@
---
--- gregkh-2.6.orig/kernel/sysctl.c
+++ gregkh-2.6/kernel/sysctl.c
-@@ -124,7 +124,7 @@ extern int sysctl_hz_timer;
+@@ -122,7 +122,7 @@ extern int sysctl_hz_timer;
extern int acct_parm[];
#endif