Prev: [tip:perf/core] tracepoints: Add check trace callback type
Next: perf, trace: Remove IRQ-disable from perf/tracepoint interaction
From: Justin P. Mattock on 21 May 2010 13:30
On 05/21/2010 06:18 AM, Dominik Brodowski wrote:
> Applied (see below), thanks.
>
> Best,
> Dominik
>
> From: Justin P. Mattock<justinmattock(a)gmail.com>
> Date: Thu, 20 May 2010 13:40:02 -0700
> Subject: [PATCH] pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
>
> Seems pointless to have two #ifdef's with the same
> CONFIG_YENTA_TI.. Remove the extra one and
> move CARDBUS_TYPE_ENE with the others.
>
> [linux(a)dominikbrodowski.net: spelling& whitespace fixes]
> Signed-off-by: Justin P. Mattock<justinmattock(a)gmail.com>
> Signed-off-by: Dominik Brodowski<linux(a)dominikbrodowski.net>
>
> diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
> index 6bf8b2c..f1d4137 100644
> --- a/drivers/pcmcia/yenta_socket.c
> +++ b/drivers/pcmcia/yenta_socket.c
> @@ -880,6 +880,12 @@ static struct cardbus_type cardbus_type[] = {
> .restore_state = ti_restore_state,
> .sock_init = ti_init,
> },
> + [CARDBUS_TYPE_ENE] = {
> + .override = ene_override,
> + .save_state = ti_save_state,
> + .restore_state = ti_restore_state,
> + .sock_init = ti_init,
> + },
> #endif
> #ifdef CONFIG_YENTA_RICOH
> [CARDBUS_TYPE_RICOH] = {
> @@ -902,14 +908,6 @@ static struct cardbus_type cardbus_type[] = {
> .restore_state = o2micro_restore_state,
> },
> #endif
> -#ifdef CONFIG_YENTA_TI
> - [CARDBUS_TYPE_ENE] = {
> - .override = ene_override,
> - .save_state = ti_save_state,
> - .restore_state = ti_restore_state,
> - .sock_init = ti_init,
> - },
> -#endif
> };
>
>
>
>


cool..

As for the problem with
pcmcia, I've my machine ready to take anything
but am in no real hurry with it(was more curious
how 2.6.34 ran on the old beast of a machine).

I'll go and send the bug report to Raphael
so he can add it to the list of regressions,
then down the line if something comes up
I can test it out or something..

Justin P. Mattock
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [tip:perf/core] tracepoints: Add check trace callback type
Next: perf, trace: Remove IRQ-disable from perf/tracepoint interaction