diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /sound/oss/os.h | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/oss/os.h')
| -rw-r--r-- | sound/oss/os.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/oss/os.h b/sound/oss/os.h index d6b96297835c..80dce329cc3a 100644 --- a/sound/oss/os.h +++ b/sound/oss/os.h | |||
| @@ -19,9 +19,6 @@ | |||
| 19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
| 21 | #include <asm/system.h> | 21 | #include <asm/system.h> |
| 22 | #ifdef __alpha__ | ||
| 23 | #include <asm/segment.h> | ||
| 24 | #endif | ||
| 25 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
| 26 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| 27 | #include <linux/poll.h> | 24 | #include <linux/poll.h> |