2.6.25-git5 resync and other fun (uwb class_device fixes...)

author: Greg Kroah-Hartman <gregkh@suse.de> 2008-04-24 15:42:13 -0700
committer: Greg Kroah-Hartman <gregkh@suse.de> 2008-04-24 15:42:13 -0700
commit: 07c98c3f79c384abf0503e89cec102e86e7aba0a (patch)
tree: 26b9e228959c37bbf56a83cf1286626bb48cf639
parent: 027bda89bb7e5b3aa9f76f5a4ed9ce03621907b7 (diff)
download: patches-07c98c3f79c384abf0503e89cec102e86e7aba0a.tar.gz
8 files changed, 101 insertions, 173 deletions
diff --git a/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch b/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
index 8c6114da57451f..fc12964cd25227 100644
--- a/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
+++ b/driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch
@@ -50,14 +50,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
  arch/x86/kernel/apm_32.c   |    8 
- drivers/base/power/main.c  |  693 ++++++++++++++++++++++++++++++++++-----------
+ drivers/base/power/main.c  |  688 ++++++++++++++++++++++++++++++++++-----------
  drivers/base/power/power.h |    2 
  drivers/base/power/trace.c |    4 
  include/linux/device.h     |    9 
  include/linux/pm.h         |  314 ++++++++++++++++++--
  kernel/power/disk.c        |   20 -
  kernel/power/main.c        |    6 
- 8 files changed, 852 insertions(+), 204 deletions(-)
+ 8 files changed, 851 insertions(+), 200 deletions(-)
 
 --- a/arch/x86/kernel/apm_32.c
 +++ b/arch/x86/kernel/apm_32.c
@@ -163,26 +163,20 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /**
   *	device_pm_add - add a device to the list of active devices
-@@ -68,22 +75,32 @@ int device_pm_add(struct device *dev)
+@@ -68,19 +75,32 @@ int device_pm_add(struct device *dev)
  		 dev->bus ? dev->bus->name : "No Bus",
  		 kobject_name(&dev->kobj));
  	mutex_lock(&dpm_list_mtx);
 -	if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
 -		if (dev->parent->power.sleeping)
--			dev_warn(dev,
--				"parent %s is sleeping, will not add\n",
+-			dev_warn(dev, "parent %s is sleeping\n",
 +	if (dev->parent) {
 +		if (dev->parent->power.status >= DPM_SUSPENDING) {
 +			dev_warn(dev, "parent %s is sleeping, will not add\n",
  				dev->parent->bus_id);
 -		else
--			dev_warn(dev, "devices are sleeping, will not add\n");
+-			dev_warn(dev, "all devices are sleeping\n");
 -		WARN_ON(true);
--		error = -EBUSY;
--	} else {
--		error = dpm_sysfs_add(dev);
--		if (!error)
--			list_add_tail(&dev->power.entry, &dpm_active);
 +			goto Refuse;
 +		}
 +	} else if (transition_started) {
@@ -192,23 +186,25 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +		 * unhandled down the road
 +		 */
 +		goto Refuse;
-+	}
-+	error = dpm_sysfs_add(dev);
+ 	}
+ 	error = dpm_sysfs_add(dev);
+-	if (!error)
+-		list_add_tail(&dev->power.entry, &dpm_active);
 +	if (!error) {
 +		dev->power.status = DPM_ON;
 +		list_add_tail(&dev->power.entry, &dpm_list);
- 	}
-+ End:
++  	}
++End:
  	mutex_unlock(&dpm_list_mtx);
  	return error;
