projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
[powerpc.git]
/
drivers
/
media
/
video
/
tda7432.c
diff --git
a/drivers/media/video/tda7432.c
b/drivers/media/video/tda7432.c
index
fc3d582
..
78e043a
100644
(file)
--- a/
drivers/media/video/tda7432.c
+++ b/
drivers/media/video/tda7432.c
@@
-48,9
+48,8
@@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include "bttv.h"
-#include <media/audiochip.h>
#include <media/v4l2-common.h>
#include <media/v4l2-common.h>
+#include <media/i2c-addr.h>
#ifndef VIDEO_AUDIO_BALANCE
# define VIDEO_AUDIO_BALANCE 32
#ifndef VIDEO_AUDIO_BALANCE
# define VIDEO_AUDIO_BALANCE 32
@@
-71,7
+70,7
@@
module_param(maxvol, int, S_IRUGO | S_IWUSR);
/* Address to scan (I2C address of this chip) */
static unsigned short normal_i2c[] = {
/* Address to scan (I2C address of this chip) */
static unsigned short normal_i2c[] = {
- I2C_TDA7432 >> 1,
+ I2C_
ADDR_
TDA7432 >> 1,
I2C_CLIENT_END,
};
I2C_CLIENT_INSMOD;
I2C_CLIENT_END,
};
I2C_CLIENT_INSMOD;