diff options
| author | Justin P. Mattock <justinmattock@gmail.com> | 2010-05-20 13:40:02 -0700 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-06-07 18:22:57 +0200 |
| commit | 4f2d364b315191bf9f8659f7d221acdf5506a989 (patch) | |
| tree | 40ce8d366a4fa40ad9f4ca0733ed02a9050a461f | |
| parent | 02caa56e4b789b80ae7e0f0f0789f94b44ad32ef (diff) | |
| download | linux-3.10-4f2d364b315191bf9f8659f7d221acdf5506a989.tar.gz linux-3.10-4f2d364b315191bf9f8659f7d221acdf5506a989.tar.bz2 linux-3.10-4f2d364b315191bf9f8659f7d221acdf5506a989.zip | |
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: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| -rw-r--r-- | drivers/pcmcia/yenta_socket.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 6bf8b2c06c7..f1d41374eea 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 }; |