Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 8bfd299bfe77..f5cfdabcb87d 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -783,7 +783,7 @@ static void ecard_proc_init(void)
 
 #define ec_set_resource(ec,nr,st,sz)                            \
         do {                                                    \
-                (ec)->resource[nr].name = ec->dev.bus_id;       \
+                (ec)->resource[nr].name = dev_name(&ec->dev);   \
                 (ec)->resource[nr].start = st;                  \
                 (ec)->resource[nr].end = (st) + (sz) - 1;       \
                 (ec)->resource[nr].flags = IORESOURCE_MEM;      \
@@ -853,8 +853,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
         for (i = 0; i < ECARD_NUM_RESOURCES; i++) {
                 if (ec->resource[i].flags &&
                     request_resource(&iomem_resource, &ec->resource[i])) {
-                        printk(KERN_ERR "%s: resource(s) not available\n",
-                                ec->dev.bus_id);
+                        dev_err(&ec->dev, "resource(s) not available\n");
                         ec->resource[i].end -= ec->resource[i].start;
                         ec->resource[i].start = 0;
                         ec->resource[i].flags = 0;