diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-30 23:54:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-30 23:54:59 +0100 |
| commit | 839d8810747bbf39e0a5a7f223b67bffa7945f8d (patch) | |
| tree | c16583342b871107f6805c21da4b1a96cfaa7aac /drivers/i2c/busses/scx200_acb.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
| parent | i2c: Functions for byte-swapped smbus_write/read_word_data (diff) | |
| download | linux-839d8810747bbf39e0a5a7f223b67bffa7945f8d.tar.xz linux-839d8810747bbf39e0a5a7f223b67bffa7945f8d.zip | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Functions for byte-swapped smbus_write/read_word_data
i2c-algo-pca: Return standard fault codes
i2c-algo-bit: Return standard fault codes
i2c-algo-bit: Be verbose on bus testing failure
i2c-algo-bit: Let user test buses without failing
i2c/scx200_acb: Fix section mismatch warning in scx200_pci_drv
i2c: I2C_ELEKTOR should depend on HAS_IOPORT
Diffstat (limited to 'drivers/i2c/busses/scx200_acb.c')
| -rw-r--r-- | drivers/i2c/busses/scx200_acb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index 986e5f62debe..91e349c884c5 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c @@ -550,7 +550,7 @@ static int __devexit scx200_remove(struct platform_device *pdev) return 0; } -static struct platform_driver scx200_pci_drv = { +static struct platform_driver scx200_pci_driver = { .driver = { .name = "cs5535-smb", .owner = THIS_MODULE, @@ -593,14 +593,14 @@ static int __init scx200_acb_init(void) return 0; /* No ISA devices; register the platform driver for PCI-based devices */ - return platform_driver_register(&scx200_pci_drv); + return platform_driver_register(&scx200_pci_driver); } static void __exit scx200_acb_cleanup(void) { struct scx200_acb_iface *iface; - platform_driver_unregister(&scx200_pci_drv); + platform_driver_unregister(&scx200_pci_driver); mutex_lock(&scx200_acb_list_mutex); while ((iface = scx200_acb_list) != NULL) { |