lkml.org 
[lkml]   [2011]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [GIT PATCH] STAGING patches for 3.1
From
Date
On Mon, 2011-07-25 at 23:31 -0700, Linus Torvalds wrote:
>
> So all merged and pushed out. Of course, maybe I made a mistake
> somewhere, but none of it looked at all questionable (famous last
> words ;)
>
> Linus
>

I came across a double include of linux/interrupt.h in
drivers/staging/brcm80211/brcmsmac/mac80211_if.h from this merge while
trying to teach myself how to effectively use git as a tool for
resolving merges.

The merge also added an include of linux/interrupt.h in mac80211_if.c
which includes mac80211_if.h, but I left that in, since it explicitly
shows the dependencies of the file.

Anyway, Here's the patch:

---
From: Daniel Morsing <daniel.morsing@gmail.com>
staging: brcm80211: Fix double include introduced by bad merge

A merge with Linus' tree added a double include of linux/interrupt.h.
Fix by removing one of the includes.

Signed-off-by: Daniel Morsing <daniel.morsing@gmail.com>
---
drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
index 5711e7c..40e3d37 100644
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
@@ -24,8 +24,6 @@
#define BRCMS_SET_SHORTSLOT_OVERRIDE 146


-#include <linux/interrupt.h>
-
/* BMAC Note: High-only driver is no longer working in softirq context
as it needs to block and
* sleep so perimeter lock has to be a semaphore instead of spinlock.
This requires timers to be
* submitted to workqueue instead of being on kernel timer






\
 
 \ /
  Last update: 2011-07-27 13:55    [from the cache]
©2003-2011 Jasper Spaans