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 git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
drivers
/
net
/
pch_gbe
/
pch_gbe_main.c
diff --git
a/drivers/net/pch_gbe/pch_gbe_main.c
b/drivers/net/pch_gbe/pch_gbe_main.c
index
8c66e22
..
5098684
100644
(file)
--- a/
drivers/net/pch_gbe/pch_gbe_main.c
+++ b/
drivers/net/pch_gbe/pch_gbe_main.c
@@
-2441,7
+2441,7
@@
static struct pci_error_handlers pch_gbe_err_handler = {
.resume = pch_gbe_io_resume
};
.resume = pch_gbe_io_resume
};
-static struct pci_driver pch_gbe_
pcidev
= {
+static struct pci_driver pch_gbe_
driver
= {
.name = KBUILD_MODNAME,
.id_table = pch_gbe_pcidev_id,
.probe = pch_gbe_probe,
.name = KBUILD_MODNAME,
.id_table = pch_gbe_pcidev_id,
.probe = pch_gbe_probe,
@@
-2458,7
+2458,7
@@
static int __init pch_gbe_init_module(void)
{
int ret;
{
int ret;
- ret = pci_register_driver(&pch_gbe_
pcidev
);
+ ret = pci_register_driver(&pch_gbe_
driver
);
if (copybreak != PCH_GBE_COPYBREAK_DEFAULT) {
if (copybreak == 0) {
pr_info("copybreak disabled\n");
if (copybreak != PCH_GBE_COPYBREAK_DEFAULT) {
if (copybreak == 0) {
pr_info("copybreak disabled\n");
@@
-2472,7
+2472,7
@@
static int __init pch_gbe_init_module(void)
static void __exit pch_gbe_exit_module(void)
{
static void __exit pch_gbe_exit_module(void)
{
- pci_unregister_driver(&pch_gbe_
pcidev
);
+ pci_unregister_driver(&pch_gbe_
driver
);
}
module_init(pch_gbe_init_module);
}
module_init(pch_gbe_init_module);