diff options
-rw-r--r-- | include/sound/asequencer.h | 5 | ||||
-rw-r--r-- | include/sound/asound.h | 26 |
2 files changed, 4 insertions, 27 deletions
diff --git a/include/sound/asequencer.h b/include/sound/asequencer.h index 728efd504262..562637b4884b 100644 --- a/include/sound/asequencer.h +++ b/include/sound/asequencer.h | |||
@@ -22,11 +22,10 @@ | |||
22 | #ifndef __SOUND_ASEQUENCER_H | 22 | #ifndef __SOUND_ASEQUENCER_H |
23 | #define __SOUND_ASEQUENCER_H | 23 | #define __SOUND_ASEQUENCER_H |
24 | 24 | ||
25 | #ifndef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
27 | #endif | ||
28 | |||
29 | #include <sound/asound.h> | 27 | #include <sound/asound.h> |
28 | #endif | ||
30 | 29 | ||
31 | /** version of the sequencer */ | 30 | /** version of the sequencer */ |
32 | #define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) | 31 | #define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) |
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 |