projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'jg-20061012-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...
[powerpc.git]
/
drivers
/
video
/
intelfb
/
intelfbhw.c
diff --git
a/drivers/video/intelfb/intelfbhw.c
b/drivers/video/intelfb/intelfbhw.c
index
f887f1e
..
eeeeff9
100644
(file)
--- a/
drivers/video/intelfb/intelfbhw.c
+++ b/
drivers/video/intelfb/intelfbhw.c
@@
-1952,7
+1952,7
@@
intelfbhw_cursor_reset(struct intelfb_info *dinfo) {
}
static irqreturn_t
-intelfbhw_irq(int irq, void *dev_id
, struct pt_regs *fp
) {
+intelfbhw_irq(int irq, void *dev_id) {
int handled = 0;
u16 tmp;
struct intelfb_info *dinfo = (struct intelfb_info *)dev_id;