diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 15:02:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 15:02:37 +0000 |
| commit | fad837c16cdd856c68ce2e1335ad0fe836ed8ecd (patch) | |
| tree | 1a6babdc2ac7e5388c482e93505fdfaf5ff97f61 /include/media/ir-kbd-i2c.h | |
| parent | 51c6ab130642ed975681df843c772dda48a1d2ed (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
| download | kernel-crypto-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.gz kernel-crypto-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.xz kernel-crypto-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.zip | |
Merge commit 'v2.6.34-rc1' into for-2.6.35
Diffstat (limited to 'include/media/ir-kbd-i2c.h')
| -rw-r--r-- | include/media/ir-kbd-i2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h index aaf65e8b1a4..9142936603c 100644 --- a/include/media/ir-kbd-i2c.h +++ b/include/media/ir-kbd-i2c.h @@ -36,7 +36,7 @@ enum ir_kbd_get_key_fn { struct IR_i2c_init_data { struct ir_scancode_table *ir_codes; const char *name; - int type; /* IR_TYPE_RC5, IR_TYPE_PD, etc */ + u64 type; /* IR_TYPE_RC5, IR_TYPE_PD, etc */ /* * Specify either a function pointer or a value indicating one of * ir_kbd_i2c's internal get_key functions |