--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -35,6 +35,7 @@
 #include <asm/prom.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
+#include <asm/idle.h>
 #include <bcm47xx.h>
 #include <bcm47xx_nvram.h>
 #include <bcm47xx_board.h>
@@ -214,6 +215,15 @@ static void __init bcm47xx_register_bcma
 		panic("Failed to initialize BCMA bus (err %d)", err);
 
 	bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
+
+	/* The BCM4706 has a problem with the CPU wait instruction.
+	 * When r4k_wait or r4k_wait_irqoff is used will just hang and 
+	 * not return from a msleep(). Removing the cpu_wait 
+	 * functionality is a workaround for this problem. The BCM4716 
+	 * does not have this problem.
+	 */
+	if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
+		cpu_wait = NULL;
 }
 #endif
 
