Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265574
b: refs/heads/master
c: aab3ac2
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Kirsher committed Aug 27, 2011
1 parent ad2c20c commit 05d2301
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 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: 33f810b2036f13f1b123062a9e5c1794d400ce81
refs/heads/master: aab3ac26108642eaa06efa4697dab595c7de2bbd
4 changes: 2 additions & 2 deletions trunk/drivers/net/fddi/skfp/h/cmtdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ struct s_plc {
/*
* function prototypes
*/
#include "h/mbuf.h" /* Type definitions for MBUFs */
#include "h/smtstate.h" /* struct smt_state */
#include "mbuf.h" /* Type definitions for MBUFs */
#include "smtstate.h" /* struct smt_state */

void hwt_restart(struct s_smc *smc); /* hwt.c */
SMbuf *smt_build_frame(struct s_smc *smc, int class, int type,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/fddi/skfp/h/hwmtm.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef _HWM_
#define _HWM_

#include "h/mbuf.h"
#include "mbuf.h"

/*
* MACRO for DMA synchronization:
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/fddi/skfp/h/sba.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#ifndef _SBA_
#define _SBA_

#include "h/mbuf.h"
#include "h/sba_def.h"
#include "mbuf.h"
#include "sba_def.h"

#ifdef SBA

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/fddi/skfp/h/skfbiinc.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef _SKFBIINC_
#define _SKFBIINC_

#include "h/supern_2.h"
#include "supern_2.h"

/*
* special defines for use into .asm files
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/net/fddi/skfp/h/smc.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@
* fddi.h
*/
#ifdef OSDEF
#include "h/osdef1st.h"
#include "osdef1st.h"
#endif /* OSDEF */
#ifdef OEM_CONCEPT
#include "oemdef.h"
#endif /* OEM_CONCEPT */
#include "h/smt.h"
#include "h/cmtdef.h"
#include "h/fddimib.h"
#include "h/targethw.h" /* all target hw dependencies */
#include "h/targetos.h" /* all target os dependencies */
#include "smt.h"
#include "cmtdef.h"
#include "fddimib.h"
#include "targethw.h" /* all target hw dependencies */
#include "targetos.h" /* all target os dependencies */
#ifdef ESS
#include "h/sba.h"
#include "sba.h"
#endif

/*
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/net/fddi/skfp/h/targethw.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
#define SK_ML_ID_2 0x30
#endif

#include "h/skfbi.h"
#include "skfbi.h"
#ifndef TAG_MODE
#include "h/fplus.h"
#include "fplus.h"
#else
#include "h/fplustm.h"
#include "fplustm.h"
#endif

#ifndef HW_PTR
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/fddi/skfp/h/targetos.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#define ADDR(a) (((a)>>7) ? (outp(smc->hw.iop+B0_RAP,(a)>>7), (smc->hw.iop+( ((a)&0x7F) | ((a)>>7 ? 0x80:0)) )) : (smc->hw.iop+(((a)&0x7F)|((a)>>7 ? 0x80:0))))
#endif

#include "h/hwmtm.h"
#include "hwmtm.h"

#define TRUE 1
#define FALSE 0
Expand Down

0 comments on commit 05d2301

Please sign in to comment.