aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-08 16:04:43 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-08 16:04:43 -0700
commitd1250c4948996b6ff72db22e92acf4167ae6308f (patch)
tree0f404a31ace9f4195117a8f12971166e9e193c17
parent333a68b5fb797ec0b59bdc58744f94a7b4665738 (diff)
downloadpatches-d1250c4948996b6ff72db22e92acf4167ae6308f.tar.gz
build fixes
-rw-r--r--driver-core/read-dev_name-instead-of-bus_id.patch10
-rw-r--r--series3
2 files changed, 3 insertions, 10 deletions
diff --git a/driver-core/read-dev_name-instead-of-bus_id.patch b/driver-core/read-dev_name-instead-of-bus_id.patch
index 2f7070747b9b70..0d2b00c92bfa69 100644
--- a/driver-core/read-dev_name-instead-of-bus_id.patch
+++ b/driver-core/read-dev_name-instead-of-bus_id.patch
@@ -267,9 +267,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/isa/cs423x/cs4236.c | 8
sound/isa/es1688/es1688.c | 6
sound/isa/gus/gusclassic.c | 8
- sound/isa/gus/gusextreme.c | 14 -
+ sound/isa/gus/gusextreme.c | 12 -
sound/isa/sb/sb8.c | 4
- 256 files changed, 746 insertions(+), 735 deletions(-)
+ 256 files changed, 745 insertions(+), 734 deletions(-)
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -6638,12 +6638,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
-@@ -1,4 +1,4 @@
--/*
-+*
- * Driver for Gravis UltraSound Extreme soundcards
- * Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
@@ -107,7 +107,7 @@ static int __devinit snd_gusextreme_es16
irq[n] = snd_legacy_find_free_irq(possible_irqs);
if (irq[n] < 0) {
diff --git a/series b/series
index 941c767a297118..6eb6cc8e62d3c9 100644
--- a/series
+++ b/series
@@ -8,7 +8,6 @@ gregkh/detect-atomic-counter-underflows.patch
# Stuff to be merged for 2.6.26 (or in the case of ldp, 2.6.27
#####################################################################
-
#################################
# Driver core patches for 2.6.26
#################################
@@ -30,6 +29,7 @@ usb.next/usb-fix-unusual_devs.h-ordering.patch
usb.next/usb-c67x00-build-fix.patch
usb.next/usb-do-not-handle-device-1410-5010-in-option-driver.patch
usb.next/usb-fix-compile-warning-in-isp1760.patch
+usb.next/usb-use-get_unaligned_-helpers-for-kl5kusb105-driver.patch
#####################################################################
@@ -78,7 +78,6 @@ usb/usb-combine-hub_quiesce-and-hub_stop.patch
usb/usb-io_ti-first-cut-at-a-big-clean-up.patch
usb/usb-storage-separate-dynamic-flags-from-fixed-flags.patch
usb/usb-storage-change-remaining-semaphore-to-completion.patch
-usb/usb-use-get_unaligned_-helpers-for-kl5kusb105-driver.patch
usb/usb-isp1760-hcd.c-make-2-functions-static.patch