diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2005-09-06 15:18:59 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:52 -0700 |
| commit | aba5a4c055dde13a3cece53e1b4b060294d631ed (patch) | |
| tree | d86bb5e2422cc2de92e15356a261b831bb34c20a /drivers/input/keyboard | |
| parent | [PATCH] mmc: conditional scr sysfs entry (diff) | |
| download | linux-dev-aba5a4c055dde13a3cece53e1b4b060294d631ed.tar.xz linux-dev-aba5a4c055dde13a3cece53e1b4b060294d631ed.zip | |
[PATCH] Corgi Keyboard: Fix a couple of compile errors
Fix a couple of compile errors in the corgi keyboard driver.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/corgikbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c index 7719bdfa9eea..a31c3d64af32 100644 --- a/drivers/input/keyboard/corgikbd.c +++ b/drivers/input/keyboard/corgikbd.c @@ -235,7 +235,7 @@ static void corgikbd_hinge_timer(unsigned long data) unsigned long gprr; unsigned long flags; - gprr = read_scoop_reg(SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB); + gprr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB); if (gprr != sharpsl_hinge_state) { hinge_count = 0; sharpsl_hinge_state = gprr; @@ -267,7 +267,7 @@ static int __init corgikbd_probe(struct device *dev) dev_set_drvdata(dev,corgikbd); strcpy(corgikbd->phys, "corgikbd/input0"); - spin_lock_init(corgikbd->lock); + spin_lock_init(&corgikbd->lock); /* Init Keyboard rescan timer */ init_timer(&corgikbd->timer); |