From 0e5cc87355798589a5ca550d0c9e1cb0128ffaa4 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 4 Sep 2012 17:36:28 -0700 Subject: [PATCH] compat-drivers: refresh patches for next-20120904 Signed-off-by: Luis R. Rodriguez --- patches/drm/02-revert-vm_mmap.patch | 2 +- patches/drm/04-revert-prime-support.patch | 10 +++++----- patches/network/0001-netdev_ops.patch | 2 +- patches/network/11-dev-pm-ops.patch | 6 +++--- patches/network/14-device-type.patch | 2 +- patches/network/29-sdio_no_suspend.patch | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/drm/02-revert-vm_mmap.patch b/patches/drm/02-revert-vm_mmap.patch index 91e429ee8fea..09afc0045f9a 100644 --- a/patches/drm/02-revert-vm_mmap.patch +++ b/patches/drm/02-revert-vm_mmap.patch @@ -73,7 +73,7 @@ These can't be backported as they rely on non-exported symbols. --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -1054,10 +1054,17 @@ i915_gem_mmap_ioctl(struct drm_device *d +@@ -1301,10 +1301,17 @@ i915_gem_mmap_ioctl(struct drm_device *d drm_gem_object_unreference_unlocked(obj); return -EINVAL; } diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch index 39af15259ec8..b2eba6f75bec 100644 --- a/patches/drm/04-revert-prime-support.patch +++ b/patches/drm/04-revert-prime-support.patch @@ -123,7 +123,7 @@ not < 3.3.0. +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -343,8 +343,10 @@ static const struct file_operations rade +@@ -344,8 +344,10 @@ static const struct file_operations rade static struct drm_driver kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | @@ -136,7 +136,7 @@ not < 3.3.0. .dev_priv_size = 0, .load = radeon_driver_load_kms, .firstopen = radeon_driver_firstopen_kms, -@@ -379,10 +381,12 @@ static struct drm_driver kms_driver = { +@@ -380,10 +382,12 @@ static struct drm_driver kms_driver = { .dumb_destroy = radeon_mode_dumb_destroy, .fops = &radeon_driver_kms_fops, @@ -324,9 +324,9 @@ not < 3.3.0. #include +#endif - static __must_check int i915_gem_object_flush_gpu_write_domain(struct drm_i915_gem_object *obj); static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj); -@@ -3547,8 +3549,10 @@ void i915_gem_free_object(struct drm_gem + static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj); +@@ -3700,8 +3702,10 @@ void i915_gem_free_object(struct drm_gem trace_i915_gem_object_destroy(obj); @@ -347,7 +347,7 @@ not < 3.3.0. #include "drmP.h" #include "i915_drv.h" #include -@@ -232,3 +233,4 @@ fail_detach: +@@ -249,3 +250,4 @@ fail_detach: dma_buf_detach(dma_buf, attach); return ERR_PTR(ret); } diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch index 068a8a1da349..6ae65a996a80 100644 --- a/patches/network/0001-netdev_ops.patch +++ b/patches/network/0001-netdev_ops.patch @@ -49,7 +49,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 if (unlikely(retval < 0)) { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1409,7 +1409,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1417,7 +1417,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch index 007a59d92427..45bfe0a04d9a 100644 --- a/patches/network/11-dev-pm-ops.patch +++ b/patches/network/11-dev-pm-ops.patch @@ -109,7 +109,7 @@ calls on compat code with only slight modifications. module_pci_driver(ath5k_pci_driver); --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -345,14 +345,10 @@ static int ath_pci_resume(struct device +@@ -336,14 +336,10 @@ static int ath_pci_resume(struct device return 0; } @@ -128,7 +128,7 @@ calls on compat code with only slight modifications. #define ATH9K_PM_OPS (&ath9k_pm_ops) -@@ -370,7 +366,12 @@ static struct pci_driver ath_pci_driver +@@ -361,7 +357,12 @@ static struct pci_driver ath_pci_driver .id_table = ath_pci_id_table, .probe = ath_pci_probe, .remove = ath_pci_remove, @@ -193,7 +193,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h -@@ -1845,7 +1845,14 @@ __le32 il_add_beacon_time(struct il_priv +@@ -1843,7 +1843,14 @@ __le32 il_add_beacon_time(struct il_priv u32 beacon_interval); #ifdef CONFIG_PM diff --git a/patches/network/14-device-type.patch b/patches/network/14-device-type.patch index d7e8220c531f..7c0c097f5582 100644 --- a/patches/network/14-device-type.patch +++ b/patches/network/14-device-type.patch @@ -36,7 +36,7 @@ compile warning. { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1326,13 +1326,17 @@ static const struct net_device_ops usbne +@@ -1334,13 +1334,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt diff --git a/patches/network/29-sdio_no_suspend.patch b/patches/network/29-sdio_no_suspend.patch index 5474f9dd61c2..247cd1b6905f 100644 --- a/patches/network/29-sdio_no_suspend.patch +++ b/patches/network/29-sdio_no_suspend.patch @@ -171,7 +171,7 @@ suspend and resume that are not backported. }, --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c -@@ -1045,6 +1045,7 @@ static void btmrvl_sdio_remove(struct sd +@@ -1044,6 +1044,7 @@ static void btmrvl_sdio_remove(struct sd } } @@ -179,7 +179,7 @@ suspend and resume that are not backported. static int btmrvl_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1140,6 +1141,7 @@ static const struct dev_pm_ops btmrvl_sd +@@ -1139,6 +1140,7 @@ static const struct dev_pm_ops btmrvl_sd .suspend = btmrvl_sdio_suspend, .resume = btmrvl_sdio_resume, }; @@ -187,7 +187,7 @@ suspend and resume that are not backported. static struct sdio_driver bt_mrvl_sdio = { .name = "btmrvl_sdio", -@@ -1148,7 +1150,9 @@ static struct sdio_driver bt_mrvl_sdio = +@@ -1147,7 +1149,9 @@ static struct sdio_driver bt_mrvl_sdio = .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE, -- 2.30.2