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
i2c-ibm_iic: Remove deprecated OCP style part
[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
..
f9972f9
100644
(file)
--- a/
drivers/i2c/busses/i2c-hydra.c
+++ b/
drivers/i2c/busses/i2c-hydra.c
@@
-7,7
+7,7
@@
Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org>
Based on i2c Support for Via Technologies 82C586B South Bridge
Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org>
Based on i2c Support for Via Technologies 82C586B South Bridge
- Copyright (c) 1998, 1999 Ky
östi Mä
lkki <kmalkki@cc.hut.fi>
+ Copyright (c) 1998, 1999 Ky
östi Mä
lkki <kmalkki@cc.hut.fi>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-99,7
+99,6
@@
static struct i2c_algo_bit_data hydra_bit_data = {
.getsda = hydra_bit_getsda,
.getscl = hydra_bit_getscl,
.udelay = 5,
.getsda = hydra_bit_getsda,
.getscl = hydra_bit_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = HZ
};
.timeout = HZ
};
@@
-147,7
+146,7
@@
static int __devinit hydra_probe(struct pci_dev *dev,
static void __devexit hydra_remove(struct pci_dev *dev)
{
pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
static void __devexit hydra_remove(struct pci_dev *dev)
{
pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
- i2c_
bit_del_bus
(&hydra_adap);
+ i2c_
del_adapter
(&hydra_adap);
iounmap(hydra_bit_data.data);
release_mem_region(pci_resource_start(dev, 0)+
offsetof(struct Hydra, CachePD), 4);
iounmap(hydra_bit_data.data);
release_mem_region(pci_resource_start(dev, 0)+
offsetof(struct Hydra, CachePD), 4);
@@
-155,7
+154,6
@@
static void __devexit hydra_remove(struct pci_dev *dev)
static struct pci_driver hydra_driver = {
static struct pci_driver hydra_driver = {
- .owner = THIS_MODULE,
.name = "hydra_smbus",
.id_table = hydra_ids,
.probe = hydra_probe,
.name = "hydra_smbus",
.id_table = hydra_ids,
.probe = hydra_probe,