summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/boot/header.S1
-rw-r--r--arch/x86/include/asm/e820/types.h5
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 398b290..2ed8f0c 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -18,7 +18,6 @@
#include <asm/segment.h>
#include <generated/utsrelease.h>
#include <asm/boot.h>
-#include <asm/e820/api.h>
#include <asm/page_types.h>
#include <asm/setup.h>
#include <asm/bootparam.h>
diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h
index b05e812..464cfe8 100644
--- a/arch/x86/include/asm/e820/types.h
+++ b/arch/x86/include/asm/e820/types.h
@@ -65,9 +65,6 @@
*/
#define E820_RESERVED_KERN 128
-#ifndef __ASSEMBLY__
-#include <linux/types.h>
-
/*
* The whole array of E820 entries:
*/
@@ -88,6 +85,4 @@ struct e820map {
#define BIOS_ROM_BASE 0xffe00000
#define BIOS_ROM_END 0xffffffff
-#endif /* __ASSEMBLY__ */
-
#endif /* _ASM_E820_TYPES_H */
OpenPOWER on IntegriCloud