diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /sound/oss/dmasound | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'sound/oss/dmasound')
| -rw-r--r-- | sound/oss/dmasound/tas_ioctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/oss/dmasound/tas_ioctl.h b/sound/oss/dmasound/tas_ioctl.h index dccae3a40e01..9d12b373b4a9 100644 --- a/sound/oss/dmasound/tas_ioctl.h +++ b/sound/oss/dmasound/tas_ioctl.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _TAS_IOCTL_H_ | 1 | #ifndef _TAS_IOCTL_H_ |
| 2 | #define _TAS_IOCTL_H_ | 2 | #define _TAS_IOCTL_H_ |
| 3 | 3 | ||
| 4 | #include <linux/i2c.h> | ||
| 5 | #include <linux/soundcard.h> | 4 | #include <linux/soundcard.h> |
| 6 | 5 | ||
| 7 | 6 | ||