Re: [PATCH v2 2/2] omap: RX-51: enable tsc2005

[Kalle Valo]

Aaro Koskinen <aaro.koskinen@xxxxxxxxx> writes:

>> 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?
>
> I can resend/rebase this patch once the wl1251 patch is integrated.

Ok, thanks. I'll resend the wl1251 patch just to be sure that it
doesn't get lost.

> BTW, check the comment from Tommi Rantala - spi_board_info can be marked
> with __initdata.

I'll add it to my patch.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/