diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
| commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
| tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/rt2860/common/firmware.h | |
| parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
| parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/rt2860/common/firmware.h')
| -rw-r--r-- | drivers/staging/rt2860/common/firmware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rt2860/common/firmware.h b/drivers/staging/rt2860/common/firmware.h index e72996f42c07..e984725358da 100644 --- a/drivers/staging/rt2860/common/firmware.h +++ b/drivers/staging/rt2860/common/firmware.h @@ -43,7 +43,7 @@ /* AUTO GEN PLEASE DO NOT MODIFY IT */ -UCHAR FirmwareImage [] = { +UCHAR FirmwareImage_2860 [] = { 0x02, 0x03, 0x5e, 0x02, 0x02, 0xb1, 0x22, 0x22, 0xff, 0xff, 0xff, 0x02, 0x01, 0x82, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x01, 0x33, 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x18, 0xc2, 0xaf, 0x30, 0x45, 0x03, |