Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353853
b: refs/heads/master
c: 497d414
h: refs/heads/master
i:
  353851: 6b52f16
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent e8a9185 commit 4f301a8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79249c4b22a56fda44623f449a2893f25629a7d1
refs/heads/master: 497d4140abb8584bdbe86ea75fcd84b847acccee
20 changes: 10 additions & 10 deletions trunk/drivers/staging/wlags49_h2/sta_h2.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
*/


#include "hcfcfg.h" // to get hcf_16 etc defined as well as
// possible settings which influence mdd.h or dhf.h
#include "mdd.h" //to get COMP_ID_STA etc defined
#include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord,
#include "hcfcfg.h" // to get hcf_16 etc defined as well as
// possible settings which influence mdd.h or dhf.h
#include "mdd.h" // to get COMP_ID_STA etc defined
#include "dhf.h" // used to be "fhfmem.h", to get memblock,plugrecord,

static const hcf_8 fw_image_1_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Expand Down Expand Up @@ -4433,7 +4433,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
CFG_PROG,
CFG_PROG_STOP, // mode
0000,
0x000F368E, // Start execution address
0x000F368E, // Start execution address
},
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
};
Expand All @@ -4444,25 +4444,25 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL,
COMP_ID_STA,
{
{ 2, 2, 5 } //variant, bottom, top
{ 2, 2, 5 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
CFG_MFI_ACT_RANGES_STA,
COMP_ROLE_ACT,
COMP_ID_MFI,
{
{ 4, 6, 7 }, //variant, bottom, top
{ 5, 6, 7 }, //variant, bottom, top
{ 6, 6, 7 } //variant, bottom, top
{ 4, 6, 7 }, //variant, bottom, top
{ 5, 6, 7 }, //variant, bottom, top
{ 6, 6, 7 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
CFG_CFI_ACT_RANGES_STA,
COMP_ROLE_ACT,
COMP_ID_CFI,
{
{ 2, 1, 2 } //variant, bottom, top
{ 2, 1, 2 } //variant, bottom, top
}
},
{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } //endsentinel
Expand Down

0 comments on commit 4f301a8

Please sign in to comment.