diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
| commit | fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch) | |
| tree | cba2597077cf33d122f8d771bf84618cc5374cf6 /drivers/i2c/busses/i2c-via.c | |
| parent | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
| download | kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.zip kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.gz kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.bz2 | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/i2c/busses/i2c-via.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-via.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c index 040b8ab..544a38e 100644 --- a/drivers/i2c/busses/i2c-via.c +++ b/drivers/i2c/busses/i2c-via.c @@ -43,9 +43,9 @@ /* io-region reservation */ #define IOSPACE 0x06 -#define IOTEXT "via-i2c" -static u16 pm_io_base = 0; +static struct pci_driver vt586b_driver; +static u16 pm_io_base; /* It does not appear from the datasheet that the GPIO pins are @@ -130,7 +130,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i pci_read_config_word(dev, base, &pm_io_base); pm_io_base &= (0xff << 8); - if (!request_region(I2C_DIR, IOSPACE, IOTEXT)) { + if (!request_region(I2C_DIR, IOSPACE, vt586b_driver.name)) { dev_err(&dev->dev, "IO 0x%x-0x%x already in use\n", I2C_DIR, I2C_DIR + IOSPACE); return -ENODEV; } @@ -159,6 +159,7 @@ static void __devexit vt586b_remove(struct pci_dev *dev) static struct pci_driver vt586b_driver = { + .owner = THIS_MODULE, .name = "vt586b_smbus", .id_table = vt586b_ids, .probe = vt586b_probe, |