Pull dock-bay into release branch

[sfrench/cifs-2.6.git] / arch / ia64 / sn / kernel / tiocx.c

diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 493380b2c05fd1b6756ad9edb711c4992125f5e7..5a289e4de8383eb7f286ed99fe7d0d1c80c36df5 100644 (file)
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -369,7 +369,7 @@ static void tio_corelet_reset(nasid_t nasid, int corelet)
 
 static int is_fpga_tio(int nasid, int *bt)
 {
-       u16 ioboard_type;
+       u16 uninitialized_var(ioboard_type);    /* GCC be quiet */
        s64 rc;
 
        rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard_type);