diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:55:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:55:07 -0400 |
| commit | f39548a6ad1dbdfaab552419386ec5bb1d76fa0d (patch) | |
| tree | c8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49 /drivers/ide | |
| parent | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (diff) | |
| parent | 417e1494fd70715b737428cc3c3d924255f22ba1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
pcmcia: ide-cs: Remove outdated comment
pcmcia: fix cisinfo_t removal
pcmcia: fix return value in cm4000_cs.c
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/legacy/ide-cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index fc53dcfbfe38..27b1e0b7ecb4 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -66,8 +66,6 @@ MODULE_LICENSE("Dual MPL/GPL"); | |||
| 66 | #ifdef CONFIG_PCMCIA_DEBUG | 66 | #ifdef CONFIG_PCMCIA_DEBUG |
| 67 | INT_MODULE_PARM(pc_debug, 0); | 67 | INT_MODULE_PARM(pc_debug, 0); |
| 68 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) | 68 | #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) |
| 69 | /*static char *version = | ||
| 70 | "ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/ | ||
| 71 | #else | 69 | #else |
| 72 | #define DEBUG(n, args...) | 70 | #define DEBUG(n, args...) |
| 73 | #endif | 71 | #endif |