diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/char/joystick | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/char/joystick')
| -rw-r--r-- | drivers/char/joystick/pcigame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/joystick/pcigame.c b/drivers/char/joystick/pcigame.c index 0348ba08b..50ea4e44d 100644 --- a/drivers/char/joystick/pcigame.c +++ b/drivers/char/joystick/pcigame.c @@ -40,8 +40,8 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> -#include <linux/pci_ids.h> #include <linux/init.h> +#include <linux/slab.h> #include <linux/gameport.h> #define PCI_VENDOR_ID_AUREAL 0x12eb |