diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-17 16:38:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-17 16:38:24 -0800 |
| commit | 7e897605649c33b92d64911437bc60cd1989bd37 (patch) | |
| tree | ac5e8ec3fef928673ce8c8dafb04bbfec592b3b2 | |
| parent | a5f8ed0d9fbacf5195ef441dc8398a9924401cb7 (diff) | |
| download | patches-7e897605649c33b92d64911437bc60cd1989bd37.tar.gz | |
patch update
| -rw-r--r-- | driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch b/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch index 3bfe8227d4c1e7..c8644ed040a77f 100644 --- a/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch +++ b/driver-core/driver-core-create-lock-unlock-functions-for-struct-device.patch @@ -53,8 +53,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/base/bus.c | 20 ++++++++++---------- drivers/base/dd.c | 38 +++++++++++++++++++------------------- drivers/base/power/main.c | 20 ++++++++++---------- - drivers/firewire/core-device.c | 4 ++-- - drivers/ieee1394/nodemgr.c | 4 ++-- + drivers/firewire/core-device.c | 5 ++--- + drivers/ieee1394/nodemgr.c | 5 ++--- drivers/pci/bus.c | 4 ++-- drivers/pci/pci.c | 4 ++-- drivers/pcmcia/ds.c | 8 ++++---- @@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/uwb/uwb-internal.h | 4 ++-- include/linux/device.h | 17 ++++++++++++++++- include/linux/usb.h | 6 +++--- - 13 files changed, 76 insertions(+), 61 deletions(-) + 13 files changed, 76 insertions(+), 63 deletions(-) --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -325,7 +325,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c -@@ -762,9 +762,9 @@ static int update_unit(struct device *de +@@ -32,7 +32,6 @@ + #include <linux/module.h> + #include <linux/mutex.h> + #include <linux/rwsem.h> +-#include <linux/semaphore.h> + #include <linux/spinlock.h> + #include <linux/string.h> + #include <linux/workqueue.h> +@@ -762,9 +761,9 @@ static int update_unit(struct device *de struct fw_driver *driver = (struct fw_driver *)dev->driver; if (is_fw_unit(dev) && driver != NULL && driver->update != NULL) { @@ -339,7 +347,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c -@@ -1397,9 +1397,9 @@ static int update_pdrv(struct device *de +@@ -19,7 +19,6 @@ + #include <linux/moduleparam.h> + #include <linux/mutex.h> + #include <linux/freezer.h> +-#include <linux/semaphore.h> + #include <asm/atomic.h> + + #include "csr.h" +@@ -1397,9 +1396,9 @@ static int update_pdrv(struct device *de pdrv = container_of(drv, struct hpsb_protocol_driver, driver); if (pdrv->update) { |