From: Rob Herring <rob.herring@calxeda.com>
Date: Thu, 7 Nov 2013 16:34:46 +0000 (-0600)
Subject: Merge remote-tracking branch 'grant/devicetree/next' into for-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branch 'grant/devicetree/next' into for-next
---

b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24
diff --cc drivers/of/of_pci_irq.c
index d86076431af6,8e92acd8253f..8736bc7676c5
--- a/drivers/of/of_pci_irq.c
+++ b/drivers/of/of_pci_irq.c
@@@ -2,9 -2,10 +2,9 @@@
  #include <linux/of_pci.h>
  #include <linux/of_irq.h>
  #include <linux/export.h>
 -#include <asm/prom.h>
  
  /**
-  * of_irq_map_pci - Resolve the interrupt for a PCI device
+  * of_irq_parse_pci - Resolve the interrupt for a PCI device
   * @pdev:       the device whose interrupt is to be resolved
   * @out_irq:    structure of_irq filled by this function
   *