diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/broadcom-wl/src | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/broadcom-wl/src')
| -rw-r--r-- | package/broadcom-wl/src/glue/wl_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/broadcom-wl/src/glue/wl_glue.c b/package/broadcom-wl/src/glue/wl_glue.c index bf009e5bb..fc94ac0b2 100644 --- a/package/broadcom-wl/src/glue/wl_glue.c +++ b/package/broadcom-wl/src/glue/wl_glue.c @@ -108,7 +108,7 @@ static int wl_glue_bcma_probe(struct bcma_device *dev) * 0x1000 = BCMA_CORE_SIZE */ - wldev = attach_cb(dev->id.manuf, dev->id.id, (ulong)dev->io_addr, dev, dev->irq); + wldev = attach_cb(dev->id.manuf, dev->id.id, (ulong)dev->addr, dev, dev->irq); if (!wldev) { |