aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-15 09:47:28 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-15 09:47:28 -0700
commitc9ab5d8de683eb2b187feb3cea0dce7b90c459b7 (patch)
treebf309f9291ff8aced23e7a4f00a0e5b81d703eed
parentf69e3675d12d06132a4f733860717d70d98faff3 (diff)
downloadpatches-c9ab5d8de683eb2b187feb3cea0dce7b90c459b7.tar.gz
2.6.26-rc2-git4
-rw-r--r--ldp.next/usb-add-sensoray-2255-v4l-driver.patch2
-rw-r--r--ldp/video-add-the-go7007-driver.patch2
-rw-r--r--series26
-rw-r--r--version2
4 files changed, 4 insertions, 28 deletions
diff --git a/ldp.next/usb-add-sensoray-2255-v4l-driver.patch b/ldp.next/usb-add-sensoray-2255-v4l-driver.patch
index e7b2812afac26c..ae7b9d569c655d 100644
--- a/ldp.next/usb-add-sensoray-2255-v4l-driver.patch
+++ b/ldp.next/usb-add-sensoray-2255-v4l-driver.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
-@@ -893,6 +893,15 @@ config USB_STKWEBCAM
+@@ -897,6 +897,15 @@ config USB_STKWEBCAM
To compile this driver as a module, choose M here: the
module will be called stkwebcam.
diff --git a/ldp/video-add-the-go7007-driver.patch b/ldp/video-add-the-go7007-driver.patch
index 7bf4b1fb7f98c7..e580dce3b3dca5 100644
--- a/ldp/video-add-the-go7007-driver.patch
+++ b/ldp/video-add-the-go7007-driver.patch
@@ -9440,7 +9440,7 @@ Doesn't build yet, but we have to start somewhere...
+MODULE_LICENSE("GPL v2");
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
-@@ -685,6 +685,7 @@ config VIDEO_MEYE
+@@ -689,6 +689,7 @@ config VIDEO_MEYE
module will be called meye.
source "drivers/media/video/saa7134/Kconfig"
diff --git a/series b/series
index 47adea8b60e166..ce40469f14d53c 100644
--- a/series
+++ b/series
@@ -5,41 +5,17 @@ gregkh/detect-atomic-counter-underflows.patch
#####################################################################
-# Stuff to be merged for 2.6.26 (or in the case of ldp, 2.6.27
+# Stuff to be merged for 2.6.26 (or in the case of ldp, 2.6.27)
#####################################################################
#################################
# Driver core patches for 2.6.26
#################################
-driver-core.current/block-do_mounts-accept-root-non-existant-partition.patch
driver-core.current/kobject-fix-kobject_rename-and-config_sysfs.patch
-driver-core.current/driver-core-struct-class-remove-children-list.patch
#################################
# USB patches for 2.6.26
#################################
-usb.current/usb-add-new-moto_modem-driver-for-some-morotola-phones.patch
-usb.current/usb-create-attributes-before-sending-uevent.patch
-usb.current/usb-add-association.h.patch
-usb.current/usb-add-telstra-nextg-cdma-id-to-option-driver.patch
-usb.current/usb-isp1760-fix-printk-format.patch
-usb.current/usb-fix-integer-as-null-pointer-warnings-found-by-sparse.patch
-usb.current/usb-support-for-the-et502hs-hdspa-modem.patch
-usb.current/usb-support-for-the-et502hs-hdspa-modem-in-option-driver.patch
-usb.current/usb-add-zoom-telephonics-model-3095f-v.92-usb-mini-external-modem-to-cdc-acm.patch
-usb.current/usb-fix-unusual_devs.h-ordering.patch
-usb.current/usb-do-not-handle-device-1410-5010-in-option-driver.patch
-usb.current/usb-fix-compile-warning-in-isp1760.patch
-usb.current/usb-serial-gadget-cleanup-reorg.patch
-usb.current/usb-serial-gadget-remove-needless-data-structure.patch
-usb.current/usb-serial-gadget-simplify-endpoint-handling.patch
-usb.current/usb-serial-gadget-descriptor-cleanup.patch
-usb.current/usb-unusual_devs-add-support-for-gi-0401-sd-card-interface.patch
-usb.current/usb-option-add-new-dell-5520-hsdpa-variant.patch
-usb.current/usb-remove-picdem-fs-usb-demo-device-from-ldusb.patch
-usb.current/usbtest-comment-on-why-this-code-expects-negative-and-positive-errnos.patch
-usb.current/usb-pxa27x_udc-minor-fixes.patch
-usb.current/usb-atmel_usba_udc-fixes-mostly-disconnect.patch
#####################################################################
diff --git a/version b/version
index 5267725b51acfd..7c1f31cd1963d8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26-rc2-git3
+2.6.26-rc2-git4