diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-07 18:05:36 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 18:05:36 -0400 |
| commit | 17f545ca1769e268e0190d88ab94dc2a117df280 (patch) | |
| tree | 34b06d75d4c95823f7dbb0017142e5b59cd88f1b /arch/mn10300/unit-asb2305/pci.c | |
| parent | 2d403f7b198163d14a37ab79de33e27e390bb3b1 (diff) | |
| parent | 8341613afbc8d65bca8c81158edfb49f36b7ad92 (diff) | |
Merge branch 'dts-fixes-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/fixes
Diffstat (limited to 'arch/mn10300/unit-asb2305/pci.c')
| -rw-r--r-- | arch/mn10300/unit-asb2305/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index 1adcf024bb9a..e37fac0461f3 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/irq.h> | ||
| 22 | #include "pci-asb2305.h" | 23 | #include "pci-asb2305.h" |
| 23 | 24 | ||
| 24 | unsigned int pci_probe = 1; | 25 | unsigned int pci_probe = 1; |