diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-06 11:30:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-06 11:30:17 -0700 |
| commit | 0b15daf937facd762834ec047928c675be2037bb (patch) | |
| tree | 8984c4274bba0568d2235d6a1747593360203d56 | |
| parent | a4c0849b63ac497af6e5ee81c6f6705e6b093d30 (diff) | |
| download | patches-0b15daf937facd762834ec047928c675be2037bb.tar.gz | |
take two drivers out of staging that can't be built currenty.
| -rw-r--r-- | series | 5 | ||||
| -rw-r--r-- | staging/me4000-add-pci-data-collection-driver.patch | 8 | ||||
| -rw-r--r-- | staging/staging-add-w35und-wifi-driver.patch | 6 | ||||
| -rw-r--r-- | staging/staging-add-wlan-ng-prism2-usb-driver.patch | 4 | ||||
| -rw-r--r-- | staging/usb-usb-ip-add-common-functions-needed.patch | 6 | ||||
| -rw-r--r-- | staging/video-add-the-go7007-driver.patch | 10 |
6 files changed, 20 insertions, 19 deletions
@@ -201,10 +201,8 @@ staging/staging-add-maintainers-entry.patch staging/net-add-et131x-driver.patch staging/net-add-alacritech-slicoss-driver.patch staging/net-add-sxg-network-driver.patch -staging/usb-add-princeton-instruments-usb-camera-driver.patch staging/me4000-firmware-file.patch staging/me4000-add-pci-data-collection-driver.patch -staging/oms-add-oms-maxp-driver.patch staging/video-add-the-go7007-driver.patch staging/usb-usb-ip-add-common-functions-needed.patch staging/usb-usb-ip-add-client-driver.patch @@ -216,6 +214,9 @@ staging/staging-fix-gcc-warnings-in-sxg.patch staging/staging-go7007-v4l-fixes.patch staging/staging-slicoss-lots-of-checkpatch-fixes.patch +# can not even compile :( +#staging/usb-add-princeton-instruments-usb-camera-driver.patch +#staging/oms-add-oms-maxp-driver.patch # not quite working yet... diff --git a/staging/me4000-add-pci-data-collection-driver.patch b/staging/me4000-add-pci-data-collection-driver.patch index 3f446dbd72a4c1..804ed5d618b46e 100644 --- a/staging/me4000-add-pci-data-collection-driver.patch +++ b/staging/me4000-add-pci-data-collection-driver.patch @@ -30,19 +30,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -31,4 +31,6 @@ source "drivers/staging/sxg/Kconfig" +@@ -29,4 +29,6 @@ source "drivers/staging/slicoss/Kconfig" - source "drivers/staging/rspiusb/Kconfig" + source "drivers/staging/sxg/Kconfig" +source "drivers/staging/me4000/Kconfig" + endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -4,3 +4,4 @@ obj-$(CONFIG_ET131X) += et131x/ +@@ -3,3 +3,4 @@ + obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_SXG) += sxg/ - obj-$(CONFIG_USB_RSPI) += rspiusb/ +obj-$(CONFIG_ME4000) += me4000/ --- /dev/null +++ b/drivers/staging/me4000/Kconfig diff --git a/staging/staging-add-w35und-wifi-driver.patch b/staging/staging-add-w35und-wifi-driver.patch index f252c5051b1339..318107e595a461 100644 --- a/staging/staging-add-w35und-wifi-driver.patch +++ b/staging/staging-add-w35und-wifi-driver.patch @@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -39,4 +39,6 @@ source "drivers/staging/go7007/Kconfig" +@@ -35,4 +35,6 @@ source "drivers/staging/go7007/Kconfig" source "drivers/staging/usbip/Kconfig" @@ -83,8 +83,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -8,3 +8,4 @@ obj-$(CONFIG_ME4000) += me4000/ - obj-$(CONFIG_OMS) += oms/ +@@ -6,3 +6,4 @@ obj-$(CONFIG_SXG) += sxg/ + obj-$(CONFIG_ME4000) += me4000/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ obj-$(CONFIG_USB_IP_COMMON) += usbip/ +obj-$(CONFIG_W35UND) += winbond/ diff --git a/staging/staging-add-wlan-ng-prism2-usb-driver.patch b/staging/staging-add-wlan-ng-prism2-usb-driver.patch index d9e1df70ab2fb3..ea7dfc2f062007 100644 --- a/staging/staging-add-wlan-ng-prism2-usb-driver.patch +++ b/staging/staging-add-wlan-ng-prism2-usb-driver.patch @@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -41,4 +41,6 @@ source "drivers/staging/usbip/Kconfig" +@@ -37,4 +37,6 @@ source "drivers/staging/usbip/Kconfig" source "drivers/staging/winbond/Kconfig" @@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -9,3 +9,4 @@ obj-$(CONFIG_OMS) += oms/ +@@ -7,3 +7,4 @@ obj-$(CONFIG_ME4000) += me4000/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ obj-$(CONFIG_USB_IP_COMMON) += usbip/ obj-$(CONFIG_W35UND) += winbond/ diff --git a/staging/usb-usb-ip-add-common-functions-needed.patch b/staging/usb-usb-ip-add-common-functions-needed.patch index 78bfd2d8cb56f0..6af53263390045 100644 --- a/staging/usb-usb-ip-add-common-functions-needed.patch +++ b/staging/usb-usb-ip-add-common-functions-needed.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -37,4 +37,6 @@ source "drivers/staging/oms/Kconfig" +@@ -33,4 +33,6 @@ source "drivers/staging/me4000/Kconfig" source "drivers/staging/go7007/Kconfig" @@ -36,9 +36,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -7,3 +7,4 @@ obj-$(CONFIG_USB_RSPI) += rspiusb/ +@@ -5,3 +5,4 @@ obj-$(CONFIG_SLICOSS) += slicoss/ + obj-$(CONFIG_SXG) += sxg/ obj-$(CONFIG_ME4000) += me4000/ - obj-$(CONFIG_OMS) += oms/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ +obj-$(CONFIG_USB_IP_COMMON) += usbip/ --- /dev/null diff --git a/staging/video-add-the-go7007-driver.patch b/staging/video-add-the-go7007-driver.patch index 9cb241a28eec48..1f33f9cd71281c 100644 --- a/staging/video-add-the-go7007-driver.patch +++ b/staging/video-add-the-go7007-driver.patch @@ -9370,17 +9370,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +MODULE_LICENSE("GPL v2"); --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -35,4 +35,6 @@ source "drivers/staging/me4000/Kconfig" +@@ -31,4 +31,6 @@ source "drivers/staging/sxg/Kconfig" - source "drivers/staging/oms/Kconfig" + source "drivers/staging/me4000/Kconfig" +source "drivers/staging/go7007/Kconfig" + endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -6,3 +6,4 @@ obj-$(CONFIG_SXG) += sxg/ - obj-$(CONFIG_USB_RSPI) += rspiusb/ +@@ -4,3 +4,4 @@ obj-$(CONFIG_ET131X) += et131x/ + obj-$(CONFIG_SLICOSS) += slicoss/ + obj-$(CONFIG_SXG) += sxg/ obj-$(CONFIG_ME4000) += me4000/ - obj-$(CONFIG_OMS) += oms/ +obj-$(CONFIG_VIDEO_GO7007) += go7007/ |