diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-16 15:35:06 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-16 15:35:06 -0700 |
| commit | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (patch) | |
| tree | 9326c7213d5ccee556bff1831e8f88681a27e57c /include/linux/omapfb.h | |
| parent | 26638c667e645de368cd68cade716ed0faef6269 (diff) | |
| parent | 68cb700c59fae6cd539c9dc1e9f2584f671935a0 (diff) | |
| download | olio-linux-3.10-6bfc82ff589a00e5fbc12b958c649d703d273c86.tar.xz olio-linux-3.10-6bfc82ff589a00e5fbc12b958c649d703d273c86.zip | |
Merge tag 'omap-cleanup-sparseirq-for-v3.7' into devel-dt
This branch contains changes needed to make omap2+
work properly with sparse IRQ. It also removes
dependencies to mach/hardware.h. These help moving
things towards ARM single zImage support.
This branch is based on a commit in tty-next
branch with omap-devel-gpmc-fixed-for-v3.7 and
cleanup-omap-tags-for-v3.7 merged in to keep things
compiling and sort out some merge conflicts.
Conflicts:
arch/arm/mach-omap2/omap4-common.c
drivers/gpio/gpio-twl4030.c
Diffstat (limited to 'include/linux/omapfb.h')
| -rw-r--r-- | include/linux/omapfb.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 4ff57e81051..85af8184691 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -220,7 +220,12 @@ struct omapfb_display_info { #ifdef __KERNEL__ -#include <plat/board.h> +struct omap_lcd_config { + char panel_name[16]; + char ctrl_name[16]; + s16 nreset_gpio; + u8 data_lines; +}; struct omapfb_platform_data { struct omap_lcd_config lcd; |