From e1399ab6e7a98aafcabc260a30cccf1fa59666dd Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Mon, 28 Apr 2003 17:53:36 +0000 Subject: Compile fixes against 2.5.68. - add some ifdef magic into i2c drivers (mxb/analog drivers only) - shuffle around includes, so that "dvb_compat.h" is included after all other include files - fix a warning in saa7146 i2c code --- linux/drivers/media/dvb/frontends/cx24110.c | 2 +- linux/drivers/media/dvb/ttpci/budget-av.c | 5 +++-- linux/drivers/media/dvb/ttpci/budget.c | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'linux/drivers/media/dvb') diff --git a/linux/drivers/media/dvb/frontends/cx24110.c b/linux/drivers/media/dvb/frontends/cx24110.c index 534371c54..5bcb420b3 100644 --- a/linux/drivers/media/dvb/frontends/cx24110.c +++ b/linux/drivers/media/dvb/frontends/cx24110.c @@ -38,8 +38,8 @@ #include #include -#include "dvb_compat.h" #include "dvb_frontend.h" +#include "dvb_compat.h" static int debug = 0; #define dprintk if (debug) printk diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c index 130b5fb9b..6ab987f8e 100644 --- a/linux/drivers/media/dvb/ttpci/budget-av.c +++ b/linux/drivers/media/dvb/ttpci/budget-av.c @@ -30,10 +30,11 @@ * the project's page is at http://www.linuxtv.org/dvb/ */ -#include "dvb_compat.h" -#include "budget.h" #include +#include "budget.h" +#include "dvb_compat.h" + struct budget_av { struct budget budget; struct video_device vd; diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c index de6dabc98..6291a71c8 100644 --- a/linux/drivers/media/dvb/ttpci/budget.c +++ b/linux/drivers/media/dvb/ttpci/budget.c @@ -29,10 +29,8 @@ * the project's page is at http://www.linuxtv.org/dvb/ */ -#include "dvb_compat.h" #include "budget.h" - - +#include "dvb_compat.h" static void Set22K (struct budget *budget, int state) -- cgit v1.2.3