summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 12:47:08 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 12:47:08 -0200
commitb53eb55ff0f73052682018efc8974bcbc7f6aec1 (patch)
treeb7d9428d1526391f5b7a68cb42282a855f12a7c3 /linux/include
parent137bc05fa17aaf28ca2de6ecbf7231920fcc4176 (diff)
downloadmediapointer-dvb-s2-b53eb55ff0f73052682018efc8974bcbc7f6aec1.tar.gz
mediapointer-dvb-s2-b53eb55ff0f73052682018efc8974bcbc7f6aec1.tar.bz2
Updates i2c-id.h and btaudio.c
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: those files are maintained by i2c and alsa guys Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/i2c-id.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h
index 6e7ec4c76..9c21dc793 100644
--- a/linux/include/linux/i2c-id.h
+++ b/linux/include/linux/i2c-id.h
@@ -232,7 +232,6 @@
#define I2C_HW_SMBUS_PIIX4 0x040000
#define I2C_HW_SMBUS_ALI15X3 0x040001
#define I2C_HW_SMBUS_VIA2 0x040002
-#define I2C_HW_SMBUS_VOODOO3 0x040003
#define I2C_HW_SMBUS_I801 0x040004
#define I2C_HW_SMBUS_AMD756 0x040005
#define I2C_HW_SMBUS_SIS5595 0x040006
@@ -248,13 +247,11 @@
#define I2C_HW_SMBUS_OV519 0x040010 /* OV519 USB 1.1 webcam IC */
#define I2C_HW_SMBUS_OVFX2 0x040011 /* Cypress/OmniVision FX2 webcam */
#define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */
+#define I2C_HW_SMBUS_ALI1563 0x040013
/* --- ISA pseudo-adapter */
#define I2C_HW_ISA 0x050000
-/* --- IPMI pseudo-adapter */
-#define I2C_HW_IPMI 0x0b0000
-
/* --- IPMB adapter */
#define I2C_HW_IPMB 0x0c0000