Aaro Koskinen <aaro.koskinen@xxxxxxxxx> writes:
> Enable tsc2005 touchscreen driver on the RX-51 board.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
> ---
>
> The patch is for 2.6.32-rc6.
[...]
> +static struct spi_board_info rx51_peripherals_spi_board_info[] = {
> + [0] = {
> + .modalias = "tsc2005",
> + .bus_num = 1,
> + .chip_select = 0,
> + .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),
> + .max_speed_hz = 6000000,
> + .controller_data = &tsc2005_mcspi_config,
> + .platform_data = &tsc2005_config,
> + },
> +};
I sent a wl1251 patch which adds spi_board_info and conflicts with
this patch:
http://www.mail-archive.com/linux-omap@xxxxxxxxxxxxxxx/msg17604.html
How do we handle this?
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
