diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 09:47:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 09:47:19 -0700 |
| commit | 56c0720b2d120e1dafef68cd4509eb642eed2518 (patch) | |
| tree | 97014891c3ef8970f23372902cea6300524adc48 | |
| parent | 5f375a8a733591b3a0714a5a90abebfe32985e4d (diff) | |
| download | patches-56c0720b2d120e1dafef68cd4509eb642eed2518.tar.gz | |
2.6.26-git7 refresh
5 files changed, 8 insertions, 8 deletions
diff --git a/driver-core/bluetooth-remove-improper-bluetooth-class-symlinks.patch b/driver-core/bluetooth-remove-improper-bluetooth-class-symlinks.patch index 8034e840b8c63d..faf5639d67e381 100644 --- a/driver-core/bluetooth-remove-improper-bluetooth-class-symlinks.patch +++ b/driver-core/bluetooth-remove-improper-bluetooth-class-symlinks.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c -@@ -387,10 +387,6 @@ int hci_register_sysfs(struct hci_dev *h +@@ -398,10 +398,6 @@ int hci_register_sysfs(struct hci_dev *h if (device_create_file(dev, bt_attrs[i]) < 0) BT_ERR("Failed to create device attribute"); @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -398,9 +394,6 @@ void hci_unregister_sysfs(struct hci_dev +@@ -409,9 +405,6 @@ void hci_unregister_sysfs(struct hci_dev { BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type); diff --git a/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch b/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch index 3e82273523bbab..1ff1d293f45da2 100644 --- a/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch +++ b/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch @@ -217,7 +217,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> err_unrtty: --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c -@@ -3923,7 +3923,7 @@ struct device *tty_register_device(struc +@@ -4045,7 +4045,7 @@ struct device *tty_register_device(struc else tty_line_name(driver, index, name); @@ -226,7 +226,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -4201,20 +4201,22 @@ static int __init tty_init(void) +@@ -4323,20 +4323,22 @@ static int __init tty_init(void) if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) panic("Couldn't register /dev/tty driver\n"); @@ -252,7 +252,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif #ifdef CONFIG_VT -@@ -4222,7 +4224,7 @@ static int __init tty_init(void) +@@ -4344,7 +4346,7 @@ static int __init tty_init(void) if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) panic("Couldn't register /dev/tty0 driver\n"); diff --git a/driver-core/device-create-net-convert-device_create-to-device_create_drvdata.patch b/driver-core/device-create-net-convert-device_create-to-device_create_drvdata.patch index f87a4536adb31c..843e7cec94200a 100644 --- a/driver-core/device-create-net-convert-device_create-to-device_create_drvdata.patch +++ b/driver-core/device-create-net-convert-device_create-to-device_create_drvdata.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c -@@ -858,7 +858,8 @@ static int __init ppp_init(void) +@@ -866,7 +866,8 @@ static int __init ppp_init(void) err = PTR_ERR(ppp_class); goto out_chrdev; } diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch index ffad054311e5ec..d7f1459d6bbb01 100644 --- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -794,12 +794,21 @@ static void run_init_process(char *init_ +@@ -795,12 +795,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } @@ -1 +1 @@ -2.6.26-git6 +2.6.26-git7 |