diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 23:48:52 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 23:48:52 +0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /drivers/isdn/mISDN/layer1.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
| download | linux-e75d660672ddd11704b7f0fdb8ff21968587b266.tar.xz | |
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/mISDN/layer1.c')
| -rw-r--r-- | drivers/isdn/mISDN/layer1.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index 5cc7c001c523..0fc49b375514 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c @@ -26,12 +26,12 @@ static u_int *debug; struct layer1 { - u_long Flags; - struct FsmInst l1m; - struct FsmTimer timer; - int delay; - struct dchannel *dch; - dchannel_l1callback *dcb; + u_long Flags; + struct FsmInst l1m; + struct FsmTimer timer; + int delay; + struct dchannel *dch; + dchannel_l1callback *dcb; }; #define TIMER3_VALUE 7000 @@ -49,7 +49,7 @@ enum { ST_L1_F8, }; -#define L1S_STATE_COUNT (ST_L1_F8+1) +#define L1S_STATE_COUNT (ST_L1_F8 + 1) static char *strL1SState[] = { @@ -358,7 +358,7 @@ l1_event(struct layer1 *l1, u_int event) default: if (*debug & DEBUG_L1) printk(KERN_DEBUG "%s %x unhandled\n", - __func__, event); + __func__, event); err = -EINVAL; } return err; |