diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-07 07:24:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-07 07:24:21 -0400 |
| commit | b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d (patch) | |
| tree | a0d2e6dd179e5d057776edd0ed865bc744dfa54d /drivers/net/wireless/iwmc3200wifi/sdio.c | |
| parent | a93958ac980f0ce594ad90657ecbc595ff157a40 (diff) | |
| parent | 0c0c9e7076b69f93678e4ec711e2bf237398e623 (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/iwmc3200wifi/sdio.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c index edc0a0091058..b54da677b371 100644 --- a/drivers/net/wireless/iwmc3200wifi/sdio.c +++ b/drivers/net/wireless/iwmc3200wifi/sdio.c | |||
| @@ -395,7 +395,7 @@ static struct iwm_if_ops if_sdio_ops = { | |||
| 395 | .debugfs_init = if_sdio_debugfs_init, | 395 | .debugfs_init = if_sdio_debugfs_init, |
| 396 | .debugfs_exit = if_sdio_debugfs_exit, | 396 | .debugfs_exit = if_sdio_debugfs_exit, |
| 397 | .umac_name = "iwmc3200wifi-umac-sdio.bin", | 397 | .umac_name = "iwmc3200wifi-umac-sdio.bin", |
| 398 | .calib_lmac_name = "iwmc3200wifi-lmac-calib-sdio.bin", | 398 | .calib_lmac_name = "iwmc3200wifi-calib-sdio.bin", |
| 399 | .lmac_name = "iwmc3200wifi-lmac-sdio.bin", | 399 | .lmac_name = "iwmc3200wifi-lmac-sdio.bin", |
| 400 | }; | 400 | }; |
| 401 | 401 | ||