This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / input / serio / i8042-io.h

diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 0d5716a..b567c11 100644 (file)
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -35,7 +35,6 @@
 # define I8042_AUX_IRQ 12
 #endif
 
-
 /*
  * Register numbers.
  */
@@ -97,7 +96,7 @@ static inline int i8042_platform_init(void)
  * 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.
  */
-#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__) && !defined(__mips__) && !defined (CONFIG_PPC64)
+#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__) && !defined(__mips__)
        if (!request_region(I8042_DATA_REG, 16, "i8042"))
                return -1;
 #endif
@@ -111,18 +110,12 @@ static inline int i8042_platform_init(void)
                i8042_noloop = 1;
 #endif
 
-#if defined(CONFIG_PPC64)
-       if (check_legacy_ioport(I8042_DATA_REG))
-               return -1;
-       if (!request_region(I8042_DATA_REG, 16, "i8042"))
-               return -1;
-#endif
        return 0;
 }
 
 static inline void i8042_platform_exit(void)
 {
-#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__) && !defined(CONFIG_PPC64)
+#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__)
        release_region(I8042_DATA_REG, 16);
 #endif
 }