diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-11 15:51:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-11 15:51:26 -0700 |
| commit | d4597caad3c8098b2cb07aa68a1c689a52ae0764 (patch) | |
| tree | e9749267c74f400d720967bab598e8cd555349fa | |
| parent | 5e84784070752ec51fcca0bb05a1c03736e2c2ec (diff) | |
| download | patches-d4597caad3c8098b2cb07aa68a1c689a52ae0764.tar.gz | |
refresh and minor bug fix in sound-device.patch
| -rw-r--r-- | driver-class/network-device.patch (renamed from driver-class/network-class_device-to-device.patch) | 0 | ||||
| -rw-r--r-- | driver-class/sound-device.patch | 6 | ||||
| -rw-r--r-- | pci/altix-add-initial-acpi-io-support.patch | 2 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/driver-class/network-class_device-to-device.patch b/driver-class/network-device.patch index c2a07cd7f57cdc..c2a07cd7f57cdc 100644 --- a/driver-class/network-class_device-to-device.patch +++ b/driver-class/network-device.patch diff --git a/driver-class/sound-device.patch b/driver-class/sound-device.patch index 6cfcdb2fbd1a82..f7b72b0598f280 100644 --- a/driver-class/sound-device.patch +++ b/driver-class/sound-device.patch @@ -17,9 +17,9 @@ device object. Thanks to Kay for the updates to this patch. -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@novell.com> - +Acked-by: Jaroslav Kysela <perex@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- include/sound/core.h | 8 +++++--- @@ -149,7 +149,7 @@ Signed-off-by: Kay Sievers <kay.sievers@novell.com> + preg->dev = device_create(sound_class, device, MKDEV(major, minor), + "%s", name); + if (preg->dev) -+ dev_get_drvdata(preg->dev); ++ dev_set_drvdata(preg->dev, private_data); mutex_unlock(&sound_mutex); return 0; diff --git a/pci/altix-add-initial-acpi-io-support.patch b/pci/altix-add-initial-acpi-io-support.patch index fb51bb94a6a4bc..66850645beddd7 100644 --- a/pci/altix-add-initial-acpi-io-support.patch +++ b/pci/altix-add-initial-acpi-io-support.patch @@ -1807,7 +1807,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - cnodeid_t my_cnode, mem_cnode; struct tioce_common *tioce_common; struct tioce_kernel *tioce_kern; - struct tioce *tioce_mmr; + struct tioce __iomem *tioce_mmr; @@ -1035,21 +1032,6 @@ tioce_bus_fixup(struct pcibus_bussoft *p tioce_common->ce_pcibus.bs_persist_segment, tioce_common->ce_pcibus.bs_persist_busnum); @@ -193,7 +193,7 @@ driver-class/fb-device.patch driver-class/input-device.patch driver-class/usb-move-usb_device_class-class-devices-to-be-real-devices.patch driver-class/usb-convert-usb-class-devices-to-real-devices.patch -driver-class/network-class_device-to-device.patch +driver-class/network-device.patch driver-class/class_device_rename-remove.patch driver-class/pci_bridge-device.patch @@ -1 +1 @@ -2.6.19-rc1-git6 +2.6.19-rc1-git7 |