diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 18:46:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 18:46:22 +0200 |
| commit | 63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (patch) | |
| tree | 91240ae476d553bda4a92b52ff46823421798f6c /include/sound/emu10k1.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | [ALSA] [PATCH] Add missing sound PCI IDs to pci_ids.h (diff) | |
| download | linux-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.tar.xz linux-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
Diffstat (limited to 'include/sound/emu10k1.h')
| -rw-r--r-- | include/sound/emu10k1.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 4e3993dfcefe..67bf3f18e96a 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -35,13 +35,6 @@ #include <linux/interrupt.h> #include <asm/io.h> -#ifndef PCI_VENDOR_ID_CREATIVE -#define PCI_VENDOR_ID_CREATIVE 0x1102 -#endif -#ifndef PCI_DEVICE_ID_CREATIVE_EMU10K1 -#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002 -#endif - /* ------------------- DEFINES -------------------- */ #define EMUPAGESIZE 4096 |