Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / include / linux / kd.h

diff --git a/include/linux/kd.h b/include/linux/kd.h
index c91fc0c..c36d847 100644 (file)
--- a/include/linux/kd.h
+++ b/include/linux/kd.h
@@ -81,6 +81,7 @@ struct unimapinit {
 #define                K_XLATE         0x01
 #define                K_MEDIUMRAW     0x02
 #define                K_UNICODE       0x03
+#define                K_OFF           0x04
 #define KDGKBMODE      0x4B44  /* gets current keyboard mode */
 #define KDSKBMODE      0x4B45  /* sets current keyboard mode */
 
@@ -126,7 +127,7 @@ struct kbdiacrs {
 #define KDSKBDIACR      0x4B4B  /* write kernel accent table */
 
 struct kbdiacruc {
-        __u32 diacr, base, result;
+       unsigned int diacr, base, result;
 };
 struct kbdiacrsuc {
         unsigned int kb_cnt;    /* number of entries in following array */