diff options
| author | Linus Torvalds | 2016-07-14 05:33:38 +0900 |
|---|---|---|
| committer | Linus Torvalds | 2016-07-14 05:33:38 +0900 |
| commit | a7bf89a1b14c6ebae233275e704587146fbaa5c1 (patch) | |
| tree | 94b6c8ca6cf571faff5103117cf3030ded62d49f /drivers | |
| parent | 2cc499b398c7bbcbf415017cd9588e699e04cd64 (diff) | |
| parent | abb2bafd295fe962bbadc329dbfb2146457283ac (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"This contains three commits to fix memory corruption bugs with certain
Apple AirPort cards, plus a fix for a X86_BUG() ID definitions collision
bug in asm/cpufeatures.h"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/quirks: Add early quirk to reset Apple AirPort card
x86/quirks: Reintroduce scanning of secondary buses
x86/quirks: Apply nvidia_bugs quirk only on root bus
x86/cpu: Fix duplicated X86_BUG(9) macro
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bcma/bcma_private.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index eda09090cb52..f642c4264c27 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h @@ -8,8 +8,6 @@ #include <linux/bcma/bcma.h> #include <linux/delay.h> -#define BCMA_CORE_SIZE 0x1000 - #define bcma_err(bus, fmt, ...) \ pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__) #define bcma_warn(bus, fmt, ...) \ |