diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
tree | eab385cabe589346bcf19385c997ab8dabaef7bd /drivers/net/wireless/rt2x00/rt2x00soc.c | |
parent | ea31ba359c55e0734ff895692185d4c50cf0c537 (diff) | |
parent | c85e9d7739fc8d879c4293ea020760926d6f87cd (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00soc.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00soc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c index 539568c48953..19e684f8ffa1 100644 --- a/drivers/net/wireless/rt2x00/rt2x00soc.c +++ b/drivers/net/wireless/rt2x00/rt2x00soc.c | |||
@@ -1,5 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (C) 2004 - 2009 rt2x00 SourceForge Project | 2 | Copyright (C) 2004 - 2009 Ivo van Doorn <IvDoorn@gmail.com> |
3 | Copyright (C) 2004 - 2009 Felix Fietkau <nbd@openwrt.org> | ||
3 | <http://rt2x00.serialmonkey.com> | 4 | <http://rt2x00.serialmonkey.com> |
4 | 5 | ||
5 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
@@ -93,6 +94,11 @@ int rt2x00soc_probe(struct platform_device *pdev, | |||
93 | rt2x00dev->irq = platform_get_irq(pdev, 0); | 94 | rt2x00dev->irq = platform_get_irq(pdev, 0); |
94 | rt2x00dev->name = pdev->dev.driver->name; | 95 | rt2x00dev->name = pdev->dev.driver->name; |
95 | 96 | ||
97 | /* | ||
98 | * SoC devices mimic PCI behavior. | ||
99 | */ | ||
100 | rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); | ||
101 | |||
96 | rt2x00_set_chip_rt(rt2x00dev, chipset); | 102 | rt2x00_set_chip_rt(rt2x00dev, chipset); |
97 | 103 | ||
98 | retval = rt2x00soc_alloc_reg(rt2x00dev); | 104 | retval = rt2x00soc_alloc_reg(rt2x00dev); |