diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-06 09:54:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-06 09:54:36 -0800 |
| commit | 02690392dc04877f3e799afb1bb520e366340955 (patch) | |
| tree | 7f55b589dfabd5d3ba2acb14a52b636f34c3cbd3 /driver | |
| parent | 0e330f1278ca2d1d4365b5646562c54d1cce78d2 (diff) | |
| download | patches-02690392dc04877f3e799afb1bb520e366340955.tar.gz | |
2.6.15-rc5 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/kill-hotplug-word-from-driver-core.patch | 6 | ||||
| -rw-r--r-- | driver/remove-KOBJECT_UEVENT.patch | 2 | ||||
| -rw-r--r-- | driver/speakup-core.patch | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/driver/kill-hotplug-word-from-driver-core.patch b/driver/kill-hotplug-word-from-driver-core.patch index 6adb50045c1ee..88f04f53f3615 100644 --- a/driver/kill-hotplug-word-from-driver-core.patch +++ b/driver/kill-hotplug-word-from-driver-core.patch @@ -250,7 +250,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> default: --- gregkh-2.6.orig/drivers/acpi/processor_core.c +++ gregkh-2.6/drivers/acpi/processor_core.c -@@ -733,7 +733,7 @@ int acpi_processor_device_add(acpi_handl +@@ -748,7 +748,7 @@ int acpi_processor_device_add(acpi_handl return_VALUE(-ENODEV); if ((pr->id >= 0) && (pr->id < NR_CPUS)) { @@ -259,7 +259,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return_VALUE(0); } -@@ -773,13 +773,13 @@ acpi_processor_hotplug_notify(acpi_handl +@@ -788,13 +788,13 @@ acpi_processor_hotplug_notify(acpi_handl } if (pr->id >= 0 && (pr->id < NR_CPUS)) { @@ -275,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } else { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Device [%s] failed to start\n", -@@ -803,7 +803,7 @@ acpi_processor_hotplug_notify(acpi_handl +@@ -818,7 +818,7 @@ acpi_processor_hotplug_notify(acpi_handl } if ((pr->id < NR_CPUS) && (cpu_present(pr->id))) diff --git a/driver/remove-KOBJECT_UEVENT.patch b/driver/remove-KOBJECT_UEVENT.patch index 050c34669f0fe..f27cf700823ed 100644 --- a/driver/remove-KOBJECT_UEVENT.patch +++ b/driver/remove-KOBJECT_UEVENT.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -1474,12 +1474,6 @@ W: http://nfs.sourceforge.net/ +@@ -1476,12 +1476,6 @@ W: http://nfs.sourceforge.net/ W: http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/ S: Maintained diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch index d655e6a661391..52d85fe129147 100644 --- a/driver/speakup-core.patch +++ b/driver/speakup-core.patch @@ -9080,8 +9080,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ net/ media/ obj-$(CONFIG_NUBUS) += nubus/ -@@ -51,7 +52,6 @@ obj-$(CONFIG_TC) += tc/ - obj-$(CONFIG_USB) += usb/ +@@ -52,7 +53,6 @@ obj-$(CONFIG_USB) += usb/ + obj-$(CONFIG_PCI) += usb/ obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_GAMEPORT) += input/gameport/ -obj-$(CONFIG_INPUT) += input/ @@ -9108,7 +9108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2426,6 +2426,13 @@ M: wli@holomorphy.com +@@ -2437,6 +2437,13 @@ M: wli@holomorphy.com L: sparclinux@vger.kernel.org S: Maintained |