Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest

2010-11-09 16:51:46 +09:00
parent a9b27bcc6a 37b7a97884 99870bd784
commit 5c4986b8a9
12 changed files with 409 additions and 432 deletions
--- a/arch/sh/boards/board-secureedge5410.c
+++ b/arch/sh/boards/board-secureedge5410.c
@@ -29,8 +29,6 @@ unsigned short secureedge5410_ioport;
 */
 static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id)
 {
-	ctrl_delay();	/* dummy read */
-
 	printk("SnapGear: erase switch interrupt!\n");

 	return IRQ_HANDLED;