Merge branch 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  arch/i386/* fs/* ipc/*: mark variables with uninitialized_var()
  drivers/*: mark variables with uninitialized_var()

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 7b0839426e18..9e0adfe27c12 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4466,10 +4466,10 @@ static void cy_hangup(struct tty_struct *tty)
 static int __devinit cy_init_card(struct cyclades_card *cinfo)
 {
         struct cyclades_port *info;
-        u32 mailbox;
+        u32 uninitialized_var(mailbox);
         unsigned int nports;
         unsigned short chip_number;
-        int index, port;
+        int uninitialized_var(index), port;
 
         spin_lock_init(&cinfo->card_lock);