git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
ecard.c
diff --git
a/arch/arm/kernel/ecard.c
b/arch/arm/kernel/ecard.c
index
60c079d
..
eed2f79
100644
(file)
--- a/
arch/arm/kernel/ecard.c
+++ b/
arch/arm/kernel/ecard.c
@@
-817,7
+817,7
@@
static struct expansion_card *__init ecard_alloc_card(int type, int slot)
ec->dma = NO_DMA;
ec->ops = &ecard_default_ops;
ec->dma = NO_DMA;
ec->ops = &ecard_default_ops;
-
snprintf(ec->dev.bus_id, sizeof(ec->dev.bus_id)
, "ecard%d", slot);
+
dev_set_name(&ec->dev
, "ecard%d", slot);
ec->dev.parent = NULL;
ec->dev.bus = &ecard_bus_type;
ec->dev.dma_mask = &ec->dma_mask;
ec->dev.parent = NULL;
ec->dev.bus = &ecard_bus_type;
ec->dev.dma_mask = &ec->dma_mask;