diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-10 15:43:32 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-10 15:43:32 -0700 |
| commit | f1ca2218881eee7a6f7c9659b837a4c412f8fd06 (patch) | |
| tree | d7a0c9fd32fcba2b523d55799533bc835d4c7ac9 /net/lapb/lapb_timer.c | |
| parent | 68a531a1dec12708817552dad4eefc5968dd333f (diff) | |
| parent | dc7743aa3c49fabbc6dc9edbcf7df74d776ac32e (diff) | |
Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk
Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.
As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.
Diffstat (limited to 'net/lapb/lapb_timer.c')
| -rw-r--r-- | net/lapb/lapb_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 54563ad8aeb1..355cc3b6fa4d 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -154,6 +154,7 @@ static void lapb_t1timer_expiry(unsigned long param) } else { lapb->n2count++; lapb_requeue_frames(lapb); + lapb_kick(lapb); } break; |