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

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87d43ufih0.fsf@purkki.valot.fi>
Date:	Sat, 07 Nov 2009 17:43:55 +0200
From:	Kalle Valo <kalle.valo@....fi>
To:	Aaro Koskinen <aaro.koskinen@...ia.com>
Cc:	linux-input@...r.kernel.org, linux-omap@...r.kernel.org,
	linux-kernel@...r.kernel.org, dmitry.torokhov@...il.com,
	tony@...mide.com
Subject: Re: [PATCH v2 2/2] omap: RX-51: enable tsc2005

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?

-- 
Kalle Valo
--
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/