git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
input
/
gameport
/
emu10k1-gp.c
diff --git
a/drivers/input/gameport/emu10k1-gp.c
b/drivers/input/gameport/emu10k1-gp.c
index
a011803
..
9793ac3
100644
(file)
--- a/
drivers/input/gameport/emu10k1-gp.c
+++ b/
drivers/input/gameport/emu10k1-gp.c
@@
-32,7
+32,6
@@
#include <linux/module.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/ioport.h>
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/gameport.h>
#include <linux/slab.h>
@@
-75,7
+74,7
@@
static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id
if (!request_region(ioport, iolen, "emu10k1-gp"))
return -EBUSY;
if (!request_region(ioport, iolen, "emu10k1-gp"))
return -EBUSY;
- emu = k
calloc(1,
sizeof(struct emu), GFP_KERNEL);
+ emu = k
zalloc(
sizeof(struct emu), GFP_KERNEL);
port = gameport_allocate_port();
if (!emu || !port) {
printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");
port = gameport_allocate_port();
if (!emu || !port) {
printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");