diff options
author | 2006-12-07 15:48:15 -0500 | |
---|---|---|
committer | 2006-12-07 15:48:15 -0500 | |
commit | 34161db6b14d984fb9b06c735b7b42f8803f6851 (patch) | |
tree | 99656278b6697f1cde5b05894b7c0ee22c63a00e /drivers/char/sonypi.c | |
parent | SUNRPC: Remove pprintk() from net/sunrpc/xprt.c (diff) | |
parent | [PATCH] A few small additions and corrections to README (diff) | |
download | linux-dev-34161db6b14d984fb9b06c735b7b42f8803f6851.tar.xz linux-dev-34161db6b14d984fb9b06c735b7b42f8803f6851.zip |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts:
include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
Diffstat (limited to 'drivers/char/sonypi.c')
-rw-r--r-- | drivers/char/sonypi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index c084149153de..fc87070f1866 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -765,7 +765,7 @@ static void sonypi_setbluetoothpower(u8 state) sonypi_device.bluetooth_power = state; } -static void input_keyrelease(void *data) +static void input_keyrelease(struct work_struct *work) { struct sonypi_keypress kp; @@ -1412,7 +1412,7 @@ static int __devinit sonypi_probe(struct platform_device *dev) goto err_inpdev_unregister; } - INIT_WORK(&sonypi_device.input_work, input_keyrelease, NULL); + INIT_WORK(&sonypi_device.input_work, input_keyrelease); } sonypi_enable(0); |