-+ Refuse:
++Refuse:
 +	WARN_ON(true);
 +	error = -EBUSY;
 +	goto End;
  }
  
  /**
-@@ -103,73 +120,241 @@ void device_pm_remove(struct device *dev
+@@ -100,73 +120,241 @@ void device_pm_remove(struct device *dev
  	mutex_unlock(&dpm_list_mtx);
  }
  
@@ -471,7 +467,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	int error = 0;
  
-@@ -178,21 +363,40 @@ static int resume_device(struct device *
+@@ -175,21 +363,40 @@ static int resume_device(struct device *
  
  	down(&dev->sem);
  
@@ -522,7 +518,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	up(&dev->sem);
  
  	TRACE_RESUME(error);
-@@ -201,78 +405,161 @@ static int resume_device(struct device *
+@@ -198,78 +405,161 @@ static int resume_device(struct device *
  
  /**
   *	dpm_resume - Resume every device.
@@ -720,7 +716,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		error = dev->bus->suspend_late(dev, state);
  		suspend_report_result(dev->bus->suspend_late, error);
  	}
-@@ -281,37 +568,30 @@ static int suspend_device_late(struct de
+@@ -278,37 +568,30 @@ static int suspend_device_late(struct de
  
  /**
   *	device_power_down - Shut down special devices.
@@ -766,7 +762,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return error;
  }
  EXPORT_SYMBOL_GPL(device_power_down);
-@@ -319,7 +599,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
+@@ -316,7 +599,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
  /**
   *	suspend_device - Save state of one device.
   *	@dev:	Device.
@@ -775,7 +771,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   */
  static int suspend_device(struct device *dev, pm_message_t state)
  {
-@@ -327,24 +607,43 @@ static int suspend_device(struct device 
+@@ -324,24 +607,43 @@ static int suspend_device(struct device 
  
  	down(&dev->sem);
  
@@ -835,7 +831,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	up(&dev->sem);
  
  	return error;
-@@ -352,67 +651,141 @@ static int suspend_device(struct device 
+@@ -349,67 +651,141 @@ static int suspend_device(struct device 
  
  /**
   *	dpm_suspend - Suspend every device.
diff --git a/ldp/add-me4000-pci-data-collection-driver.patch b/ldp/add-me4000-pci-data-collection-driver.patch
index cbd34113711131..e6c6593001c178 100644
--- a/ldp/add-me4000-pci-data-collection-driver.patch
+++ b/ldp/add-me4000-pci-data-collection-driver.patch
@@ -58,13 +58,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/misc/me4000.c      | 5435 +++++++++++++++
  drivers/misc/me4000.h      | 1014 ++
  drivers/misc/xilinx_firm.h |15416 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/misc/Kconfig       |    6 
+ drivers/misc/Makefile      |    1 
+ drivers/misc/me4000.c      | 5435 +++++++++++++++
+ drivers/misc/me4000.h      | 1014 ++
+ drivers/misc/xilinx_firm.h |15416 +++++++++++++++++++++++++++++++++++++++++++++
  5 files changed, 21872 insertions(+)
 
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
-@@ -360,4 +360,10 @@ config ENCLOSURE_SERVICES
- 	  driver (SCSI/ATA) which supports enclosures
- 	  or a SCSI enclosure device (SES) to use these services.
+@@ -372,4 +372,10 @@ config SGI_XP
+ 	  this feature will allow for direct communication between SSIs
+ 	  based on a network adapter and DMA messaging.
  
 +config ME4000
 +	tristate "me4000 driver"
@@ -75,10 +80,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  endif # MISC_DEVICES
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
-@@ -24,3 +24,4 @@ obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93c
- obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o
+@@ -25,3 +25,4 @@ obj-$(CONFIG_INTEL_MENLOW)	+= intel_menl
  obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
  obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o
+ obj-$(CONFIG_SGI_XP)		+= sgi-xp/
 +obj-$(CONFIG_ME4000)		+= me4000.o
 --- /dev/null
 +++ b/drivers/misc/me4000.c
diff --git a/ldp/aectc-add-the-aectc-driver.patch b/ldp/aectc-add-the-aectc-driver.patch
index bfa1645cf3cca0..a21fc680a85363 100644
--- a/ldp/aectc-add-the-aectc-driver.patch
+++ b/ldp/aectc-add-the-aectc-driver.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
-@@ -366,4 +366,11 @@ config ME4000
+@@ -378,4 +378,11 @@ config ME4000
  	help
  	  FIXME!
  
diff --git a/ldp/input-add-appleir-driver.patch b/ldp/input-add-appleir-driver.patch
index b1b5c91a923312..b1eb3cadc53630 100644
--- a/ldp/input-add-appleir-driver.patch
+++ b/ldp/input-add-appleir-driver.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/drivers/hid/usbhid/hid-quirks.c
 +++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -74,6 +74,7 @@
+@@ -77,6 +77,7 @@
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
  #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
@@ -26,14 +26,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
  
  #define USB_VENDOR_ID_ASUS		0x0b05
-@@ -437,6 +438,7 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },
+@@ -440,6 +441,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
  
  	{ USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
 +	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
  	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
+ 	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },
- 
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig
 @@ -148,6 +148,18 @@ config INPUT_KEYSPAN_REMOTE
diff --git a/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch b/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch
index d76c178cb7283b..94a0474b25a1f2 100644
--- a/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch
+++ b/ldp/novfs-add-the-novell-filesystem-client-kernel-module.patch
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -2148,6 +2148,15 @@ config 9P_FS
+@@ -2149,6 +2149,15 @@ config 9P_FS
  
  	  If unsure, say N.
  
diff --git a/usb/uwb-add-the-uwb-stack.patch b/usb/uwb-add-the-uwb-stack.patch
index 0ada41574b78e0..45c610246c9a3c 100644
--- a/usb/uwb-add-the-uwb-stack.patch
+++ b/usb/uwb-add-the-uwb-stack.patch
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/uwb/est.c          |  414 ++++++++++++++++++++++++++
  drivers/uwb/ie.c           |  591 +++++++++++++++++++++++++++++++++++++
  drivers/uwb/lc-dev.c       |  703 ++++++++++++++++++++++++++++++++++++++++++++
- drivers/uwb/lc-rc.c        |  560 +++++++++++++++++++++++++++++++++++
+ drivers/uwb/lc-rc.c        |  499 +++++++++++++++++++++++++++++++
  drivers/uwb/neh.c          |  616 ++++++++++++++++++++++++++++++++++++++
  drivers/uwb/pal.c          |   71 ++++
  drivers/uwb/reset.c        |  328 ++++++++++++++++++++
@@ -40,10 +40,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/uwb/umc-dev.c      |  104 ++++++
  drivers/uwb/umc-drv.c      |   31 +
  drivers/uwb/uwb-debug.c    |  306 +++++++++++++++++++
- drivers/uwb/uwb-internal.h |  298 ++++++++++++++++++
+ drivers/uwb/uwb-internal.h |  288 ++++++++++++++++++
  drivers/uwb/uwbd.c         |  428 +++++++++++++++++++++++++++
  drivers/uwb/whci.c         |  285 +++++++++++++++++
- 26 files changed, 8071 insertions(+)
+ 26 files changed, 8000 insertions(+)
 
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig
@@ -4189,7 +4189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +EXPORT_SYMBOL_GPL(uwb_dev_get_count);
 --- /dev/null
 +++ b/drivers/uwb/lc-rc.c
-@@ -0,0 +1,560 @@
+@@ -0,0 +1,499 @@
 +/*
 + * Ultra Wide Band
 + * Life cycle of radio controllers
@@ -4526,6 +4526,24 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +}
 +EXPORT_SYMBOL_GPL(uwb_rc_rm);
 +
++static int find_rc_try_get(struct device *dev, void *data)
++{
++	struct uwb_rc *target_rc = data;
++	struct uwb_rc *rc = dev_get_drvdata(dev);
++
++	if (rc == NULL) {
++		WARN_ON(1);
++		return 0;
++	}
++	if (rc == target_rc) {
++		if (rc->ready == 0)
++			return 0;
++		else
++			return 1;
++	}
++	return 0;
++}
++
 +/**
 + * Given a radio controller descriptor, validate and refcount it
 + *
@@ -4534,30 +4552,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 + */
 +struct uwb_rc *__uwb_rc_try_get(struct uwb_rc *target_rc)
 +{
-+	struct class_device *class_dev;
++	struct device *dev;
 +	struct uwb_rc *rc = NULL;
-+	struct list_head *children;
-+	if (uwb_rc_class_lock())
-+		return NULL;
-+	children = &uwb_rc_class->children;
-+	list_for_each_entry(class_dev, children, node) {
-+		rc = class_get_devdata(class_dev);
-+		if (rc == NULL) {
-+			WARN_ON(1);
-+			continue;
-+		}
-+		if (rc == target_rc) {
-+			if (rc->ready == 0)
-+				break;
-+			__uwb_rc_get(rc);
-+			goto out;
-+		}
++
++	dev = class_find_device(uwb_rc_class, target_rc, find_rc_try_get);
++	if (dev) {
++		rc = dev_get_drvdata(dev);
++		__uwb_rc_get(rc);
 +	}
-+	rc = NULL;
-+out:
-+	target_rc = rc;
-+	uwb_rc_class_unlock();
-+	return target_rc;
++	return rc;
 +}
 +EXPORT_SYMBOL_GPL(__uwb_rc_try_get);
 +
@@ -4574,42 +4577,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	return rc;
 +}
 +
-+
-+/**
-+ * Locate and refcount a radio controller given a father device
-+ *
-+ * @father_dev   Pointer to the 'father' device structure.
-+ * @returns NULL If the rc does not exist or is quiescing; the ptr to
-+ *               it otherwise, properly referenced.
-+ *
-+ * There is no need to lock around as the "father" would be
-+ * refcounted by the target, and to remove the referemes, the
-+ * uwb_rc_class->sem would have to be taken--we hold it, ergo we
-+ * should be safe.
-+ */
-+struct uwb_rc *uwb_rc_get_by_father(const struct device *father_dev)
++static int find_rc_grandpa(struct device *dev, void *data)
 +{
-+	struct class_device *class_dev;
-+	struct uwb_rc *rc;
-+	struct list_head *children;
++	struct device *grandpa_dev = data;
++	struct uwb_rc *rc = dev_get_drvdata(dev);
 +
-+	if (uwb_rc_class_lock())
-+		return NULL;
-+	children = &uwb_rc_class->children;
-+	list_for_each_entry(class_dev, children, node) {
-+		rc = class_get_devdata(class_dev);
-+		if (rc->uwb_dev.dev.parent == father_dev) {
-+			rc = uwb_rc_get(rc);
-+			goto out;
-+		}
++	if (rc->uwb_dev.dev.parent->parent == grandpa_dev) {
++		rc = uwb_rc_get(rc);
++		return 1;
 +	}
-+	rc = NULL;
-+out:
-+	uwb_rc_class_unlock();
-+	return rc;
++	return 0;
 +}
-+EXPORT_SYMBOL_GPL(uwb_rc_get_by_father);
-+
 +
 +/**
 + * Locate and refcount a radio controller given a common grand-parent
@@ -4629,23 +4607,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 + */
 +struct uwb_rc *uwb_rc_get_by_grandpa(const struct device *grandpa_dev)
 +{
-+	struct class_device *class_dev;
-+	struct uwb_rc *rc;
-+	struct list_head *children;
++	struct device *dev;
++	struct uwb_rc *rc = NULL;
 +
-+	if (uwb_rc_class_lock())
-+		return NULL;
-+	children = &uwb_rc_class->children;
-+	list_for_each_entry(class_dev, children, node) {
-+		rc = class_get_devdata(class_dev);
-+		if (rc->uwb_dev.dev.parent->parent == grandpa_dev) {
-+			rc = uwb_rc_get(rc);
-+			goto out;
-+		}
-+	}
-+	rc = NULL;
-+out:
-+	uwb_rc_class_unlock();
++	dev = class_find_device(uwb_rc_class, (void *)grandpa_dev,
++				find_rc_grandpa);
++	if (dev)
++		rc = dev_get_drvdata(dev);
 +	return rc;
 +}
 +EXPORT_SYMBOL_GPL(uwb_rc_get_by_grandpa);
@@ -4655,64 +4623,35 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 + *
 + * @returns the pointer to the radio controller, properly referenced
 + */
-+struct uwb_rc *uwb_rc_get_by_dev(const struct uwb_dev_addr *addr)
++static int find_rc_dev(struct device *dev, void *data)
 +{
-+	struct class_device *class_dev;
-+	struct uwb_rc *rc = NULL;
-+	struct list_head *children;
++	struct uwb_dev_addr *addr = data;
++	struct uwb_rc *rc = dev_get_drvdata(dev);
 +
-+	if (uwb_rc_class_lock())
-+		return NULL;
-+	children = &uwb_rc_class->children;
-+	list_for_each_entry(class_dev, children, node) {
-+		rc = class_get_devdata(class_dev);
-+		if (rc == NULL) {
-+			WARN_ON(1);
-+			continue;
-+		}
-+		if (!uwb_dev_addr_cmp(&rc->uwb_dev.dev_addr, addr)) {
-+			rc = uwb_rc_get(rc);
-+			goto out;
-+		}
++	if (rc == NULL) {
++		WARN_ON(1);
++		return 0;
 +	}
-+	rc = NULL;
-+out:
-+	uwb_rc_class_unlock();
-+	return rc;
++	if (!uwb_dev_addr_cmp(&rc->uwb_dev.dev_addr, addr)) {
++		rc = uwb_rc_get(rc);
++		return 1;
++	}
++	return 0;
 +}
-+EXPORT_SYMBOL_GPL(uwb_rc_get_by_dev);
 +
-+/**
-+ * Find a radio controller by name
-+ *
-+ * @returns the pointer to the radio controller, properly referenced
-+ */
-+struct uwb_rc * uwb_rc_get_by_name(const char *name)
++struct uwb_rc *uwb_rc_get_by_dev(const struct uwb_dev_addr *addr)
 +{
-+	struct class_device *class_dev;
++	struct device *dev;
 +	struct uwb_rc *rc = NULL;
-+	struct list_head *children;
 +
-+	if (uwb_rc_class_lock())
-+		return NULL;
-+	children = &uwb_rc_class->children;
-+	list_for_each_entry(class_dev, children, node) {
-+		rc = class_get_devdata(class_dev);
-+		if (rc == NULL) {
-+			WARN_ON(1);
-+			continue;
-+		}
-+		if (!strcmp(class_dev->class_id, name)) {
-+			rc = uwb_rc_get(rc);
-+			goto out;
-+		}
-+	}
-+	rc = NULL;
-+out:
-+	uwb_rc_class_unlock();
++	dev = class_find_device(uwb_rc_class, (void *)addr,
++				find_rc_dev);
++	if (dev)
++		rc = dev_get_drvdata(dev);
++
 +	return rc;
 +}
-+EXPORT_SYMBOL_GPL(uwb_rc_get_by_name);
++EXPORT_SYMBOL_GPL(uwb_rc_get_by_dev);
 +
 +/**
 + * Drop a reference on a radio controller
@@ -7188,7 +7127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +}
 --- /dev/null
 +++ b/drivers/uwb/uwb-internal.h
-@@ -0,0 +1,298 @@
+@@ -0,0 +1,288 @@
 +/*
 + * Ultra Wide Band
 + * UWB internal API
@@ -7466,16 +7405,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +/* Workarounds for version specific stuff */
 +
-+static inline int uwb_rc_class_lock(void)
-+{
-+	return down_interruptible(&uwb_rc_class->sem);
-+}
-+
-+static inline void uwb_rc_class_unlock(void)
-+{
-+	up(&uwb_rc_class->sem);
-+}
-+
 +static inline void uwb_dev_lock(struct uwb_dev *uwb_dev)
 +{
 +	down(&uwb_dev->dev.sem);
diff --git a/usb/wusb-add-the-uwb-include-files.patch b/usb/wusb-add-the-uwb-include-files.patch
index e41341908b6896..9ba4fe5c17b9ba 100644
--- a/usb/wusb-add-the-uwb-include-files.patch
+++ b/usb/wusb-add-the-uwb-include-files.patch
@@ -7,7 +7,7 @@ Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- include/linux/uwb.h             |  770 ++++++++++++++++++++++++++++++++++++++++
+ include/linux/uwb.h             |  768 ++++++++++++++++++++++++++++++++++++++++
  include/linux/uwb/bugs-macros.h |   64 +++
  include/linux/uwb/bugs.h        |   18 
  include/linux/uwb/debug-cmd.h   |   57 ++
@@ -17,11 +17,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/uwb/util.h        |   89 ++++
  include/linux/uwb/whci.h        |  117 ++++++
  include/linux/wlp.h             |  728 +++++++++++++++++++++++++++++++++++++
- 10 files changed, 2749 insertions(+)
+ 10 files changed, 2747 insertions(+)
 
 --- /dev/null
 +++ b/include/linux/uwb.h
-@@ -0,0 +1,770 @@
+@@ -0,0 +1,768 @@
 +/*
 + * Ultra Wide Band
 + * UWB API
@@ -455,8 +455,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +extern struct uwb_rc *uwb_rc_alloc(void);
 +extern struct uwb_rc *uwb_rc_get_by_dev(const struct uwb_dev_addr *);
-+extern struct uwb_rc *uwb_rc_get_by_name(const char *);
-+extern struct uwb_rc *uwb_rc_get_by_father(const struct device *);
 +extern struct uwb_rc *uwb_rc_get_by_grandpa(const struct device *);
 +extern void uwb_rc_put(struct uwb_rc *rc);
 +
diff --git a/version b/version
index acaca864cfbf36..b8cea3cddc6792 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.25-git3
+2.6.25-git5
author	Greg Kroah-Hartman <gregkh@suse.de>	2008-04-24 15:42:13 -0700
committer	Greg Kroah-Hartman <gregkh@suse.de>	2008-04-24 15:42:13 -0700
commit	07c98c3f79c384abf0503e89cec102e86e7aba0a (patch)
tree	26b9e228959c37bbf56a83cf1286626bb48cf639
parent	027bda89bb7e5b3aa9f76f5a4ed9ce03621907b7 (diff)
download	patches-07c98c3f79c384abf0503e89cec102e86e7aba0a.tar.gz