summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorGuanXuetao2011-02-25 10:58:00 +0100
committerGuanXuetao2011-03-17 02:19:19 +0100
commit4517366d870b89d6fb8c0c90deb6c73d975908af (patch)
tree5713def7a814a21ea1922c8182ed94a54920af83 /drivers/input/serio
parentunicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call (diff)
downloadkernel-qcow2-linux-4517366d870b89d6fb8c0c90deb6c73d975908af.tar.gz
kernel-qcow2-linux-4517366d870b89d6fb8c0c90deb6c73d975908af.tar.xz
kernel-qcow2-linux-4517366d870b89d6fb8c0c90deb6c73d975908af.zip
unicore32 i8042 upgrade and bugfix: adjust resource request region type
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/i8042-unicore32io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
index 2cdd8726446f..620b040b81b0 100644
--- a/drivers/input/serio/i8042-unicore32io.h
+++ b/drivers/input/serio/i8042-unicore32io.h
@@ -58,7 +58,7 @@ static inline void i8042_write_command(int val)
static inline int i8042_platform_init(void)
{
- if (!request_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
+ if (!request_mem_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
return -EBUSY;
i8042_reset = 1;
@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
static inline void i8042_platform_exit(void)
{
- release_region(I8042_REGION_START, I8042_REGION_SIZE);
+ release_mem_region(I8042_REGION_START, I8042_REGION_SIZE);
}
#endif /* _I8042_UNICORE32_H */