diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:30:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:30:29 -0800 |
| commit | 115b2ce1c3b974e43e45fa6c9e20cd7271a01dff (patch) | |
| tree | 9a883fb4d84713f142c4e003fead92381c11b6c2 /drivers/input/misc | |
| parent | dd49f96777d5a72d5591ac2112d4ac940391774e (diff) | |
| parent | 5fc4e6e197c7e377f1c8ebec727d40df983aceed (diff) | |
| download | kernel-crypto-115b2ce1c3b974e43e45fa6c9e20cd7271a01dff.tar.gz kernel-crypto-115b2ce1c3b974e43e45fa6c9e20cd7271a01dff.tar.xz kernel-crypto-115b2ce1c3b974e43e45fa6c9e20cd7271a01dff.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/wistron_btns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index a05b8557842..4b415d9b012 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c @@ -92,11 +92,11 @@ static void call_bios(struct regs *regs) preempt_enable(); } -static size_t __init locate_wistron_bios(void __iomem *base) +static ssize_t __init locate_wistron_bios(void __iomem *base) { static const unsigned char __initdata signature[] = { 0x42, 0x21, 0x55, 0x30 }; - size_t offset; + ssize_t offset; for (offset = 0; offset < 0x10000; offset += 0x10) { if (check_signature(base + offset, signature, @@ -109,7 +109,7 @@ static size_t __init locate_wistron_bios(void __iomem *base) static int __init map_bios(void) { void __iomem *base; - size_t offset; + ssize_t offset; u32 entry_point; base = ioremap(0xF0000, 0x10000); /* Can't fail */ |