Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2d364b authored by Justin P. Mattock's avatar Justin P. Mattock Committed by Dominik Brodowski
Browse files

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@dominikbrodowski.net: spelling & whitespace fixes]
Signed-off-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 02caa56e

drivers/pcmcia/yenta_socket.c

+6 −8
Original line number Diff line number Diff line
@@ -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

};