lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 09 Nov 2009 15:29:30 +0200 From: Aaro Koskinen <aaro.koskinen@...ia.com> To: ext Kalle Valo <kalle.valo@....fi> CC: "linux-input@...r.kernel.org" <linux-input@...r.kernel.org>, "linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "dmitry.torokhov@...il.com" <dmitry.torokhov@...il.com>, "tony@...mide.com" <tony@...mide.com> Subject: Re: [PATCH v2 2/2] omap: RX-51: enable tsc2005 Hi, ext Kalle Valo wrote: > Aaro Koskinen <aaro.koskinen@...ia.com> writes: > >> Enable tsc2005 touchscreen driver on the RX-51 board. >> >> Signed-off-by: Aaro Koskinen <aaro.koskinen@...ia.com> >> --- >> >> 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@vger.kernel.org/msg17604.html > > How do we handle this? I can resend/rebase this patch once the wl1251 patch is integrated. BTW, check the comment from Tommi Rantala - spi_board_info can be marked with __initdata. A. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists