diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /arch/blackfin/mach-bf548/boards | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'arch/blackfin/mach-bf548/boards')
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 58abbed0a225..ce934ee174e0 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <asm/gpio.h> | 45 | #include <asm/gpio.h> |
| 46 | #include <asm/nand.h> | 46 | #include <asm/nand.h> |
| 47 | #include <asm/portmux.h> | 47 | #include <asm/portmux.h> |
| 48 | #include <asm/mach/bf54x_keys.h> | 48 | #include <mach/bf54x_keys.h> |
| 49 | #include <asm/dpmc.h> | 49 | #include <asm/dpmc.h> |
| 50 | #include <linux/input.h> | 50 | #include <linux/input.h> |
| 51 | #include <linux/spi/ad7877.h> | 51 | #include <linux/spi/ad7877.h> |
| @@ -61,7 +61,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548"; | |||
| 61 | 61 | ||
| 62 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | 62 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) |
| 63 | 63 | ||
| 64 | #include <asm/mach/bf54x-lq043.h> | 64 | #include <mach/bf54x-lq043.h> |
| 65 | 65 | ||
| 66 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 66 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
| 67 | .width = 480, | 67 | .width = 480, |
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 @@ | |||
| 48 | #include <asm/nand.h> | 48 | #include <asm/nand.h> |
| 49 | #include <asm/dpmc.h> | 49 | #include <asm/dpmc.h> |
| 50 | #include <asm/portmux.h> | 50 | #include <asm/portmux.h> |
| 51 | #include <asm/mach/bf54x_keys.h> | 51 | #include <mach/bf54x_keys.h> |
| 52 | #include <linux/input.h> | 52 | #include <linux/input.h> |
| 53 | #include <linux/spi/ad7877.h> | 53 | #include <linux/spi/ad7877.h> |
| 54 | 54 | ||
| @@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init); | |||
| 106 | 106 | ||
| 107 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | 107 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) |
| 108 | 108 | ||
| 109 | #include <asm/mach/bf54x-lq043.h> | 109 | #include <mach/bf54x-lq043.h> |
| 110 | 110 | ||
| 111 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 111 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
| 112 | .width = 480, | 112 | .width = 480, |