projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
net
/
wireless
/
orinoco_pci.c
diff --git
a/drivers/net/wireless/orinoco_pci.c
b/drivers/net/wireless/orinoco_pci.c
index
1c105f4
..
97a8b4f
100644
(file)
--- a/
drivers/net/wireless/orinoco_pci.c
+++ b/
drivers/net/wireless/orinoco_pci.c
@@
-44,7
+44,6
@@
#define DRIVER_NAME "orinoco_pci"
#define PFX DRIVER_NAME ": "
#define DRIVER_NAME "orinoco_pci"
#define PFX DRIVER_NAME ": "
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-154,7
+153,7
@@
static int orinoco_pci_init_one(struct pci_dev *pdev,
hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
@@
-245,7
+244,7
@@
MODULE_LICENSE("Dual MPL/GPL");
static int __init orinoco_pci_init(void)
{
printk(KERN_DEBUG "%s\n", version);
static int __init orinoco_pci_init(void)
{
printk(KERN_DEBUG "%s\n", version);
- return pci_
module_init
(&orinoco_pci_driver);
+ return pci_
register_driver
(&orinoco_pci_driver);
}
static void __exit orinoco_pci_exit(void)
}
static void __exit orinoco_pci_exit(void)