diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 18:55:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 18:55:49 -0500 |
| commit | d7906de1d774ca70d696d3047223bb3e5e759d92 (patch) | |
| tree | 6065caea25668f9fd33c23a24047cecb2c5b5cd7 /drivers/pcmcia/ti113x.h | |
| parent | fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 (diff) | |
| parent | 725a6abfe37025975c125ace1c7da35f27ce5384 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Diffstat (limited to 'drivers/pcmcia/ti113x.h')
| -rw-r--r-- | drivers/pcmcia/ti113x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h index 539b5cd1a598..d5b4ff74462e 100644 --- a/drivers/pcmcia/ti113x.h +++ b/drivers/pcmcia/ti113x.h | |||
| @@ -873,7 +873,7 @@ static int ti1250_override(struct yenta_socket *socket) | |||
| 873 | * Some fixup code to make everybody happy (TM). | 873 | * Some fixup code to make everybody happy (TM). |
| 874 | */ | 874 | */ |
| 875 | 875 | ||
| 876 | #ifdef CONFIG_CARDBUS | 876 | #ifdef CONFIG_YENTA_ENE_TUNE |
| 877 | /** | 877 | /** |
| 878 | * set/clear various test bits: | 878 | * set/clear various test bits: |
| 879 | * Defaults to clear the bit. | 879 | * Defaults to clear the bit. |
| @@ -937,7 +937,7 @@ static int ene_override(struct yenta_socket *socket) | |||
| 937 | } | 937 | } |
| 938 | #else | 938 | #else |
| 939 | # define ene_override ti1250_override | 939 | # define ene_override ti1250_override |
| 940 | #endif | 940 | #endif /* !CONFIG_YENTA_ENE_TUNE */ |
| 941 | 941 | ||
| 942 | #endif /* _LINUX_TI113X_H */ | 942 | #endif /* _LINUX_TI113X_H */ |
| 943 | 943 | ||