From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 24 Dec 2011 01:52:43 +0000 (+0100)
Subject: merge mainline into hints
X-Git-Tag: 2.00~828^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b5c1a0810ba1dfd0f48d57e2cfb854c0e87f857;p=thirdparty%2Fgrub.git

merge mainline into hints
---

2b5c1a0810ba1dfd0f48d57e2cfb854c0e87f857
diff --cc util/ieee1275/ofpath.c
index 69319d58a,dc16bfde9..70d3a46f0
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@@ -245,10 -233,9 +245,10 @@@ of_path_of_ide(char *of_path
    p = get_basename (sysfs_path);
    sscanf(p, "%d.%d", &chan, &devno);
  
-   ret = __of_path_common(of_path, sysfs_path, device, devno);
 -  __of_path_common(of_path, sysfs_path, device, 2 * chan + devno);
++  ret = __of_path_common(of_path, sysfs_path, device, 2 * chan + devno);
  
    free (sysfs_path);
 +  return ret;
  }
  
  static int