diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 12:57:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 12:57:55 -0500 |
commit | 659dba34807692a6ebd55e7859dff2c7cb1b005d (patch) | |
tree | cbc8454fa57af5d3e5d37a3dbbca2c7da92c6ef0 /drivers/i2c/busses/i2c-savage4.c | |
parent | 3640543df26fd38f31f0c6decc35c07be2a6307c (diff) | |
parent | d7aef138f3c08c5bbab567bc9a84e43a88f50395 (diff) |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Fix OMAP clock prescaler to match the comment
i2c: Refactor a kfree in i2c-dev
i2c: Fix return value check in i2c-dev
i2c: Enable PEC on more i2c-i801 devices
i2c: Discard the i2c algo del_bus wrappers
i2c: New ARM Versatile/Realview bus driver
i2c: fix broken ds1337 initialization
i2c: i2c-i801 documentation update
i2c: Use the __ATTR macro where possible
i2c: Whitespace cleanups
i2c: Use put_user instead of copy_to_user where possible
i2c: New Atmel AT91 bus driver
i2c: Add support for nested i2c bus locking
i2c: Cleanups to the i2c-nforce2 bus driver
i2c: Add request/release_mem_region to i2c-ibm_iic bus driver
i2c: New Philips PNX bus driver
i2c: Delete the broken i2c-ite bus driver
i2c: Update the list of driver IDs
i2c: Fix documentation typos
Diffstat (limited to 'drivers/i2c/busses/i2c-savage4.c')
-rw-r--r-- | drivers/i2c/busses/i2c-savage4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c index 209f47ea1750..844b4ff90893 100644 --- a/drivers/i2c/busses/i2c-savage4.c +++ b/drivers/i2c/busses/i2c-savage4.c | |||
@@ -173,7 +173,7 @@ static int __devinit savage4_probe(struct pci_dev *dev, const struct pci_device_ | |||
173 | 173 | ||
174 | static void __devexit savage4_remove(struct pci_dev *dev) | 174 | static void __devexit savage4_remove(struct pci_dev *dev) |
175 | { | 175 | { |
176 | i2c_bit_del_bus(&savage4_i2c_adapter); | 176 | i2c_del_adapter(&savage4_i2c_adapter); |
177 | iounmap(ioaddr); | 177 | iounmap(ioaddr); |
178 | } | 178 | } |
179 | 179 | ||