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
/
cris
/
arch-v10
/
drivers
/
gpio.c
diff --git
a/arch/cris/arch-v10/drivers/gpio.c
b/arch/cris/arch-v10/drivers/gpio.c
index
09963fe
..
fcba663
100644
(file)
--- a/
arch/cris/arch-v10/drivers/gpio.c
+++ b/
arch/cris/arch-v10/drivers/gpio.c
@@
-135,7
+135,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/sched.h>
@@
-436,7
+435,7
@@
static int
gpio_open(struct inode *inode, struct file *filp)
{
struct gpio_private *priv;
gpio_open(struct inode *inode, struct file *filp)
{
struct gpio_private *priv;
- int p =
MINOR(inode->i_rdev
);
+ int p =
iminor(inode
);
if (p > GPIO_MINOR_LAST)
return -EINVAL;
if (p > GPIO_MINOR_LAST)
return -EINVAL;
@@
-938,11
+937,11
@@
gpio_init(void)
* in some tests.
*/
if (request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
* in some tests.
*/
if (request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
-
SA_SHIRQ | SA_INTERRUPT
,"gpio poll", NULL)) {
+
IRQF_SHARED | IRQF_DISABLED
,"gpio poll", NULL)) {
printk(KERN_CRIT "err: timer0 irq for gpio\n");
}
if (request_irq(PA_IRQ_NBR, gpio_pa_interrupt,
printk(KERN_CRIT "err: timer0 irq for gpio\n");
}
if (request_irq(PA_IRQ_NBR, gpio_pa_interrupt,
-
SA_SHIRQ | SA_INTERRUPT
,"gpio PA", NULL)) {
+
IRQF_SHARED | IRQF_DISABLED
,"gpio PA", NULL)) {
printk(KERN_CRIT "err: PA irq for gpio\n");
}
printk(KERN_CRIT "err: PA irq for gpio\n");
}