summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-08 02:24:55 +0000
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-08 18:16:22 -0700
commit8ddf31ad3b8404e168d446919d9b6c9c162b9f29 (patch)
tree7464cbfc2455110a37d7b590197bdd2f87e1ea43
parent0e57c53b6ada35ff94f982628e91f23c21d62be8 (diff)
backports: disable DVB_RTL2832 and DVB_USB_RTL28XXU
Commit bcf43393 as of linux-next next-20140320 added this Makefile header extension: ccflags-y += -I$(srctree)/drivers/staging/media/rtl2832u_sdr This ends up calling a staging exported symbol rtl2832_sdr_attach(). Let's not pollute driver code with staging code or dependencies. Folks, can this be cleaned up? This sets a precedent for doing more of this, and this can get hairy. Its also not fair for folks who don't want to carry over any staging code. This forces them to, and its not just a header file, its a full exported symbol. What about synchronization with differen trees? Was this addressed with Greg? commit bcf43393579e3d4069e75a9200a87703185bcf11 Author: Antti Palosaari <crope@iki.fi> Date: Tue Sep 10 00:13:57 2013 -0300 [media] rtl28xxu: attach SDR extension module With that extension module it supports SDR. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Cc: Antti Palosaari <crope@iki.fi> Cc: Mauro Carvalho Chehab <m.chehab@samsung.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--dependencies9
1 files changed, 7 insertions, 2 deletions
diff --git a/dependencies b/dependencies
index 6193ed1a..b85268d4 100644
--- a/dependencies
+++ b/dependencies
@@ -185,8 +185,13 @@ VIDEO_RENESAS_VSP1 3.6
# This was added as of 3.7. Although we should be able to only enable
# this for 3.7 DVB_USB_RTL28XXU ends up selecting DVB_RTL2832 and
# that seems to currently require pegging both.
-DVB_RTL2832 3.7
-DVB_USB_RTL28XXU 3.7
+#
+# DVB_USB_RTL28XXU has a nasty ccflag usage thoug that includes staging
+# headers introduced via commit bcf43393:
+# ccflags-y += -I$(srctree)/drivers/staging/media/rtl2832u_sdr
+# Let's not support this nastiness.
+DVB_RTL2832 DISABLE
+DVB_USB_RTL28XXU DISABLE
# struct gpio_chip only got the required members in 2.6.28
BCMA_DRIVER_GPIO 2.6.28