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-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
char
/
hpet.c
diff --git
a/drivers/char/hpet.c
b/drivers/char/hpet.c
index
58b0eb5
..
20dc3be
100644
(file)
--- a/
drivers/char/hpet.c
+++ b/
drivers/char/hpet.c
@@
-21,6
+21,7
@@
#include <linux/fcntl.h>
#include <linux/init.h>
#include <linux/poll.h>
#include <linux/fcntl.h>
#include <linux/init.h>
#include <linux/poll.h>
+#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/sysctl.h>
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/sysctl.h>
@@
-116,7
+117,7
@@
static inline void writeq(unsigned long long v, void __iomem *addr)
}
#endif
}
#endif
-static irqreturn_t hpet_interrupt(int irq, void *data
, struct pt_regs *regs
)
+static irqreturn_t hpet_interrupt(int irq, void *data)
{
struct hpet_dev *devp;
unsigned long isr;
{
struct hpet_dev *devp;
unsigned long isr;