diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /drivers/isdn/hisax/isdnl3.h | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'drivers/isdn/hisax/isdnl3.h')
| -rw-r--r-- | drivers/isdn/hisax/isdnl3.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/isdnl3.h b/drivers/isdn/hisax/isdnl3.h index 749498fe6c4..0edc99d40dc 100644 --- a/drivers/isdn/hisax/isdnl3.h +++ b/drivers/isdn/hisax/isdnl3.h @@ -5,7 +5,7 @@ * */ -#define SBIT(state) (1<<state) +#define SBIT(state) (1 << state) #define ALL_STATES 0x03ffffff #define PROTO_DIS_EURO 0x08 @@ -40,4 +40,3 @@ void l3_msg(struct PStack *st, int pr, void *arg); void setstack_dss1(struct PStack *st); void setstack_ni1(struct PStack *st); void setstack_1tr6(struct PStack *st); - |