diff options
author | Dan Williams <dcbw@redhat.com> | 2010-08-07 21:16:30 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:43 -0400 |
commit | 915a824e30c503157c38115eb6a85f60bb653738 (patch) | |
tree | da7a9072ae156c0c969ab6a7c9587f42cd187139 /drivers/net/wireless/libertas/if_spi.h | |
parent | 3d32a58b87cd251b50842f93b87d5458061c0cfc (diff) | |
download | blackbird-op-linux-915a824e30c503157c38115eb6a85f60bb653738.tar.gz blackbird-op-linux-915a824e30c503157c38115eb6a85f60bb653738.zip |
libertas: [spi] 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_spi.h')
-rw-r--r-- | drivers/net/wireless/libertas/if_spi.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/if_spi.h b/drivers/net/wireless/libertas/if_spi.h index f87eec410848..8b1417d3b71b 100644 --- a/drivers/net/wireless/libertas/if_spi.h +++ b/drivers/net/wireless/libertas/if_spi.h @@ -25,11 +25,6 @@ #define IF_SPI_FW_NAME_MAX 30 -struct chip_ident { - u16 chip_id; - u16 name; -}; - #define MAX_MAIN_FW_LOAD_CRC_ERR 10 /* Chunk size when loading the helper firmware */ |