projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
[powerpc.git]
/
drivers
/
pcmcia
/
pd6729.c
diff --git
a/drivers/pcmcia/pd6729.c
b/drivers/pcmcia/pd6729.c
index
360c248
..
abc10fe
100644
(file)
--- a/
drivers/pcmcia/pd6729.c
+++ b/
drivers/pcmcia/pd6729.c
@@
-58,7
+58,7
@@
MODULE_AUTHOR("Jun Komuro <komurojun-mbn@nifty.com>");
static int irq_mode = 1; /* 0 = ISA interrupt, 1 = PCI interrupt */
static int irq_list[16];
static int irq_mode = 1; /* 0 = ISA interrupt, 1 = PCI interrupt */
static int irq_list[16];
-static int irq_list_count = 0;
+static
unsigned
int irq_list_count = 0;
module_param(irq_mode, int, 0444);
module_param_array(irq_list, int, &irq_list_count, 0444);
module_param(irq_mode, int, 0444);
module_param_array(irq_list, int, &irq_list_count, 0444);
@@
-682,7
+682,7
@@
static int __devinit pd6729_pci_probe(struct pci_dev *dev,
socket[i].socket.ops = &pd6729_operations;
socket[i].socket.resource_ops = &pccard_nonstatic_ops;
socket[i].socket.ops = &pd6729_operations;
socket[i].socket.resource_ops = &pccard_nonstatic_ops;
- socket[i].socket.dev.
dev
= &dev->dev;
+ socket[i].socket.dev.
parent
= &dev->dev;
socket[i].socket.driver_data = &socket[i];
}
socket[i].socket.driver_data = &socket[i];
}