Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

[deliverable/linux.git] / drivers / bcma / driver_chipcommon.c

diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index 47cce9d696306f28f8f6d9221e73b0f863df7f7e..a4c3ebcc4c8609de39d7331d23b24bd830ac77cf 100644 (file)
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -9,6 +9,7 @@
  */
 
 #include "bcma_private.h"
+#include <linux/export.h>
 #include <linux/bcma/bcma.h>
 
 static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
@@ -43,7 +44,7 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
        if (cc->capabilities & BCMA_CC_CAP_PMU)
                bcma_pmu_init(cc);
        if (cc->capabilities & BCMA_CC_CAP_PCTL)
-               pr_err("Power control not implemented!\n");
+               bcma_err(cc->core->bus, "Power control not implemented!\n");
 
        if (cc->core->id.rev >= 16) {
                if (cc->core->bus->sprom.leddc_on_time &&
@@ -136,8 +137,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
                                       | BCMA_CC_CORECTL_UARTCLKEN);
                }
        } else {
-               pr_err("serial not supported on this device ccrev: 0x%x\n",
-                      ccrev);
+               bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);
                return;
        }