From 56dee54783bcafee32bb681a221d4c9a2b517ca3 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 2 Jul 2007 15:39:57 -0300
Subject: Fix v4l-dvb backward compatibility

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Due to several internal API changes on kernel, kernel backward
compatibility were lost. Basically, compat.h should be the last include
for it to work properly.

This patch basically reorders kernel headers to allow backward compat to
work fine.

Also:

Some includes were added after some non-include macros, on old drivers.
Better to keep all includes at the beginning of the files.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 linux/drivers/media/radio/dsbr100.c         | 2 +-
 linux/drivers/media/radio/radio-maestro.c   | 2 +-
 linux/drivers/media/radio/radio-maxiradio.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'linux/drivers/media/radio')

diff --git a/linux/drivers/media/radio/dsbr100.c b/linux/drivers/media/radio/dsbr100.c
index 95f1f4051..7f9ceb3cf 100644
--- a/linux/drivers/media/radio/dsbr100.c
+++ b/linux/drivers/media/radio/dsbr100.c
@@ -80,10 +80,10 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/input.h>
-#include "compat.h"
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <linux/usb.h>
+#include "compat.h"
 
 /*
  * Version Information
diff --git a/linux/drivers/media/radio/radio-maestro.c b/linux/drivers/media/radio/radio-maestro.c
index 5867ccd9d..158819686 100644
--- a/linux/drivers/media/radio/radio-maestro.c
+++ b/linux/drivers/media/radio/radio-maestro.c
@@ -24,10 +24,10 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include "compat.h"
 #include <linux/pci.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include "compat.h"
 
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,6)
diff --git a/linux/drivers/media/radio/radio-maxiradio.c b/linux/drivers/media/radio/radio-maxiradio.c
index 4755f8fe2..5cebaea53 100644
--- a/linux/drivers/media/radio/radio-maxiradio.c
+++ b/linux/drivers/media/radio/radio-maxiradio.c
@@ -39,7 +39,6 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include "compat.h"
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
 #endif
@@ -47,6 +46,7 @@
 #include <linux/pci.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include "compat.h"
 
 #define DRIVER_VERSION	"0.77"
 
-- 
cgit v1.2.3