diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-19 09:36:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-19 09:36:09 -0800 |
| commit | 52d58c53a7c34e50366724676fb3d4bbc547df79 (patch) | |
| tree | ee9b7d8e7571667276c17c1b5c66eabe8a2355bb /driver | |
| parent | 88385ef1f489ef0ef12755a7cdbe6575e13b809f (diff) | |
| download | patches-52d58c53a7c34e50366724676fb3d4bbc547df79.tar.gz | |
2.6.15-rc6 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/hotplug-always-enabled.patch | 2 | ||||
| -rw-r--r-- | driver/ide-modalias-support-for-autoloading-of-ide-cd-ide-disk.patch | 2 | ||||
| -rw-r--r-- | driver/kill-hotplug-word-from-driver-core.patch | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/driver/hotplug-always-enabled.patch b/driver/hotplug-always-enabled.patch index 25d9c80b27cca..bb4f0a607c03f 100644 --- a/driver/hotplug-always-enabled.patch +++ b/driver/hotplug-always-enabled.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> config IKCONFIG bool "Kernel .config support" ---help--- -@@ -276,6 +268,15 @@ config KALLSYMS_EXTRA_PASS +@@ -290,6 +282,15 @@ config KALLSYMS_EXTRA_PASS you wait for kallsyms to be fixed. diff --git a/driver/ide-modalias-support-for-autoloading-of-ide-cd-ide-disk.patch b/driver/ide-modalias-support-for-autoloading-of-ide-cd-ide-disk.patch index 2ea4ccb72986c..c75e196cf8a60 100644 --- a/driver/ide-modalias-support-for-autoloading-of-ide-cd-ide-disk.patch +++ b/driver/ide-modalias-support-for-autoloading-of-ide-cd-ide-disk.patch @@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/ide/ide-cd.c +++ gregkh-2.6/drivers/ide/ide-cd.c -@@ -3516,6 +3516,7 @@ static int __init ide_cdrom_init(void) +@@ -3509,6 +3509,7 @@ static int __init ide_cdrom_init(void) return driver_register(&ide_cdrom_driver.gen_driver); } diff --git a/driver/kill-hotplug-word-from-driver-core.patch b/driver/kill-hotplug-word-from-driver-core.patch index 88f04f53f3615..44618faf758af 100644 --- a/driver/kill-hotplug-word-from-driver-core.patch +++ b/driver/kill-hotplug-word-from-driver-core.patch @@ -820,9 +820,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ret = kernel_thread(request_firmware_work_func, fw_work, --- gregkh-2.6.orig/drivers/base/memory.c +++ gregkh-2.6/drivers/base/memory.c -@@ -30,12 +30,12 @@ static struct sysdev_class memory_sysdev +@@ -29,12 +29,12 @@ static struct sysdev_class memory_sysdev + set_kset_name(MEMORY_CLASS_NAME), }; - EXPORT_SYMBOL(memory_sysdev_class); -static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) +static const char *memory_uevent_name(struct kset *kset, struct kobject *kobj) @@ -835,7 +835,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int num_envp, char *buffer, int buffer_size) { int retval = 0; -@@ -43,9 +43,9 @@ static int memory_hotplug(struct kset *k +@@ -42,9 +42,9 @@ static int memory_hotplug(struct kset *k return retval; } @@ -848,7 +848,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static struct notifier_block *memory_chain; -@@ -432,7 +432,7 @@ int __init memory_dev_init(void) +@@ -431,7 +431,7 @@ int __init memory_dev_init(void) unsigned int i; int ret; @@ -910,7 +910,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { return -ENODEV; } -@@ -1571,8 +1571,8 @@ static int nodemgr_host_thread(void *__h +@@ -1618,8 +1618,8 @@ static int nodemgr_host_thread(void *__h /* Scan our nodes to get the bus options and create node * entries. This does not do the sysfs stuff, since that |