projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
drivers
/
char
/
vr41xx_giu.c
diff --git
a/drivers/char/vr41xx_giu.c
b/drivers/char/vr41xx_giu.c
index
05e6e81
..
8e79493
100644
(file)
--- a/
drivers/char/vr41xx_giu.c
+++ b/
drivers/char/vr41xx_giu.c
@@
-33,6
+33,7
@@
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/vr41xx/giu.h>
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/vr41xx/giu.h>
+#include <asm/vr41xx/irq.h>
#include <asm/vr41xx/vr41xx.h>
MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
#include <asm/vr41xx/vr41xx.h>
MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
@@
-220,7
+221,7
@@
static struct hw_interrupt_type giuint_high_irq_type = {
.end = end_giuint_high_irq,
};
.end = end_giuint_high_irq,
};
-static int giu_get_irq(unsigned int irq
, struct pt_regs *regs
)
+static int giu_get_irq(unsigned int irq)
{
uint16_t pendl, pendh, maskl, maskh;
int i;
{
uint16_t pendl, pendh, maskl, maskh;
int i;
@@
-605,7
+606,7
@@
static int gpio_release(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-static struct file_operations gpio_fops = {
+static
const
struct file_operations gpio_fops = {
.owner = THIS_MODULE,
.read = gpio_read,
.write = gpio_write,
.owner = THIS_MODULE,
.read = gpio_read,
.write = gpio_write,
@@
-689,9
+690,9
@@
static int __devinit giu_probe(struct platform_device *dev)
for (i = GIU_IRQ_BASE; i <= GIU_IRQ_LAST; i++) {
if (i < GIU_IRQ(GIUINT_HIGH_OFFSET))
for (i = GIU_IRQ_BASE; i <= GIU_IRQ_LAST; i++) {
if (i < GIU_IRQ(GIUINT_HIGH_OFFSET))
- irq_desc[i].
handler
= &giuint_low_irq_type;
+ irq_desc[i].
chip
= &giuint_low_irq_type;
else
else
- irq_desc[i].
handler
= &giuint_high_irq_type;
+ irq_desc[i].
chip
= &giuint_high_irq_type;
}
return cascade_irq(GIUINT_IRQ, giu_get_irq);
}
return cascade_irq(GIUINT_IRQ, giu_get_irq);