Commit 921e8a00 authored by Andi Kleen's avatar Andi Kleen Committed by Vojtech Pavlik

Because x86-64 also always reserves the kbd region,

we must not call request_region() in i8042-io.h, like
we don't for i386, alpha, etc.
parent e93c19bc
...@@ -62,7 +62,7 @@ static inline int i8042_platform_init(void) ...@@ -62,7 +62,7 @@ static inline int i8042_platform_init(void)
* On ix86 platforms touching the i8042 data register region can do really * On ix86 platforms touching the i8042 data register region can do really
* bad things. Because of this the region is always reserved on ix86 boxes. * bad things. Because of this the region is always reserved on ix86 boxes.
*/ */
#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) #if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__)
if (!request_region(I8042_DATA_REG, 16, "i8042")) if (!request_region(I8042_DATA_REG, 16, "i8042"))
return 0; return 0;
#endif #endif
...@@ -71,7 +71,7 @@ static inline int i8042_platform_init(void) ...@@ -71,7 +71,7 @@ static inline int i8042_platform_init(void)
static inline void i8042_platform_exit(void) static inline void i8042_platform_exit(void)
{ {
#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) #if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__)
release_region(I8042_DATA_REG, 16); release_region(I8042_DATA_REG, 16);
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment