diff options
| author | Greg KH <greg@press.(none)> | 2005-10-20 09:12:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-20 09:12:32 -0700 |
| commit | dd4e04bad72cdc033189b64833c3515fee6c3576 (patch) | |
| tree | 4f3e7779d54f165435a5bb26f5df269fa19864ca /driver | |
| parent | 9ea1e286b6a13a27638118bfb15d77669fe6d7d7 (diff) | |
| download | patches-dd4e04bad72cdc033189b64833c3515fee6c3576.tar.gz | |
resync to 2.6.14-rc5
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/class_device_create_api_fixup.patch | 2 | ||||
| -rw-r--r-- | driver/input-convert-to-dynamic-usb.patch | 2 | ||||
| -rw-r--r-- | driver/speakup-core.patch | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/driver/class_device_create_api_fixup.patch b/driver/class_device_create_api_fixup.patch index e731a5dfb42d7..1e4db408df117 100644 --- a/driver/class_device_create_api_fixup.patch +++ b/driver/class_device_create_api_fixup.patch @@ -470,7 +470,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> devfs_mk_dir("ieee1394/dv/host%d", id); --- gregkh-2.6.orig/drivers/ieee1394/raw1394.c +++ gregkh-2.6/drivers/ieee1394/raw1394.c -@@ -2904,7 +2904,7 @@ static int __init init_raw1394(void) +@@ -2912,7 +2912,7 @@ static int __init init_raw1394(void) hpsb_register_highlevel(&raw1394_highlevel); diff --git a/driver/input-convert-to-dynamic-usb.patch b/driver/input-convert-to-dynamic-usb.patch index 0f5395d1cffb7..eddda8fd16af0 100644 --- a/driver/input-convert-to-dynamic-usb.patch +++ b/driver/input-convert-to-dynamic-usb.patch @@ -2467,7 +2467,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } for (n = 0; n < hdesc->bNumDescriptors; n++) -@@ -1752,32 +1753,34 @@ static struct hid_device *usb_hid_config +@@ -1749,32 +1750,34 @@ static struct hid_device *usb_hid_config hid->name[0] = 0; diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch index a61ce847becbd..9480c110877ad 100644 --- a/driver/speakup-core.patch +++ b/driver/speakup-core.patch @@ -9119,7 +9119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2311,6 +2311,13 @@ M: wli@holomorphy.com +@@ -2318,6 +2318,13 @@ M: wli@holomorphy.com L: sparclinux@vger.kernel.org S: Maintained |