compat-drivers: refresh patches for next-20121129
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>
Thu, 29 Nov 2012 21:34:19 +0000 (13:34 -0800)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Thu, 29 Nov 2012 21:34:19 +0000 (13:34 -0800)
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
patches/drm/99-change-makefile.patch
patches/network/30-bridge-port.patch

index 28f911c63cb34b2d2b17bfbce6b9cc0f253d2c88..ae4280e6aff44415e3f64cddd59e4d1b52fd48ff 100644 (file)
@@ -2,7 +2,7 @@ Remove drivers that we do not want to build from gpu/drm/Makefile
 
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -30,23 +30,14 @@ CFLAGS_drm_trace_points.o := -I$(src)
+@@ -31,23 +31,14 @@ CFLAGS_drm_trace_points.o := -I$(src)
  obj-$(CONFIG_COMPAT_DRM)      += drm.o
  obj-$(CONFIG_COMPAT_DRM_USB)   += drm_usb.o
  obj-$(CONFIG_COMPAT_DRM_TTM)  += ttm/
index b4106b77ceb13f6c32ddb1ee52363d0b373e3763..a426274e6c84b63d4ff9ddb8b3ef1fd2a7e5ab91 100644 (file)
@@ -23,7 +23,7 @@ compat-drivers.
 
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -812,7 +812,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
                return -EOPNOTSUPP;
  
        /* if it's part of a bridge, reject changing type to station/ibss */