summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttvp.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttvp.h')
-rw-r--r--linux/drivers/media/video/bttvp.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h
index befe6834d..d2057a58d 100644
--- a/linux/drivers/media/video/bttvp.h
+++ b/linux/drivers/media/video/bttvp.h
@@ -1,5 +1,5 @@
/*
- $Id: bttvp.h,v 1.22 2005/09/28 19:07:59 nsh Exp $
+ $Id: bttvp.h,v 1.23 2005/10/09 18:07:06 mchehab Exp $
bttv - Bt848 frame grabber driver
@@ -41,20 +41,17 @@
#include <asm/io.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "video-buf.h"
-#include "audiochip.h"
-#include "tuner.h"
-#include "i2c-compat.h"
-#include "ir-common.h"
+#include <media/i2c-compat.h>
#define strlcpy(dest,src,len) strncpy(dest,src,(len)-1)
#else
#include <linux/device.h>
+#endif
#include <media/video-buf.h>
#include <media/audiochip.h>
#include <media/tuner.h>
#include <media/tveeprom.h>
#include <media/ir-common.h>
-#endif
+
#include "compat.h"
#include "bt848.h"