Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353839
b: refs/heads/master
c: ef8271d
h: refs/heads/master
i:
  353837: 3c37e0d
  353835: a250a98
  353831: 5400aaf
  353823: 644f857
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent ebffda8 commit ca4f563
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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: 6dc69c2b8301270ed360de62a09276becefeabe8
refs/heads/master: ef8271dc6c005388edaa8ea15014b0801a320a4a
18 changes: 9 additions & 9 deletions trunk/drivers/staging/wlags49_h2/ap_h25.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
*/


#include "hcfcfg.h" // to get hcf_16 etc defined as well as
// possible settings which inluence 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 inluence 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 @@ -4048,7 +4048,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
CFG_PROG,
CFG_PROG_STOP, // mode
0000,
0x000F2101, // Start execution address
0x000F2101, // Start execution address
},
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
};
Expand All @@ -4059,24 +4059,24 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL,
COMP_ID_APF,
{
{ 4, 1, 1 } //variant, bottom, top
{ 4, 1, 1 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
CFG_MFI_ACT_RANGES_STA,
COMP_ROLE_ACT,
COMP_ID_MFI,
{
{ 7, 3, 3 }, //variant, bottom, top
{ 8, 1, 1 } //variant, bottom, top
{ 7, 3, 3 }, //variant, bottom, top
{ 8, 1, 1 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
CFG_CFI_ACT_RANGES_STA,
COMP_ROLE_ACT,
COMP_ID_CFI,
{
{ 4, 1, 2 } //variant, bottom, top
{ 4, 1, 2 } //variant, bottom, top
}
},
{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } //endsentinel
Expand Down

0 comments on commit ca4f563

Please sign in to comment.