diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 12:39:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 12:39:01 +1000 |
| commit | c02d47d7431e68ef91f000ac379a86083f9bc684 (patch) | |
| tree | 4a67692079c59ceb68a3e09ebcf7e59c5aecc26d /arch | |
| parent | 90887b5ec15ff01972eb5f48220783819eb1662f (diff) | |
| parent | e1dee1973c74a0408b108d88c57a15be8a2d6d84 (diff) | |
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/drm_irq.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/early-quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index fe9f0b79a18b..ab470e475199 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -546,6 +546,7 @@ static const struct pci_device_id intel_stolen_ids[] __initconst = { INTEL_BDW_D_IDS(&gen8_stolen_funcs), INTEL_CHV_IDS(&chv_stolen_funcs), INTEL_SKL_IDS(&gen9_stolen_funcs), + INTEL_BXT_IDS(&gen9_stolen_funcs), }; static void __init intel_graphics_stolen(int num, int slot, int func) |