Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 25aaeae1e830..e07b189f3ec8 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -171,7 +171,7 @@ err:
 static acpi_handle ide_acpi_hwif_get_handle(ide_hwif_t *hwif)
 {
         struct device           *dev = hwif->gendev.parent;
-        acpi_handle             dev_handle;
+        acpi_handle             uninitialized_var(dev_handle);
         acpi_integer            pcidevfn;
         acpi_handle             chan_handle;
         int                     err;