[PATCH]pacmcia:yena_socket.c Remove extra #ifdef CONFIG_YENTA_TI

[Dominik Brodowski]

Applied (see below), thanks.

Best,
	Dominik

From: Justin P. Mattock <justinmattock at 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 at dominikbrodowski.net: spelling & whitespace fixes]
Signed-off-by: Justin P. Mattock <justinmattock at gmail.com>
Signed-off-by: Dominik Brodowski <linux at 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
 };