git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
media
/
video
/
bt8xx
/
bt832.c
diff --git
a/drivers/media/video/bt832.c
b/drivers/media/video/bt8xx/bt832.c
similarity index 98%
rename from
drivers/media/video/bt832.c
rename to
drivers/media/video/bt8xx/bt832.c
index
cc54b62
..
a518761
100644
(file)
--- a/
drivers/media/video/bt832.c
+++ b/
drivers/media/video/bt8xx/bt832.c
@@
-30,7
+30,6
@@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
-#include <media/audiochip.h>
#include <media/v4l2-common.h>
#include "bttv.h"
#include <media/v4l2-common.h>
#include "bttv.h"
@@
-39,7
+38,7
@@
MODULE_LICENSE("GPL");
/* Addresses to scan */
MODULE_LICENSE("GPL");
/* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_
BT832_ALT1>>1, I2C
_BT832_ALT2>>1,
+static unsigned short normal_i2c[] = { I2C_
ADDR_BT832_ALT1>>1, I2C_ADDR
_BT832_ALT2>>1,
I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
I2C_CLIENT_END };
I2C_CLIENT_INSMOD;