Fixup kdev_t changes in various ARM files

arch/arm/mach-adifcc/arch.c

@@ -7,7 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/fs.h>
@@ -33,7 +33,7 @@ fixup_adifcc(struct machine_desc *desc, struct param_struct *params,
 
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( 0xc0800000, 3*1024*1024 );
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 #endif
 }
 

arch/arm/mach-anakin/arch.c

@@ -30,7 +30,7 @@ static void __init
 fixup_anakin(struct machine_desc *desc, struct param_struct *unused,
              char **cmdline, struct meminfo *mi)
 {
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
 	setup_ramdisk(1, 0, 0, CONFIG_BLK_DEV_RAM_SIZE);
 	setup_initrd(0xc0800000, 4 * 1024 * 1024);
 }

arch/arm/mach-epxa10db/arch.c

@@ -18,7 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
@@ -46,7 +45,7 @@ epxa10db_fixup(struct machine_desc *desc, struct param_struct *params,
         mi->bank[0].node  = 0;
 
 /*
-        ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+        ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
         setup_ramdisk( 1, 0, 0, 8192 );
         setup_initrd(0xc0200000, 6*1024*1024);
 */

arch/arm/mach-iop310/arch.c

@@ -9,7 +9,7 @@
  * published by the Free Software Foundation.
  *
  */
-
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/fs.h>
@@ -44,7 +44,7 @@ fixup_iq80310(struct machine_desc *desc, struct param_struct *params,
 #elif defined(CONFIG_BLK_DEV_INITRD)
 	setup_ramdisk( 1, 0, 0, CONFIG_BLK_DEV_RAM_SIZE );
 	setup_initrd( 0xc0800000, 4*1024*1024 );
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); /* /dev/ram */
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0); /* /dev/ram */
 #endif
 }
 

arch/arm/mach-l7200/core.c

@@ -5,6 +5,7 @@
  *
  *  Extra MM routines for L7200 architecture
  */
+#include <linux/config.h>
 #include <linux/init.h>
 
 #include <asm/hardware.h>
@@ -90,7 +91,7 @@ fixup_l7200(struct machine_desc *desc, struct param_struct *unused,
         mi->bank[0].size  = (32*1024*1024);
         mi->bank[0].node  = 0;
 
-        ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+        ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
         setup_ramdisk( 1, 0, 0, CONFIG_BLK_DEV_RAM_SIZE);
         setup_initrd( __phys_to_virt(0xf1000000), 0x005dac7b);
 

arch/arm/mach-sa1100/adsbitsy.c

@@ -26,8 +26,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
 
-#include <asm/arch/irq.h>
-
 #include "generic.h"
 #include "sa1111.h"
 
@@ -120,7 +118,7 @@ fixup_adsbitsy(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 32*1024*1024 );
 	mi->nr_banks = 1;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
 }

arch/arm/mach-sa1100/brutus.c

@@ -32,7 +32,7 @@ fixup_brutus(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 3, 0xd8000000, 4*1024*1024 );
 	mi->nr_banks = 4;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xd8000000), 3*1024*1024 );
 }

arch/arm/mach-sa1100/cerf.c

 /*
  * linux/arch/arm/mach-sa1100/cerf.c
  */
-
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
@@ -55,7 +55,7 @@ fixup_cerf(struct machine_desc *desc, struct param_struct *params,
 #error "Undefined memory size for Cerfboard."
 #endif
 
-//	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+//	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 //	setup_ramdisk(1,  0, 0, 8192);
 //	// Save 2Meg for RAMDisk
 //	setup_initrd(0xc0500000, 3*1024*1024);

arch/arm/mach-sa1100/empeg.c

@@ -24,7 +24,7 @@ fixup_empeg(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 1, 0xc8000000, 4*1024*1024 );
 	mi->nr_banks = 2;
 
-	ROOT_DEV = MKDEV( 3, 1 );  /* /dev/hda1 */
+	ROOT_DEV = mk_kdev( 3, 1 );  /* /dev/hda1 */
 	setup_ramdisk( 1, 0, 0, 4096 );
 	setup_initrd( 0xd0000000+((1024-320)*1024), (320*1024) );
 }

arch/arm/mach-sa1100/flexanet.c

@@ -9,8 +9,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -113,7 +111,6 @@ static void flexanet_set_mctrl(struct uart_port *port, u_int mctrl)
  *
  * get_mctrl : set state of modem control lines
  * set_mctrl : set the modem control lines
- * enable_ms : enable modem-status interrupts
  * pm        : power-management. Turn device on/off.
  *
  */
@@ -121,7 +118,6 @@ static struct sa1100_port_fns	flexanet_port_fns __initdata =
 {
 	set_mctrl : flexanet_set_mctrl,
 	get_mctrl : flexanet_get_mctrl,
-	enable_ms : NULL,
 	pm        : NULL,
 };
 
