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-sis96x.c
diff --git
a/drivers/i2c/busses/i2c-sis96x.c
b/drivers/i2c/busses/i2c-sis96x.c
index
d605dee
..
3cac6d4
100644
(file)
--- a/
drivers/i2c/busses/i2c-sis96x.c
+++ b/
drivers/i2c/busses/i2c-sis96x.c
@@
-51,9
+51,6
@@
*/
#define SIS96x_VERSION "1.0.0"
*/
#define SIS96x_VERSION "1.0.0"
-/* SiS96x SMBus PCI device ID */
-#define PCI_DEVICE_ID_SI_SMBUS 0x16
-
/* base address register in PCI config space */
#define SIS96x_BAR 0x04
/* base address register in PCI config space */
#define SIS96x_BAR 0x04
@@
-267,17
+264,12
@@
static struct i2c_adapter sis96x_adapter = {
};
static struct pci_device_id sis96x_ids[] = {
};
static struct pci_device_id sis96x_ids[] = {
-
- {
- .vendor = PCI_VENDOR_ID_SI,
- .device = PCI_DEVICE_ID_SI_SMBUS,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
-
+ { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, sis96x_ids);
+
static int __devinit sis96x_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
static int __devinit sis96x_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
@@
-348,7
+340,7
@@
static struct pci_driver sis96x_driver = {
static int __init i2c_sis96x_init(void)
{
printk(KERN_INFO "i2c-sis96x version %s\n", SIS96x_VERSION);
static int __init i2c_sis96x_init(void)
{
printk(KERN_INFO "i2c-sis96x version %s\n", SIS96x_VERSION);
- return pci_
module_init
(&sis96x_driver);
+ return pci_
register_driver
(&sis96x_driver);
}
static void __exit i2c_sis96x_exit(void)
}
static void __exit i2c_sis96x_exit(void)