diff options
author | Dan Williams <dcbw@redhat.com> | 2010-08-07 21:15:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:43 -0400 |
commit | 3d32a58b87cd251b50842f93b87d5458061c0cfc (patch) | |
tree | 983efdd808d72edefde2f54f3d938c40fb5e53fc /drivers/net/wireless/libertas/if_sdio.h | |
parent | 82222e9ba75298e5bcd89803b6a11e2d7dfae70e (diff) | |
download | blackbird-op-linux-3d32a58b87cd251b50842f93b87d5458061c0cfc.tar.gz blackbird-op-linux-3d32a58b87cd251b50842f93b87d5458061c0cfc.zip |
libertas: [sdio] use common firmware request helper and new firmware locations
linux-firmware puts libertas firmware in /libertas. Fix the driver to
look there first, but fall back to the old firmware names if the new
ones don't exist. Add preference for newer firmware versions too.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/if_sdio.h')
-rw-r--r-- | drivers/net/wireless/libertas/if_sdio.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/if_sdio.h b/drivers/net/wireless/libertas/if_sdio.h index 12179c1dc9c9..62fda3592f67 100644 --- a/drivers/net/wireless/libertas/if_sdio.h +++ b/drivers/net/wireless/libertas/if_sdio.h @@ -12,10 +12,6 @@ #ifndef _LBS_IF_SDIO_H #define _LBS_IF_SDIO_H -#define IF_SDIO_MODEL_8385 0x04 -#define IF_SDIO_MODEL_8686 0x0b -#define IF_SDIO_MODEL_8688 0x10 - #define IF_SDIO_IOPORT 0x00 #define IF_SDIO_H_INT_MASK 0x04 |