aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-08-19 18:09:56 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-19 18:09:56 -0700
commit0bf83e4aa142a88121d7ef24efb692750944acf0 (patch)
tree5adb5734c2370a98c5d2a20f24c0470605799790
parent068340428a8e6d3760acae7db552bd605cb249fc (diff)
downloadpatches-0bf83e4aa142a88121d7ef24efb692750944acf0.tar.gz
move some files from driver-core.current -> driver-core as I'm a
slacker...
-rw-r--r--driver-core.current/dev_printk-constify-the-dev-argument.patch2
-rw-r--r--driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-ide-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-net-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-remove-device_create_drvdata.patch (renamed from driver-core.current/device-create-remove-device_create_drvdata.patch)2
-rw-r--r--driver-core/device-create-s390-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-s390-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-sound-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-sound-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-usb-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-usb-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch (renamed from driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch)0
-rw-r--r--series28
15 files changed, 16 insertions, 16 deletions
diff --git a/driver-core.current/dev_printk-constify-the-dev-argument.patch b/driver-core.current/dev_printk-constify-the-dev-argument.patch
index a42c77b64c2dc4..d5241f68f00b4e 100644
--- a/driver-core.current/dev_printk-constify-the-dev-argument.patch
+++ b/driver-core.current/dev_printk-constify-the-dev-argument.patch
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
/* will be changed into kobject_name(&dev->kobj) in the near future */
return dev->bus_id;
-@@ -517,7 +517,7 @@ extern void device_shutdown(void);
+@@ -518,7 +518,7 @@ extern void device_shutdown(void);
extern void sysdev_shutdown(void);
/* debugging and troubleshooting/diagnostic helpers. */
diff --git a/driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch
index d4d7bef4a43dc8..d4d7bef4a43dc8 100644
--- a/driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch
index 6b8f32c9be685e..6b8f32c9be685e 100644
--- a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-ide-convert-device_create_drvdata-to-device_create.patch
index 41b69a0759a5e6..41b69a0759a5e6 100644
--- a/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-ide-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch
index 53989adc5b05fc..53989adc5b05fc 100644
--- a/driver-core.current/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch
index 6d8a8bec75a5dc..6d8a8bec75a5dc 100644
--- a/driver-core.current/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch
index 84a2f892beb4a3..84a2f892beb4a3 100644
--- a/driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-net-convert-device_create_drvdata-to-device_create.patch
index 3223798074432e..3223798074432e 100644
--- a/driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-net-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-remove-device_create_drvdata.patch b/driver-core/device-create-remove-device_create_drvdata.patch
index 255e80ac4026b7..549d0207deef86 100644
--- a/driver-core.current/device-create-remove-device_create_drvdata.patch
+++ b/driver-core/device-create-remove-device_create_drvdata.patch
@@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -489,7 +489,6 @@ extern struct device *device_create(stru
+@@ -490,7 +490,6 @@ extern struct device *device_create(stru
dev_t devt, void *drvdata,
const char *fmt, ...)
__attribute__((format(printf, 5, 6)));
diff --git a/driver-core.current/device-create-s390-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-s390-convert-device_create_drvdata-to-device_create.patch
index b7b351b1313c0a..b7b351b1313c0a 100644
--- a/driver-core.current/device-create-s390-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-s390-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch
index 45bbc2e4c6a857..45bbc2e4c6a857 100644
--- a/driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-sound-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-sound-convert-device_create_drvdata-to-device_create.patch
index 1cedfce47fc140..1cedfce47fc140 100644
--- a/driver-core.current/device-create-sound-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-sound-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-usb-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-usb-convert-device_create_drvdata-to-device_create.patch
index 25d61b25c539f9..25d61b25c539f9 100644
--- a/driver-core.current/device-create-usb-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-usb-convert-device_create_drvdata-to-device_create.patch
diff --git a/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch
index 3a04a4f65abda5..3a04a4f65abda5 100644
--- a/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch
diff --git a/series b/series
index 5797f1be8c92b7..286991c6d7e374 100644
--- a/series
+++ b/series
@@ -13,20 +13,6 @@ gregkh/detect-atomic-counter-underflows.patch
#################################
# after -rc1
-driver-core.current/device-create-block-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-misc-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-net-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-s390-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-scsi-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-sound-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-usb-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch
-driver-core.current/device-create-remove-device_create_drvdata.patch
-
driver-core.current/kobject-replace-all-occurrences-of-with-instead-of-only-the-first-one.patch
driver-core.current/japanese-translation-of-documentation-submitchecklist.patch
driver-core.current/drivers-base-driver.c-remove-unused-to_dev-macro.patch
@@ -59,6 +45,20 @@ usb.current/usb-fix-pxa27x_udc-usb-speed-handling.patch
# Driver core patches for after 2.6.27 is out
#################################
+driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-net-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-s390-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-sound-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-usb-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-ide-convert-device_create_drvdata-to-device_create.patch
+driver-core/device-create-remove-device_create_drvdata.patch
+
# usb patches are needed to get dynamic debug patch to build properly.
driver-core/usb-gadget-move-library-files-into-g_serial-ko.patch
driver-core/usb-gadget-move-library-files-into-g_ether.ko.patch