diff options
| author | Greg KH <greg@press.(none)> | 2005-10-30 09:32:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-30 09:32:27 -0800 |
| commit | 22b346c188955002d085fc5662c5ab6d24025ab1 (patch) | |
| tree | b24d6c6dec379340d54008c4a72dbc8375dcc641 /driver | |
| parent | 2e22c642cc68fff01fcc4a5562ea1c78b3bdccc5 (diff) | |
| download | patches-22b346c188955002d085fc5662c5ab6d24025ab1.tar.gz | |
2.6.14-git1 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/driver-model-wakeup-03.patch | 6 | ||||
| -rw-r--r-- | driver/speakup-core.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/driver/driver-model-wakeup-03.patch b/driver/driver-model-wakeup-03.patch index 5b7201edaa30e..bd0e716853f5b 100644 --- a/driver/driver-model-wakeup-03.patch +++ b/driver/driver-model-wakeup-03.patch @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; case PCI_HEADER_TYPE_BRIDGE: /* bridge header */ -@@ -755,6 +769,7 @@ pci_scan_device(struct pci_bus *bus, int +@@ -756,6 +770,7 @@ pci_scan_device(struct pci_bus *bus, int memset(dev, 0, sizeof(struct pci_dev)); dev->bus = bus; dev->sysdata = bus->sysdata; @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev->dev.parent = bus->bridge; dev->dev.bus = &pci_bus_type; dev->devfn = devfn; -@@ -777,7 +792,6 @@ pci_scan_device(struct pci_bus *bus, int +@@ -778,7 +793,6 @@ pci_scan_device(struct pci_bus *bus, int void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus) { @@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -539,6 +539,10 @@ int pci_enable_wake(struct pci_dev *dev, +@@ -540,6 +540,10 @@ int pci_enable_wake(struct pci_dev *dev, if (!pm) return enable ? -EIO : 0; diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch index 9480c110877ad..9bedfcd33505d 100644 --- a/driver/speakup-core.patch +++ b/driver/speakup-core.patch @@ -8801,7 +8801,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif --- gregkh-2.6.orig/arch/arm/Kconfig +++ gregkh-2.6/arch/arm/Kconfig -@@ -724,6 +724,7 @@ source "drivers/mfd/Kconfig" +@@ -726,6 +726,7 @@ source "drivers/mfd/Kconfig" source "drivers/media/Kconfig" source "drivers/video/Kconfig" @@ -9119,7 +9119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2318,6 +2318,13 @@ M: wli@holomorphy.com +@@ -2321,6 +2321,13 @@ M: wli@holomorphy.com L: sparclinux@vger.kernel.org S: Maintained |