@@ -168,7 +164,7 @@ fixup_flexanet(struct machine_desc *desc, struct param_struct *params,
 	mi->nr_banks = 1;
 
 	/* setup ramdisk */
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( 0xc0800000, 3*1024*1024 );
 }

arch/arm/mach-sa1100/freebird.c

@@ -58,7 +58,7 @@ fixup_freebird(struct machine_desc *desc, struct param_struct *params,
 #ifdef CONFIG_SA1100_FREEBIRD_OLD
 	SET_BANK( 0, 0xc0000000, 32*1024*1024 );
 	mi->nr_banks = 1;
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0 ,0 , 8192 );
 	setup_initrd( 0xc0800000, 3*1024*1024 );
 #endif

arch/arm/mach-sa1100/graphicsclient.c

@@ -130,7 +130,7 @@ fixup_graphicsclient(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 1, 0xc8000000, 16*1024*1024 );
 	mi->nr_banks = 2;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
 }

arch/arm/mach-sa1100/graphicsmaster.c

@@ -193,7 +193,7 @@ fixup_graphicsmaster(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 1, 0xc8000000, 16*1024*1024 );
 	mi->nr_banks = 2;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
 }

arch/arm/mach-sa1100/huw_webpanel.c

@@ -2,8 +2,6 @@
  * linux/arch/arm/mach-sa1100/huw_webpanel.c
  *
  */
-
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -66,7 +64,7 @@ fixup_huw_webpanel(struct machine_desc *desc, struct param_struct *params,
 	 **/
 	SET_BANK( 0, 0xc0000000, ((32*1024 - (256 + 32)) * 1024));
 	mi->nr_banks = 1;
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 8*1024*1024 );
 }

arch/arm/mach-sa1100/nanoengine.c

@@ -23,7 +23,7 @@ fixup_nanoengine(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 32*1024*1024 );
 	mi->nr_banks = 1;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
 

arch/arm/mach-sa1100/omnimeter.c

@@ -47,7 +47,7 @@ fixup_omnimeter(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 16*1024*1024 );
 	mi->nr_banks = 1;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xd0000000), 0x00400000 );
 }

arch/arm/mach-sa1100/pangolin.c

 /*
  * linux/arch/arm/mach-sa1100/pangolin.c
  */
-
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
@@ -23,7 +23,7 @@ fixup_pangolin(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 128*1024*1024 );
 	mi->nr_banks = 1;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 16384 );
 	setup_initrd( 0xc0800000, 3*1024*1024 );
 }

arch/arm/mach-sa1100/pfs168.c

 /*
  * linux/arch/arm/mach-sa1100/pfs168.c
  */
-
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
@@ -96,7 +96,7 @@ fixup_pfs168(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 16*1024*1024 );
 	mi->nr_banks = 1;
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( 0xc0800000, 3*1024*1024 );
 }

arch/arm/mach-sa1100/pleb.c

@@ -28,7 +28,7 @@ fixup_pleb(struct machine_desc *desc, struct param_struct *params,
 	/* make it 1 if a 16MB memory card is used */
 	mi->nr_banks = 2; /* Default 32MB */
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR, 0);
 	setup_ramdisk(1, 0, 0, 8192);
 	setup_initrd(0xc0400000, 4*1024*1024);
 }

arch/arm/mach-sa1100/sherman.c

@@ -24,7 +24,7 @@ fixup_sherman(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 1, 0xc8000000, 64*1024*1024 );
 	mi->nr_banks = 2;
 
-	ROOT_DEV = MKDEV( 60, 2 );
+	ROOT_DEV = mk_kdev( 60, 2 );
 	setup_ramdisk( 1, 0, 0, 8192 );
 //	setup_initrd( 0xc0400000, 8*1024*1024 );
 }

arch/arm/mach-sa1100/simpad.c

@@ -50,7 +50,7 @@ fixup_simpad(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 32*1024*1024 );
 #endif
 	mi->nr_banks = 1;
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
 }

arch/arm/mach-sa1100/system3.c

@@ -54,8 +54,6 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/serial_sa1100.h>
 
-#include <asm/arch/irq.h>
-
 #include <linux/serial_core.h>
 
 #include "generic.h"
@@ -227,7 +225,7 @@ static void __init fixup_system3(struct machine_desc *desc,
 {
 	DPRINTK( "%s\n", "START" );
 
-	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	ROOT_DEV = mk_kdev(RAMDISK_MAJOR,0);
 	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( 0xc0800000, 8*1024*1024 );
 }

arch/arm/mach-sa1100/victor.c

@@ -48,7 +48,7 @@ fixup_victor(struct machine_desc *desc, struct param_struct *params,
 	SET_BANK( 0, 0xc0000000, 4*1024*1024 );
 	mi->nr_banks = 1;
 
-	ROOT_DEV = MKDEV( 60, 2 );
+	ROOT_DEV = mk_kdev( 60, 2 );
 
 	/* Get command line parameters passed from the loader (if any) */
 	if( *((char*)0xc0000000) )