aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorGuanXuetao <gxt@mprc.pku.edu.cn>2011-02-25 04:58:00 -0500
committerGuanXuetao <gxt@mprc.pku.edu.cn>2011-03-16 21:19:19 -0400
commit4517366d870b89d6fb8c0c90deb6c73d975908af (patch)
tree5713def7a814a21ea1922c8182ed94a54920af83 /drivers/input/serio
parent4ef2ec63cc5117d099960c49910533e467942e27 (diff)
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 2cdd8726446..620b040b81b 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)
58 58
59static inline int i8042_platform_init(void) 59static inline int i8042_platform_init(void)
60{ 60{
61 if (!request_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042")) 61 if (!request_mem_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
62 return -EBUSY; 62 return -EBUSY;
63 63
64 i8042_reset = 1; 64 i8042_reset = 1;
@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
67 67
68static inline void i8042_platform_exit(void) 68static inline void i8042_platform_exit(void)
69{ 69{
70 release_region(I8042_REGION_START, I8042_REGION_SIZE); 70 release_mem_region(I8042_REGION_START, I8042_REGION_SIZE);
71} 71}
72 72
73#endif /* _I8042_UNICORE32_H */ 73#endif /* _I8042_UNICORE32_H */