pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI
PATCH 1/1 pacmcia:yena_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.
--- drivers/pcmcia/yenta_socket.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
drivers/pcmcia/yenta_socket.c +6 -8
@@ -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 };
Signature · 1 line
1.6.5.2.180.gc5b3e
Dominik Brodowski
maintainerApplied (see below), thanks.
Best,
Dominik
From: Justin P. Mattock <[email protected]>
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.
drivers/pcmcia/yenta_socket.c +6 -8
@@ -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 };
Quoted 41 lines · Dominik Brodowski
Applied (see below), thanks.
Best,
DominikFrom: Justin P. Mattock<[email protected]>
Date: Thu, 20 May 2010 13:40:02 -0700
Subject: [PATCH] pcmcia:yenta_socket.cRemove extra #ifdefCONFIG_YENTA_TISeems pointless to have two #ifdef's with the same
CONFIG_YENTA_TI.. Remove the extra one and moveCARDBUS_TYPE_ENEwith the others.[[email protected]: spelling& whitespace fixes]Signed-off-by Justin P. Mattock<[email protected]>Signed-off-by Dominik Brodowski<[email protected]>drivers/pcmcia/yenta_socket.c +6
-1@@ -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
drivers/pcmcia/yenta_socket.c static struct cardbus_type cardbus_type[] = { · line 913
Quoted 10 lines
drivers/pcmcia/yenta_socket.c +0
-7- [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