From e006bacab59c10ba31ae17af27cd6d1c7dd116eb Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 11 Aug 2011 14:04:35 -0700 Subject: Fix compiler warnings generated by gcc 4.6 (local only). The newer compiler version is more thorough in detecting code inconsistencies, and reports warnings in many cases when building u-boot for kaen and alex. This change modifies the not yet upstreamed files to get rid of the warnings. There supposed to be no logical changes, so no testing other than building the system is being done. BUG=chromium-os:18862 TEST=manual . run the following commands emerge-tegra2_kaen chromeos-u-boot emerge-x86-alex chromeos-u-boot . observe them succeed Change-Id: I7b8f3e7211007537f9e85cfd059174dbb9763bb4 Signed-off-by: Vadim Bendebury Reviewed-on: http://gerrit.chromium.org/gerrit/5771 Reviewed-by: Simon Glass --- drivers/input/tegra-kbc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index f8d7d4202e6..0833fc42c3b 100755 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -85,6 +85,9 @@ u8 *kbc_ctrl_keycode; #ifdef CONFIG_OF_CONTROL struct fdt_kbc config; /* Our keyboard config */ +#if (FDT_KBC_KEY_COUNT) != (KBC_KEY_COUNT) +#error definition mismatch +#endif #endif static int tegra_kbc_keycode(int r, int c, int modifier) @@ -535,7 +538,7 @@ int drv_keyboard_init(void) return node; if (fdt_decode_kbc(gd->blob, node, &config)) return -1; - assert(FDT_KBC_KEY_COUNT == KBC_KEY_COUNT); + kbc_plain_keycode = config.plain_keycode; kbc_shift_keycode = config.shift_keycode; kbc_fn_keycode = config.fn_keycode; -- cgit v1.2.3