NAND: Fix integer overflow in ONFI detection of chips >= 4GiB

[people/ms/u-boot.git] / include / i8042.h

diff --git a/include/i8042.h b/include/i8042.h
index 61c9da2ea152dcc44b87d70dfa276448c2a5f0b2..13952899bae08550183381c5cc1c77994e5d5794 100644 (file)
--- a/include/i8042.h
+++ b/include/i8042.h
@@ -26,11 +26,18 @@
 #ifndef _I8042_H_
 #define _I8042_H_
 
+#ifdef __I386__
+#include <common.h>
+#include <asm/io.h>
+#define in8(p) inb(p)
+#define out8(p,v) outb(v,p)
+#endif
+
 /* defines */
 
-#define I8042_DATA_REG      (CFG_ISA_IO + 0x0060)    /* keyboard i/o buffer */
-#define I8042_STATUS_REG    (CFG_ISA_IO + 0x0064)    /* keyboard status read */
-#define I8042_COMMAND_REG   (CFG_ISA_IO + 0x0064)    /* keyboard ctrl write */
+#define I8042_DATA_REG      (CONFIG_SYS_ISA_IO + 0x0060)    /* keyboard i/o buffer */
+#define I8042_STATUS_REG    (CONFIG_SYS_ISA_IO + 0x0064)    /* keyboard status read */
+#define I8042_COMMAND_REG   (CONFIG_SYS_ISA_IO + 0x0064)    /* keyboard ctrl write */
 
 #define KBD_US              0        /* default US layout */
 #define KBD_GER             1        /* german layout */