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 master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-hydra.c
diff --git
a/drivers/i2c/busses/i2c-hydra.c
b/drivers/i2c/busses/i2c-hydra.c
index
1b5354e
..
457d48a
100644
(file)
--- a/
drivers/i2c/busses/i2c-hydra.c
+++ b/
drivers/i2c/busses/i2c-hydra.c
@@
-99,7
+99,6
@@
static struct i2c_algo_bit_data hydra_bit_data = {
.getsda = hydra_bit_getsda,
.getscl = hydra_bit_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = HZ
};
@@
-155,7
+154,6
@@
static void __devexit hydra_remove(struct pci_dev *dev)
static struct pci_driver hydra_driver = {
- .owner = THIS_MODULE,
.name = "hydra_smbus",
.id_table = hydra_ids,
.probe = hydra_probe,