diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /drivers/video/bf54x-lq043fb.c | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'drivers/video/bf54x-lq043fb.c')
| -rw-r--r-- | drivers/video/bf54x-lq043fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 6d5aa806777e..7644ed249564 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | #include <asm/gpio.h> | 58 | #include <asm/gpio.h> |
| 59 | #include <asm/portmux.h> | 59 | #include <asm/portmux.h> |
| 60 | 60 | ||
| 61 | #include <asm/mach/bf54x-lq043.h> | 61 | #include <mach/bf54x-lq043.h> |
| 62 | 62 | ||
| 63 | #define NO_BL_SUPPORT | 63 | #define NO_BL_SUPPORT |
| 64 | 64 | ||