Sync with mainline: Clean up a bit

Clean up a bit
Signed-off-by: Tony Lindgren <tony@atomide.com>

arch/arm/kernel/vmlinux.lds.S

@@ -170,3 +170,11 @@ SECTIONS
 	.stab.indexstr 0 : { *(.stab.indexstr) }
 	.comment 0 : { *(.comment) }
 }
+
+/*
+ * These must never be empty
+ * If you have to comment these two assert statements out, your
+ * binutils is too old (for other reasons as well)
+ */
+ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
+ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")

include/asm-arm/dma-mapping.h

@@ -4,7 +4,6 @@
 #ifdef __KERNEL__
 
 #include <linux/mm.h> /* need struct page */
-#include <linux/device.h>
 
 #include <asm/scatterlist.h>