diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 22:02:32 -0800 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 22:02:32 -0800 |
| commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
| tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/i2c/busses/i2c-nforce2.c | |
| parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
| parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) | |
| download | linux-ac98695d6c1508b724f246f38ce57fb4e3cec356.tar.bz2 | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/i2c/busses/i2c-nforce2.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-nforce2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index ad37c10e7fec..653555184a64 100644 --- a/drivers/i2c/busses/i2c-nforce2.c +++ b/drivers/i2c/busses/i2c-nforce2.c @@ -57,7 +57,6 @@ MODULE_DESCRIPTION("nForce2/3/4/5xx SMBus driver"); struct nforce2_smbus { - struct pci_dev *dev; struct i2c_adapter adapter; int base; int size; @@ -230,7 +229,6 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar, smbus->base = iobase & PCI_BASE_ADDRESS_IO_MASK; smbus->size = 64; } - smbus->dev = dev; if (!request_region(smbus->base, smbus->size, nforce2_driver.name)) { dev_err(&smbus->adapter.dev, "Error requesting region %02x .. %02X for %s\n", @@ -238,6 +236,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar, return -1; } smbus->adapter.owner = THIS_MODULE; + smbus->adapter.id = I2C_HW_SMBUS_NFORCE2; smbus->adapter.class = I2C_CLASS_HWMON; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus; |