Merge branch 'linus' into x86/cleanups
Pull in upstream changes so we can apply depending patches.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
#ifndef _ASM_X86_PLATFORM_H
|
||||
#define _ASM_X86_PLATFORM_H
|
||||
|
||||
#include <asm/pgtable_types.h>
|
||||
#include <asm/bootparam.h>
|
||||
|
||||
struct mpc_bus;
|
||||
|
Reference in New Issue
Block a user