diff options
Diffstat (limited to 'arch/arm/boards/phytec-phycore-omap4460/board.c')
| -rw-r--r-- | arch/arm/boards/phytec-phycore-omap4460/board.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c index 9e8b9e56a7..2a176f156e 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/board.c +++ b/arch/arm/boards/phytec-phycore-omap4460/board.c @@ -9,22 +9,21 @@ #include <io.h> #include <envfs.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-devices.h> -#include <mach/omap4-clock.h> -#include <mach/omap-fb.h> -#include <mach/sdrc.h> -#include <mach/sys_info.h> -#include <mach/syslib.h> -#include <mach/control.h> +#include <asm/mach-types.h> +#include <mach/omap/devices.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-devices.h> +#include <mach/omap/omap4-clock.h> +#include <mach/omap/sdrc.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/syslib.h> +#include <mach/omap/control.h> #include <linux/err.h> #include <linux/sizes.h> -#include <partition.h> #include <nand.h> #include <asm/mmu.h> -#include <mach/gpmc.h> -#include <mach/gpmc_nand.h> +#include <mach/omap/gpmc.h> +#include <mach/omap/gpmc_nand.h> #include <i2c/i2c.h> static int pcm049_console_init(void) @@ -292,8 +291,7 @@ static int pcm049_devices_init(void) armlinux_set_architecture(MACH_TYPE_PCM049); - if (IS_ENABLED(CONFIG_DRIVER_VIDEO_OMAP)) - omap_add_display(&pcm049_fb_data); + omap_add_display(&pcm049_fb_data); if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) defaultenv_append_directory(defaultenv_phytec_phycore_omap4460); |