diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-14 05:33:38 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-14 05:33:38 +0900 |
| commit | a7bf89a1b14c6ebae233275e704587146fbaa5c1 (patch) | |
| tree | 94b6c8ca6cf571faff5103117cf3030ded62d49f /include | |
| parent | 2cc499b398c7bbcbf415017cd9588e699e04cd64 (diff) | |
| parent | abb2bafd295fe962bbadc329dbfb2146457283ac (diff) | |
| download | linux-a7bf89a1b14c6ebae233275e704587146fbaa5c1.tar.bz2 | |
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 'include')
| -rw-r--r-- | include/linux/bcma/bcma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index e6b41f42602b..3db25df396cb 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -159,6 +159,7 @@ struct bcma_host_ops { #define BCMA_CORE_DEFAULT 0xFFF #define BCMA_MAX_NR_CORES 16 +#define BCMA_CORE_SIZE 0x1000 /* Chip IDs of PCIe devices */ #define BCMA_CHIP_ID_BCM4313 0x4313 |