Merge plexity.net:/home/dsaxena/src/linux-2.6-ixp2000

into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk

arch/arm/mach-ixp2000/ixdp2x01.c

@@ -191,7 +191,7 @@ static int __init ixdp2x01_clock_setup(char *str)
 	return 1;
 }
 
-__setup("ixdp2x01_clock", ixdp2x01_clock_setup);
+__setup("ixdp2x01_clock=", ixdp2x01_clock_setup);
 
 static void __init ixdp2x01_init_time(void)
 {

arch/arm/mach-ixp2000/pci.c

@@ -33,8 +33,6 @@
 
 #include <asm/mach/pci.h>
 
-extern int (*external_fault) (unsigned long, struct pt_regs *);
-
 static int pci_master_aborts = 0;
 
 static int clear_master_aborts(void);

include/asm-arm/arch-ixp2000/system.h

@@ -13,16 +13,9 @@
 
 static inline void arch_idle(void)
 {
-#if 0
-	while (!current->need_resched && !hlt_counter) {
-		cpu_do_idle(IDLE_CLOCK_SLOW);
-		cpu_do_idle(IDLE_WAIT_FAST);
-		cpu_do_idle(IDLE_CLOCK_FAST);
-	}
-#endif
+	cpu_do_idle();
 }
 
-
 static inline void arch_reset(char mode)
 {
 	cli();
@@ -39,7 +32,4 @@ static inline void arch_reset(char mode)
 	if (*IXP2000_STRAP_OPTIONS & CFG_PCI_BOOT_HOST) {
 		*(IXP2000_RESET0) |= (RSTALL);
 	}
-
-
-	
 }