Patched in Tegra support.

1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index 3d4985695ae..b73da6cd6f9 100644
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -3,7 +3,6 @@
  * It does not support slave mode, the register slightly moved. This PCI
  * device provides three bars, every contains a single I2C controller.
  */
-#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/pxa-i2c.h>
@@ -94,7 +93,7 @@ out:
         return ERR_PTR(ret);
 }
 
-static int ce4100_i2c_probe(struct pci_dev *dev,
+static int __devinit ce4100_i2c_probe(struct pci_dev *dev,
                 const struct pci_device_id *ent)
 {
         int ret;
@@ -135,7 +134,7 @@ err_mem:
         return ret;
 }
 
-static void ce4100_i2c_remove(struct pci_dev *dev)
+static void __devexit ce4100_i2c_remove(struct pci_dev *dev)
 {
         struct ce4100_devices *sds;
         unsigned int i;
@@ -150,7 +149,7 @@ static void ce4100_i2c_remove(struct pci_dev *dev)
         kfree(sds);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ce4100_i2c_devices) = {
+static struct pci_device_id ce4100_i2c_devices[] __devinitdata = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)},
         { },
 };
@@ -160,10 +159,20 @@ static struct pci_driver ce4100_i2c_driver = {
         .name           = "ce4100_i2c",
         .id_table       = ce4100_i2c_devices,
         .probe          = ce4100_i2c_probe,
-        .remove         = ce4100_i2c_remove,
+        .remove         = __devexit_p(ce4100_i2c_remove),
 };
 
-module_pci_driver(ce4100_i2c_driver);
+static int __init ce4100_i2c_init(void)
+{
+        return pci_register_driver(&ce4100_i2c_driver);
+}
+module_init(ce4100_i2c_init);
+
+static void __exit ce4100_i2c_exit(void)
+{
+        pci_unregister_driver(&ce4100_i2c_driver);
+}
+module_exit(ce4100_i2c_exit);
 
 MODULE_DESCRIPTION("CE4100 PCI-I2C glue code for PXA's driver");
 MODULE_LICENSE("GPL v2");