git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin'
[pandora-kernel.git]
/
drivers
/
input
/
serio
/
i8042-io.h
diff --git
a/drivers/input/serio/i8042-io.h
b/drivers/input/serio/i8042-io.h
index
9a92216
..
847f4aa
100644
(file)
--- a/
drivers/input/serio/i8042-io.h
+++ b/
drivers/input/serio/i8042-io.h
@@
-25,7
+25,7
@@
#elif defined(__arm__)
/* defined in include/asm-arm/arch-xxx/irqs.h */
#include <asm/irq.h>
#elif defined(__arm__)
/* defined in include/asm-arm/arch-xxx/irqs.h */
#include <asm/irq.h>
-#elif defined(CONFIG_S
UPERH64
)
+#elif defined(CONFIG_S
H_CAYMAN
)
#include <asm/irq.h>
#else
# define I8042_KBD_IRQ 1
#include <asm/irq.h>
#else
# define I8042_KBD_IRQ 1
@@
-67,25
+67,22
@@
static inline int i8042_platform_init(void)
* On some platforms touching the i8042 data register region can do really
* bad things. Because of this the region is always reserved on such boxes.
*/
* On some platforms touching the i8042 data register region can do really
* bad things. Because of this the region is always reserved on such boxes.
*/
-#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64)
- if (!request_region(I8042_DATA_REG, 16, "i8042"))
- return -EBUSY;
-#endif
-
- i8042_reset = 1;
-
-#if defined(CONFIG_PPC64)
+#if defined(CONFIG_PPC)
if (check_legacy_ioport(I8042_DATA_REG))
if (check_legacy_ioport(I8042_DATA_REG))
- return -EBUSY;
+ return -ENODEV;
+#endif
+#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__)
if (!request_region(I8042_DATA_REG, 16, "i8042"))
return -EBUSY;
#endif
if (!request_region(I8042_DATA_REG, 16, "i8042"))
return -EBUSY;
#endif
+
+ i8042_reset = 1;
return 0;
}
static inline void i8042_platform_exit(void)
{
return 0;
}
static inline void i8042_platform_exit(void)
{
-#if !defined(__sh__) && !defined(__alpha__)
&& !defined(CONFIG_PPC64)
+#if !defined(__sh__) && !defined(__alpha__)
release_region(I8042_DATA_REG, 16);
#endif
}
release_region(I8042_DATA_REG, 16);
#endif
}