diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
| commit | 52cab57873c25d3c8324ee3e4d463db6e8e73fd7 (patch) | |
| tree | 826cb36827afa363944e6478d19512e669446c64 /drivers/pcmcia/ti113x.h | |
| parent | 0a75c23a009ff65f651532cecc16675d05f4de37 (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 | ||