diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 04:29:33 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:16:47 -0500 |
commit | 6560c349c501388a1f3030d02fb49e7067e6597e (patch) | |
tree | 9b93a54f692e1f93bbb910a3fb55c76ec058ac37 /include/sound/asound.h | |
parent | bc1ff7fc0ae6ec2d7f2202d9126901aeb3f596cd (diff) |
[ALSA] Clean up includes in asound.h & asequencer.h
Modules: ALSA sequencer,ALSA Core
Clean up includes in asound.h and asequencer.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/asound.h')
-rw-r--r-- | include/sound/asound.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 8e552d627fa5..1389704d8d61 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
@@ -23,12 +23,8 @@ | |||
23 | #ifndef __SOUND_ASOUND_H | 23 | #ifndef __SOUND_ASOUND_H |
24 | #define __SOUND_ASOUND_H | 24 | #define __SOUND_ASOUND_H |
25 | 25 | ||
26 | #if defined(LINUX) || defined(__LINUX__) || defined(__linux__) | ||
27 | |||
28 | #include <linux/ioctl.h> | ||
29 | |||
30 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
31 | 27 | #include <linux/ioctl.h> | |
32 | #include <linux/types.h> | 28 | #include <linux/types.h> |
33 | #include <linux/time.h> | 29 | #include <linux/time.h> |
34 | #include <asm/byteorder.h> | 30 | #include <asm/byteorder.h> |
@@ -43,25 +39,7 @@ | |||
43 | #endif | 39 | #endif |
44 | #endif | 40 | #endif |
45 | 41 | ||
46 | #else /* !__KERNEL__ */ | 42 | #endif /* __KERNEL__ **/ |
47 | |||
48 | #include <endian.h> | ||
49 | #if __BYTE_ORDER == __LITTLE_ENDIAN | ||
50 | #define SNDRV_LITTLE_ENDIAN | ||
51 | #elif __BYTE_ORDER == __BIG_ENDIAN | ||
52 | #define SNDRV_BIG_ENDIAN | ||
53 | #else | ||
54 | #error "Unsupported endian..." | ||
55 | #endif | ||
56 | |||
57 | #endif /* __KERNEL **/ | ||
58 | |||
59 | #endif /* LINUX */ | ||
60 | |||
61 | #ifndef __KERNEL__ | ||
62 | #include <sys/time.h> | ||
63 | #include <sys/types.h> | ||
64 | #endif | ||
65 | 43 | ||
66 | /* | 44 | /* |
67 | * protocol version | 45 | * protocol version |