diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 00:34:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 00:34:45 +0300 |
| commit | 9858a38ea3a940762ae3028cce88f686d0e0c28b (patch) | |
| tree | f34a3ba1eba9be58cdd906e33280ce5b35d31b06 /arch/sh/boards/board-secureedge5410.c | |
| parent | abb359450f20c32ae03039d8736f12b1d561caf5 (diff) | |
| parent | f862f904d357dc0d3612347a8dbabe6fae037fbb (diff) | |
| download | linux-9858a38ea3a940762ae3028cce88f686d0e0c28b.tar.xz | |
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: include Migo-R TS driver in Migo-R defconfig
sh: correct definitions to access stack pointers
sh: Tidy up SH-4A unaligned load support.
dma: shdma: NMI support.
sh: mach-sdk7786: Handle baseboard NMI source selection.
sh: mach-rsk: Add polled GPIO buttons support for RSK+7203.
sh: Break out cpuinfo_op procfs bits.
sh: Enable optional gpiolib for all CPUs with pinmux tables.
sh: migrate SH_CLK_MD to mode pin API.
sh: machvec IO death.
Diffstat (limited to 'arch/sh/boards/board-secureedge5410.c')
| -rw-r--r-- | arch/sh/boards/board-secureedge5410.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/boards/board-secureedge5410.c b/arch/sh/boards/board-secureedge5410.c index 32f875e8493d..f968f17891a4 100644 --- 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; |