git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dvb-usb
/
dibusb-common.c
diff --git
a/drivers/media/dvb/dvb-usb/dibusb-common.c
b/drivers/media/dvb/dvb-usb/dibusb-common.c
index
c3a6395
..
00b9464
100644
(file)
--- a/
drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/
drivers/media/dvb/dvb-usb/dibusb-common.c
@@
-156,7
+156,6
@@
static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
}
struct i2c_algorithm dibusb_i2c_algo = {
- .id = I2C_ALGO_BIT,
.master_xfer = dibusb_i2c_xfer,
.functionality = dibusb_i2c_func,
};