aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/prom.h7
-rw-r--r--include/linux/phy.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 524629769336..39f04ef96f38 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -17,6 +17,7 @@
17 */ 17 */
18#include <linux/types.h> 18#include <linux/types.h>
19#include <linux/proc_fs.h> 19#include <linux/proc_fs.h>
20#include <linux/platform_device.h>
20#include <asm/atomic.h> 21#include <asm/atomic.h>
21 22
22/* Definitions used by the flattened device tree */ 23/* Definitions used by the flattened device tree */
@@ -331,6 +332,12 @@ extern int of_irq_map_one(struct device_node *device, int index,
331struct pci_dev; 332struct pci_dev;
332extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); 333extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
333 334
335static inline void of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
336{
337 r->start = r->end = irq_of_parse_and_map(dev, index);
338 r->flags = IORESOURCE_IRQ;
339}
340
334 341
335#endif /* __KERNEL__ */ 342#endif /* __KERNEL__ */
336#endif /* _POWERPC_PROM_H */ 343#endif /* _POWERPC_PROM_H */
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 9447a57ee8a9..892d6abe57e5 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -20,6 +20,9 @@
20 20
21#include <linux/spinlock.h> 21#include <linux/spinlock.h>
22#include <linux/device.h> 22#include <linux/device.h>
23#include <linux/ethtool.h>
24#include <linux/mii.h>
25#include <asm/irq.h>
23 26
24#define PHY_BASIC_FEATURES (SUPPORTED_10baseT_Half | \ 27#define PHY_BASIC_FEATURES (SUPPORTED_10baseT_Half | \
25 SUPPORTED_10baseT_Full | \ 28 SUPPORTED_10baseT_Full | \