Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix dreamcast build for IRQ changes. sh: Fix clock multiplier on SH7722. sh: Wire up kdump crash kernel exec in die(). sh: sr.bl toggling around idle sleep. sh: disable genrtc support. fs: Kill sh dependency for binfmt_flat. sh: Disable psw support for R7785RP. sh: Fix page size alignment in __copy_user_page(). sh: Fix up various compile warnings for SE boards. sh: Wire up signalfd/timerfd/eventfd syscalls. sh: revert addition of page fault notifiers spelling fixes: arch/sh/ input: hp680_ts compile fixes. sh: landisk: Header cleanups. sh: landisk: rtc-rs5c313 support. sh: Kill off pmb slab cache destructor. sh: Fix up psw build rules for r7780rp. sh: Shut up compiler warnings in __do_page_fault().
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
#include <linux/input.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
#include <linux/interrupt.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/delay.h>
|
||||
@@ -18,12 +17,12 @@
|
||||
#define PHDR 0xa400012e
|
||||
#define SCPDR 0xa4000136
|
||||
|
||||
static void do_softint(void *data);
|
||||
static void do_softint(struct work_struct *work);
|
||||
|
||||
static struct input_dev *hp680_ts_dev;
|
||||
static DECLARE_WORK(work, do_softint);
|
||||
static DECLARE_DELAYED_WORK(work, do_softint);
|
||||
|
||||
static void do_softint(void *data)
|
||||
static void do_softint(struct work_struct *work)
|
||||
{
|
||||
int absx = 0, absy = 0;
|
||||
u8 scpdr;
|
||||
|
||||
Reference in New Issue
Block a user