Commit e0ec29b7 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds

[PATCH] v4l: 885: second round of i2c ids redefinition cleanup

- Second round of i2c IDs redefinition cleanup.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 710a7258
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/id.h>
#include "bttv.h" #include "bttv.h"
#include "bt832.h" #include "bt832.h"
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/id.h>
#include "msp3400.h" #include "msp3400.h"
#define OPMODE_AUTO -1 #define OPMODE_AUTO -1
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <media/id.h>
#include "rds.h" #include "rds.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <media/id.h>
#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 #define MPEG_VIDEO_TARGET_BITRATE_MAX 27000
#define MPEG_VIDEO_MAX_BITRATE_MAX 27000 #define MPEG_VIDEO_MAX_BITRATE_MAX 27000
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <media/tuner.h> #include <media/tuner.h>
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/id.h>
#include <media/ir-common.h> #include <media/ir-common.h>
#include <media/ir-kbd-i2c.h> #include <media/ir-kbd-i2c.h>
#include <media/video-buf.h> #include <media/video-buf.h>
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include "bttv.h" #include "bttv.h"
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/id.h>
#ifndef VIDEO_AUDIO_BALANCE #ifndef VIDEO_AUDIO_BALANCE
# define VIDEO_AUDIO_BALANCE 32 # define VIDEO_AUDIO_BALANCE 32
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "bttv.h" #include "bttv.h"
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/id.h>
static int debug; /* insmod parameter */ static int debug; /* insmod parameter */
module_param(debug, int, S_IRUGO | S_IWUSR); module_param(debug, int, S_IRUGO | S_IWUSR);
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/tuner.h> #include <media/tuner.h>
#include <media/id.h>
/* Chips: /* Chips:
TDA9885 (PAL, NTSC) TDA9885 (PAL, NTSC)
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <media/audiochip.h> #include <media/audiochip.h>
#include <media/id.h>
#include "tvaudio.h" #include "tvaudio.h"
...@@ -1438,7 +1437,7 @@ static struct CHIPDESC chiplist[] = { ...@@ -1438,7 +1437,7 @@ static struct CHIPDESC chiplist[] = {
}, },
{ {
.name = "pic16c54 (PV951)", .name = "pic16c54 (PV951)",
.id = I2C_DRIVERID_PIC16C54_PV951, .id = I2C_DRIVERID_PIC16C54_PV9,
.insmodopt = &pic16c54, .insmodopt = &pic16c54,
.addr_lo = I2C_PIC16C54 >> 1, .addr_lo = I2C_PIC16C54 >> 1,
.addr_hi = I2C_PIC16C54>> 1, .addr_hi = I2C_PIC16C54>> 1,
......
...@@ -658,10 +658,6 @@ EXPORT_SYMBOL(tveeprom_read); ...@@ -658,10 +658,6 @@ EXPORT_SYMBOL(tveeprom_read);
/* run, just call the exported tveeprom_* directly, there is no point in */ /* run, just call the exported tveeprom_* directly, there is no point in */
/* using the indirect way via i2c_driver->command() */ /* using the indirect way via i2c_driver->command() */
#ifndef I2C_DRIVERID_TVEEPROM
# define I2C_DRIVERID_TVEEPROM I2C_DRIVERID_EXP2
#endif
static unsigned short normal_i2c[] = { static unsigned short normal_i2c[] = {
0xa0 >> 1, 0xa0 >> 1,
I2C_CLIENT_END, I2C_CLIENT_END,
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
* ---- Driver types ----------------------------------------------------- * ---- Driver types -----------------------------------------------------
* device id name + number function description, i2c address(es) * device id name + number function description, i2c address(es)
* *
* Range 1000-1999 range is defined in sensors/sensors.h * Range 1000-1999 range is defined in sensors/sensors.h
* Range 0x100 - 0x1ff is for V4L2 Common Components * Range 0x100 - 0x1ff is for V4L2 Common Components
* Range 0xf000 - 0xffff is reserved for local experimentation, and should * Range 0xf000 - 0xffff is reserved for local experimentation, and should
* never be used in official drivers * never be used in official drivers
*/ */
#define I2C_DRIVERID_MSP3400 1 #define I2C_DRIVERID_MSP3400 1
...@@ -99,6 +99,9 @@ ...@@ -99,6 +99,9 @@
#define I2C_DRIVERID_MAX6900 63 /* MAX6900 real-time clock */ #define I2C_DRIVERID_MAX6900 63 /* MAX6900 real-time clock */
#define I2C_DRIVERID_SAA7114H 64 /* video decoder */ #define I2C_DRIVERID_SAA7114H 64 /* video decoder */
#define I2C_DRIVERID_DS1374 65 /* DS1374 real time clock */ #define I2C_DRIVERID_DS1374 65 /* DS1374 real time clock */
#define I2C_DRIVERID_TDA9874 66 /* TV sound decoder */
#define I2C_DRIVERID_SAA6752HS 67 /* MPEG2 encoder */
#define I2C_DRIVERID_TVEEPROM 68 /* TV EEPROM */
#define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */
...@@ -111,7 +114,7 @@ ...@@ -111,7 +114,7 @@
#define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */
#define I2C_DRIVERID_ALERT 903 /* SMBus Alert Responder Client */ #define I2C_DRIVERID_ALERT 903 /* SMBus Alert Responder Client */
/* IDs -- Use DRIVERIDs 1000-1999 for sensors. /* IDs -- Use DRIVERIDs 1000-1999 for sensors.
These were originally in sensors.h in the lm_sensors package */ These were originally in sensors.h in the lm_sensors package */
#define I2C_DRIVERID_LM78 1002 #define I2C_DRIVERID_LM78 1002
#define I2C_DRIVERID_LM75 1003 #define I2C_DRIVERID_LM75 1003
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment