diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 17:09:09 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 17:09:09 +0200 |
| commit | 0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch) | |
| tree | 29cec0edf3acf18c6978b750a8d6560f445df6df /arch/blackfin/mach-bf548/boards/ezkit.c | |
| parent | x86: move dir es7000 to es7000_32.c (diff) | |
| parent | Split up PIT part of TSC calibration from native_calibrate_tsc (diff) | |
| download | linux-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.tar.xz linux-0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1.zip | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/ezkit.c')
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 0d6333ada1d9..39357693046d 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c @@ -48,7 +48,7 @@ #include <asm/nand.h> #include <asm/dpmc.h> #include <asm/portmux.h> -#include <asm/mach/bf54x_keys.h> +#include <mach/bf54x_keys.h> #include <linux/input.h> #include <linux/spi/ad7877.h> @@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init); #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) -#include <asm/mach/bf54x-lq043.h> +#include <mach/bf54x-lq043.h> static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { .width = 480, |