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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
gpio.c
diff --git
a/arch/cris/arch-v32/drivers/gpio.c
b/arch/cris/arch-v32/drivers/gpio.c
index
c3f876b
..
a551237
100644
(file)
--- a/
arch/cris/arch-v32/drivers/gpio.c
+++ b/
arch/cris/arch-v32/drivers/gpio.c
@@
-62,6
+62,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/sched.h>
@@
-418,7
+419,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 =
iminor(inode
);
+ int p =
MINOR(inode->i_rdev
);
if (p > GPIO_MINOR_LAST)
return -EINVAL;
if (p > GPIO_MINOR_LAST)
return -EINVAL;
@@
-744,11
+745,11
@@
gpio_init(void)
* in some tests.
*/
if (request_irq(TIMER_INTR_VECT, gpio_poll_timer_interrupt,
* in some tests.
*/
if (request_irq(TIMER_INTR_VECT, gpio_poll_timer_interrupt,
-
IRQF_SHARED | IRQF_DISABLED
,"gpio poll", &alarmlist)) {
+
SA_SHIRQ | SA_INTERRUPT
,"gpio poll", &alarmlist)) {
printk("err: timer0 irq for gpio\n");
}
if (request_irq(GEN_IO_INTR_VECT, gpio_pa_interrupt,
printk("err: timer0 irq for gpio\n");
}
if (request_irq(GEN_IO_INTR_VECT, gpio_pa_interrupt,
-
IRQF_SHARED | IRQF_DISABLED
,"gpio PA", &alarmlist)) {
+
SA_SHIRQ | SA_INTERRUPT
,"gpio PA", &alarmlist)) {
printk("err: PA irq for gpio\n");
}
/* enable the gio and timer irq in global config */
printk("err: PA irq for gpio\n");
}
/* enable the gio and timer irq in global config */