git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bkl-removal' into next
[pandora-kernel.git]
/
drivers
/
ide
/
legacy
/
ide-cs.c
diff --git
a/drivers/ide/legacy/ide-cs.c
b/drivers/ide/legacy/ide-cs.c
index
3381424
..
8dbf4d9
100644
(file)
--- a/
drivers/ide/legacy/ide-cs.c
+++ b/
drivers/ide/legacy/ide-cs.c
@@
-63,11
+63,11
@@
MODULE_LICENSE("Dual MPL/GPL");
#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0)
#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0)
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug,
PCMCIA_DEBUG
);
+#ifdef
CONFIG_
PCMCIA_DEBUG
+INT_MODULE_PARM(pc_debug,
0
);
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
-"ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";
+
/*
static char *version =
+"ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";
*/
#else
#define DEBUG(n, args...)
#endif
#else
#define DEBUG(n, args...)
#endif
@@
-375,7
+375,7
@@
failed:
======================================================================*/
======================================================================*/
-void ide_release(struct pcmcia_device *link)
+
static
void ide_release(struct pcmcia_device *link)
{
ide_info_t *info = link->priv;
ide_hwif_t *hwif = info->hwif;
{
ide_info_t *info = link->priv;
ide_hwif_t *hwif = info->hwif;