Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB (10191a): Update MAINTAINERS entries on media drivers
  V4L/DVB (10190): cx88: Fix some Kbuild troubles
  V4L/DVB (10189): dm1105: Fix build with INPUT=m and DVB_DM1105=y
  V4L/DVB (10185): Use negated usb_endpoint_xfer_control, etc
  V4L/DVB (10182): tda8290: fix TDA8290 + TDA18271 initialization
  V4L/DVB (10181): v4l2-device: Fix some sparse warnings
  V4L/DVB (10180): drivers/media: Fix a number of sparse warnings
  V4L/DVB (10179): tda8290: Fix two sparse warnings
  V4L/DVB (10178): dvb_frontend: Fix some sparse warnings due to static symbols
  V4L/DVB (10177): Fix sparse warnings on em28xx
  V4L/DVB (10176b): pxa-camera: fix redefinition warnings and missing DMA definitions
  V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage

diff --combined drivers/media/dvb/ttpci/budget-ci.c
index 4d2a5cf27c31ff393ab570c7d59c88568f0b0697,16ef35afd33abc6cc45e11d568b94d97de2b0ff6..bcbc5d41a0feb0d8a907672786dc043cad5c9320
--- 1/drivers/media/dvb/ttpci/budget-ci.c
--- 2/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@@ -1337,7 -1337,7 +1337,7 @@@ static struct stb0899_config tt3200_con
        .tuner_set_rfsiggain    = NULL
  };
  
- struct stb6100_config tt3200_stb6100_config = {
+ static struct stb6100_config tt3200_stb6100_config = {
        .tuner_address  = 0x60,
        .refclock       = 27000000,
  };
@@@ -1450,7 -1450,7 +1450,7 @@@ static void frontend_init(struct budget
                if (budget_ci->budget.dvb_frontend) {
                        if (dvb_attach(stb6100_attach, budget_ci->budget.dvb_frontend, &tt3200_stb6100_config, &budget_ci->budget.i2c_adap)) {
                                if (!dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, 0, 0)) {
 -                                      printk("%s: No LNBP21 found!\n", __FUNCTION__);
 +                                      printk("%s: No LNBP21 found!\n", __func__);
                                        dvb_frontend_detach(budget_ci->budget.dvb_frontend);
                                        budget_ci->budget.dvb_frontend = NULL;
                                }