Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
--- 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/
--- 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 */