Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / drivers / mca / mca-driver.c

diff --git a/drivers/mca/mca-driver.c b/drivers/mca/mca-driver.c
index 2223466..32cd39b 100644 (file)
--- a/drivers/mca/mca-driver.c
+++ b/drivers/mca/mca-driver.c
@@ -36,12 +36,25 @@ int mca_register_driver(struct mca_driver *mca_drv)
                mca_drv->driver.bus = &mca_bus_type;
                if ((r = driver_register(&mca_drv->driver)) < 0)
                        return r;
+               mca_drv->integrated_id = 0;
        }
 
        return 0;
 }
 EXPORT_SYMBOL(mca_register_driver);
 
+int mca_register_driver_integrated(struct mca_driver *mca_driver,
+                                  int integrated_id)
+{
+       int r = mca_register_driver(mca_driver);
+
+       if (!r)
+               mca_driver->integrated_id = integrated_id;
+
+       return r;
+}
+EXPORT_SYMBOL(mca_register_driver_integrated);
+
 void mca_unregister_driver(struct mca_driver *mca_drv)
 {
        if (MCA_bus)