git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-hydra.c
diff --git
a/drivers/i2c/busses/i2c-hydra.c
b/drivers/i2c/busses/i2c-hydra.c
index
275da79
..
e0cb3b0
100644
(file)
--- a/
drivers/i2c/busses/i2c-hydra.c
+++ b/
drivers/i2c/busses/i2c-hydra.c
@@
-111,15
+111,12
@@
static struct i2c_adapter hydra_adap = {
};
static struct pci_device_id hydra_ids[] = {
};
static struct pci_device_id hydra_ids[] = {
- {
- .vendor = PCI_VENDOR_ID_APPLE,
- .device = PCI_DEVICE_ID_APPLE_HYDRA,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, hydra_ids);
+
static int __devinit hydra_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
static int __devinit hydra_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
@@
-166,7
+163,7
@@
static struct pci_driver hydra_driver = {
static int __init i2c_hydra_init(void)
{
static int __init i2c_hydra_init(void)
{
- return pci_
module_init
(&hydra_driver);
+ return pci_
register_driver
(&hydra_driver);
}
}