compat-drivers: refresh patches for next-20121218

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
index 9fb1d69d158d0c072ee4878e95ad886efbb7ee1a..ba3063277e31b3fc41da1ca21efc09b67e1b8705 100644 (file)
--- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch
+++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
@@ -120,7 +120,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
-@@ -355,8 +355,10 @@ static const struct file_operations rade
+@@ -357,8 +357,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 |
@@ -133,7 +133,7 @@ not < 3.3.0.
        .dev_priv_size = 0,
        .load = radeon_driver_load_kms,
        .firstopen = radeon_driver_firstopen_kms,
-@@ -391,10 +393,12 @@ static struct drm_driver kms_driver = {
+@@ -393,10 +395,12 @@ static struct drm_driver kms_driver = {
        .dumb_destroy = radeon_mode_dumb_destroy,
        .fops = &radeon_driver_kms_fops,
  
@@ -286,7 +286,7 @@ not < 3.3.0.
  
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -1018,7 +1018,11 @@ static struct drm_driver driver = {
+@@ -1017,7 +1017,11 @@ static struct drm_driver driver = {
         */
        .driver_features =
            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
@@ -298,7 +298,7 @@ not < 3.3.0.
        .load = i915_driver_load,
        .unload = i915_driver_unload,
        .open = i915_driver_open,
-@@ -1041,10 +1045,12 @@ static struct drm_driver driver = {
+@@ -1040,10 +1044,12 @@ static struct drm_driver driver = {
        .gem_free_object = i915_gem_free_object,
        .gem_vm_ops = &i915_gem_vm_ops,
  
@@ -323,7 +323,7 @@ not < 3.3.0.
  
  static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
  static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3773,8 +3775,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3793,8 +3795,10 @@ void i915_gem_free_object(struct drm_gem
  
        BUG_ON(obj->pages);
  

diff --git a/patches/collateral-evolutions/drm/06-rename-config-options.patch b/patches/collateral-evolutions/drm/06-rename-config-options.patch
index b267e3f8c4e7bbf534e8807aa4e82603df51637f..5e96a8864f670ea39ecd311a6989ebf574a0f6fa 100644 (file)
--- a/patches/collateral-evolutions/drm/06-rename-config-options.patch
+++ b/patches/collateral-evolutions/drm/06-rename-config-options.patch
@@ -174,7 +174,7 @@
  CFLAGS_radeon_trace_points.o := -I$(src)
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -227,7 +227,7 @@ static struct pci_device_id pciidlist[]
+@@ -229,7 +229,7 @@ static struct pci_device_id pciidlist[]
        radeon_PCI_IDS
  };
  
@@ -183,7 +183,7 @@
  MODULE_DEVICE_TABLE(pci, pciidlist);
  #endif
  
-@@ -441,7 +441,7 @@ static int __init radeon_init(void)
+@@ -443,7 +443,7 @@ static int __init radeon_init(void)
  #endif
        /* if enabled by default */
        if (radeon_modeset == -1) {

diff --git a/patches/collateral-evolutions/drm/07-intel-gtt.patch b/patches/collateral-evolutions/drm/07-intel-gtt.patch
index 5d4b327035c8fbfe4e8f22c11be0e16fe4f67c89..cc1eb74ae1b8f5e05f3586f3697993bde696f573 100644 (file)
--- a/patches/collateral-evolutions/drm/07-intel-gtt.patch
+++ b/patches/collateral-evolutions/drm/07-intel-gtt.patch
@@ -24,7 +24,7 @@ Date:   Thu Jun 7 15:56:03 2012 +0200
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3906,9 +3906,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3926,9 +3926,14 @@ i915_gem_init_hw(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
  

diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
index b90ff03acbac9da13b03f9067bf24226df312c6d..a335ce99b70b3621a0f38461945a5f8d17477d25 100644 (file)
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
@@ -60,7 +60,7 @@
  module_usb_driver(btusb_driver);
 --- a/drivers/net/usb/cdc_ether.c
 +++ b/drivers/net/usb/cdc_ether.c
-@@ -716,7 +716,9 @@ static struct usb_driver cdc_driver = {
+@@ -719,7 +719,9 @@ static struct usb_driver cdc_driver = {
        .resume =       usbnet_resume,
        .reset_resume = usbnet_resume,
        .supports_autosuspend = 1,