diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 16:47:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 16:47:54 -0700 |
| commit | eca4ee0d1615c4fb01e437f674163542ec2dd072 (patch) | |
| tree | b0da76b018547912082946b1f8f210bcd1b745e8 /drivers | |
| parent | e5a7675dd503f778987ba1f181799ba5aadde319 (diff) | |
| parent | 557dca5f48a45df88a73e69ee0700cfd4e2358c9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] amba: fix amba device resources
[ARM] pgtable: file pte layout documentation
[ARM] pgtable: swp pte layout documentation, definitions, and check
[ARM] export __cpu_flush_dcache_page
[ARM] 5576/1: Update kb9202_defconfig
[ARM] 5581/1: U300 clock updates
[ARM] 5579/1: Updated U300 defconfig
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/amba/bus.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 3d763fdf99b..24665067301 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -207,6 +207,16 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) void __iomem *tmp; int i, ret; + device_initialize(&dev->dev); + + /* + * Copy from device_add + */ + if (dev->dev.init_name) { + dev_set_name(&dev->dev, "%s", dev->dev.init_name); + dev->dev.init_name = NULL; + } + dev->dev.release = amba_device_release; dev->dev.bus = &amba_bustype; dev->dev.dma_mask = &dev->dma_mask; @@ -240,7 +250,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) goto err_release; } - ret = device_register(&dev->dev); + ret = device_add(&dev->dev); if (ret) goto err_release; |