From b2cb58bdb3b4e1c7b815a7472a87f904bf999f42 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Wed, 7 Sep 2011 16:10:19 +0800 Subject: [PATCH] --- yaml --- r: 283147 b: refs/heads/master c: 86abc23ed146522b276f63032574f358bcfe0392 h: refs/heads/master i: 283145: 8afb58f5600ef3241e91d1c6babfa1c630aae1f5 283143: b84c2fcc609628ccab662965b76bdc9b61e8e1b2 v: v3 --- [refs] | 2 +- trunk/arch/unicore32/kernel/puv3-nb0916.c | 4 ++-- trunk/arch/unicore32/kernel/time.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 40cd3da10fe6..9d03a1bc2b06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7037bd803e24d4fdaa87f27456e686aafb061277 +refs/heads/master: 86abc23ed146522b276f63032574f358bcfe0392 diff --git a/trunk/arch/unicore32/kernel/puv3-nb0916.c b/trunk/arch/unicore32/kernel/puv3-nb0916.c index 37b12a06b499..181108b8ecce 100644 --- a/trunk/arch/unicore32/kernel/puv3-nb0916.c +++ b/trunk/arch/unicore32/kernel/puv3-nb0916.c @@ -123,7 +123,7 @@ int __init mach_nb0916_init(void) if (request_irq(gpio_to_irq(GPI_LCD_CASE_OFF), &nb0916_lcdcaseoff_handler, - IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "NB0916 lcd case off", NULL) < 0) { printk(KERN_DEBUG "LCD-Case-OFF IRQ %d not available\n", @@ -131,7 +131,7 @@ int __init mach_nb0916_init(void) } if (request_irq(gpio_to_irq(GPI_OTP_INT), &nb0916_overheat_handler, - IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "NB0916 overheating protection", NULL) < 0) { printk(KERN_DEBUG "Overheating Protection IRQ %d not available\n", diff --git a/trunk/arch/unicore32/kernel/time.c b/trunk/arch/unicore32/kernel/time.c index 080710c09241..d3824b2ff644 100644 --- a/trunk/arch/unicore32/kernel/time.c +++ b/trunk/arch/unicore32/kernel/time.c @@ -86,7 +86,7 @@ static struct clocksource cksrc_puv3_oscr = { static struct irqaction puv3_timer_irq = { .name = "ost0", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, + .flags = IRQF_TIMER | IRQF_IRQPOLL, .handler = puv3_ost0_interrupt, .dev_id = &ckevt_puv3_osmr0, };