X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fcris%2Fkernel%2Fsetup.c;h=7af3d5d43e43b73466212ded824b131c46ba4886;hb=20f99dcf417a28089ef6c877ae97f5dec2eab435;hp=d11206e467ab3e9d8ec1cf7f82b62cb7423ec6bf;hpb=2fca877b68b2b4fc5b94277858a1bedd46017cde;p=powerpc.git

diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index d11206e467..7af3d5d43e 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -10,21 +10,20 @@
  * This file handles the architecture-dependent parts of initialization
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
 #include <asm/pgtable.h>
 #include <linux/seq_file.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/utsname.h>
+#include <linux/pfn.h>
 
 #include <asm/setup.h>
 
 /*
  * Setup options
  */
-struct drive_info_struct { char dummy[32]; } drive_info;
 struct screen_info screen_info;
 
 extern int root_mountflags;
@@ -89,10 +88,6 @@ setup_arch(char **cmdline_p)
 	init_mm.end_data =   (unsigned long) &_edata;
 	init_mm.brk =        (unsigned long) &_end;
 
-#define PFN_UP(x)       (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-#define PFN_DOWN(x)     ((x) >> PAGE_SHIFT)
-#define PFN_PHYS(x)     ((x) << PAGE_SHIFT)
-
 	/* min_low_pfn points to the start of DRAM, start_pfn points
 	 * to the first DRAM pages after the kernel, and max_low_pfn
 	 * to the end of DRAM.