diff --git a/[refs] b/[refs] index e208fe0f0b84..312cabbbf7c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44ed8950f8529ad58becc2de2f14a49ad32393ad +refs/heads/master: 437258432a322e12a80fae57237aa9b87b0b9e60 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx.h b/trunk/drivers/media/video/cx231xx/cx231xx.h index 9c98886ffb46..d067df9b81e7 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx.h +++ b/trunk/drivers/media/video/cx231xx/cx231xx.h @@ -35,10 +35,7 @@ #include #include #include -#if defined(CONFIG_VIDEO_CX231XX_DVB) || \ - defined(CONFIG_VIDEO_CX231XX_DVB_MODULE) #include -#endif #include "cx231xx-reg.h" #include "cx231xx-pcb-cfg.h"