git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sh
/
boards
/
snapgear
/
setup.c
diff --git
a/arch/sh/boards/snapgear/setup.c
b/arch/sh/boards/snapgear/setup.c
index
08fc983
..
f1f7c70
100644
(file)
--- a/
arch/sh/boards/snapgear/setup.c
+++ b/
arch/sh/boards/snapgear/setup.c
@@
-14,7
+14,6
@@
*/
/****************************************************************************/
*/
/****************************************************************************/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
@@
-51,7
+50,7
@@
static int __init eraseconfig_init(void)
{
printk("SnapGear: EraseConfig init\n");
/* Setup "EraseConfig" switch on external IRQ 0 */
{
printk("SnapGear: EraseConfig init\n");
/* Setup "EraseConfig" switch on external IRQ 0 */
- if (request_irq(IRL0_IRQ, eraseconfig_interrupt,
SA_INTERRUPT
,
+ if (request_irq(IRL0_IRQ, eraseconfig_interrupt,
IRQF_DISABLED
,
"Erase Config", NULL))
printk("SnapGear: failed to register IRQ%d for Reset witch\n",
IRL0_IRQ);
"Erase Config", NULL))
printk("SnapGear: failed to register IRQ%d for Reset witch\n",
IRL0_IRQ);