diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:48:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:48:07 +1100 |
| commit | b6a9f0e3ba8c158505f97e613f1a665a7aa6974b (patch) | |
| tree | 531fd9e703e6104ef45736a97703dae9b42bd7bc /arch/arm/mach-davinci/common.c | |
| parent | 36a71789f61edc2ad31b2d09c579c583570ec13a (diff) | |
| parent | 511f15c134ef4c026fc7bb61635bd1661520fe39 (diff) | |
Merge remote branch 'davinci/davinci-next'
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
| -rw-r--r-- | arch/arm/mach-davinci/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index c2de94cde56a..94f27cbcd55a 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -11,13 +11,13 @@ #include <linux/module.h> #include <linux/io.h> #include <linux/etherdevice.h> +#include <linux/davinci_emac.h> #include <asm/tlb.h> #include <asm/mach/map.h> #include <mach/common.h> #include <mach/cputype.h> -#include <mach/emac.h> #include "clock.h" |