diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 16:24:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 16:24:39 -0400 |
| commit | 42c59208219a2d43f0dde94bebc68c20b95b13ce (patch) | |
| tree | ff20941f83a92ffb4224c95ddee9b7eb225ed958 /drivers/ide | |
| parent | dddec01eb8e2b56267b37a6f9f0997a64b4e0b2a (diff) | |
| parent | 727c6742c29e46177951fdc8f6758085e03bb981 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (23 commits)
pcmcia: Fix ide-cs sparse warning
pcmcia: ide-cs debugging bugfix
pcmcia: allow for longer CIS firmware files
pcmcia: cm40x0 cdev lock_kernel() pushdown
pcmcia: (re)move {pcmcia,pccard}_get_status
pcmcia: kill IN_CARD_SERVICES
pcmcia: Remove unused header file code
pcmcia: remove unused bulkmem.h
pcmcia: simplify pccard_validate_cis
pcmcia: carve out ioctl adjust function to pcmcia_ioctl
pcmcia: irq probe can be done without risking an IRQ storm
pcmcia: Fix ti12xx_2nd_slot_empty always failing
pcmcia: check for pointer instead of pointer address
pcmcia: switch cm4000_cs.c to unlocked_ioctl
pcmcia: simplify rsrc_nonstatic attributes
pcmcia: add support CompactFlash PCMCIA support for Blackfin.
pcmcia: remove version.h
pcmcia: cs: kill thread_wait
pcmcia: i82365.c: check request_irq return value
pcmcia: fix Alchemy warnings
...
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/legacy/ide-cs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 3381424d70a1..8dbf4d9b6447 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -63,11 +63,11 @@ MODULE_LICENSE("Dual MPL/GPL"); | |||
| 63 | 63 | ||
| 64 | #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0) | 64 | #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0) |
| 65 | 65 | ||
| 66 | #ifdef PCMCIA_DEBUG | 66 | #ifdef CONFIG_PCMCIA_DEBUG |
| 67 | INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); | 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 = | 69 | /*static char *version = |
| 70 | "ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)"; | 70 | "ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/ |
| 71 | #else | 71 | #else |
| 72 | #define DEBUG(n, args...) | 72 | #define DEBUG(n, args...) |
| 73 | #endif | 73 | #endif |
| @@ -375,7 +375,7 @@ failed: | |||
| 375 | 375 | ||
| 376 | ======================================================================*/ | 376 | ======================================================================*/ |
| 377 | 377 | ||
| 378 | void ide_release(struct pcmcia_device *link) | 378 | static void ide_release(struct pcmcia_device *link) |
| 379 | { | 379 | { |
| 380 | ide_info_t *info = link->priv; | 380 | ide_info_t *info = link->priv; |
| 381 | ide_hwif_t *hwif = info->hwif; | 381 | ide_hwif_t *hwif = info->hwif; |