* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits) ARM: ux500: update defconfig ARM: u300: update defconfig ARM: at91: enable additional boards in existing soc defconfig files ARM: at91: refresh soc defconfig files for 3.2 ARM: at91: rename defconfig files appropriately ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module ARM: OMAP2+: Remove empty io.h ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is defined ARM: OMAP: smartreflex: fix IRQ handling bug ARM: OMAP: PM: only register TWL with voltage layer when device is present ARM: OMAP: hwmod: Fix the addr space, irq, dma count APIs arm: mx28: fix bit operation in clock setting ARM: imx: export imx_ioremap ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 code ARM: mx5: Fix checkpatch warnings in cpu-imx5.c MAINTAINERS: Add missing directory ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35' ARM: imx6q: move clock register map to machine_desc.map_io ARM: pxa168/gplugd: add the correct SSP device ARM: Update mach-types to fix mxs build breakage ...
Showing the changes to include (1 of 71 files). Show all
Unified · Split
| @@ -307,15 +307,8 @@ struct omap_dss_board_info { · 306 unmodified lines | ||
| 307 | 307 | void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask); |
| 308 | 308 | }; |
| 309 | 309 | |
| 310 | −#if defined(CONFIG_OMAP2_DSS_MODULE) || defined(CONFIG_OMAP2_DSS) | |
| 311 | 310 | /* Init with the board info */ |
| 312 | 311 | extern int omap_display_init(struct omap_dss_board_info *board_data); |
| 313 | −#else | |
| 314 | −static inline int omap_display_init(struct omap_dss_board_info *board_data) | |
| 315 | −{ | |
| 316 | − return 0; | |
| 317 | −} | |
| 318 | −#endif | |
| 319 | 312 | |
| 320 | 313 | struct omap_display_platform_data { |
| 321 | 314 | struct omap_dss_board_info *board_data; |