diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 10:29:33 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:16:47 +0100 |
| commit | 6560c349c501388a1f3030d02fb49e7067e6597e (patch) | |
| tree | 9b93a54f692e1f93bbb910a3fb55c76ec058ac37 | |
| parent | bc1ff7fc0ae6ec2d7f2202d9126901aeb3f596cd (diff) | |
| download | linux-6560c349c501388a1f3030d02fb49e7067e6597e.tar.gz linux-6560c349c501388a1f3030d02fb49e7067e6597e.tar.bz2 linux-6560c349c501388a1f3030d02fb49e7067e6597e.zip | |
[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>
| -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 @@ #ifndef __SOUND_ASEQUENCER_H #define __SOUND_ASEQUENCER_H -#ifndef __KERNEL__ +#ifdef __KERNEL__ #include <linux/ioctl.h> -#endif - #include <sound/asound.h> +#endif /** version of the sequencer */ #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 @@ #ifndef __SOUND_ASOUND_H #define __SOUND_ASOUND_H -#if defined(LINUX) || defined(__LINUX__) || defined(__linux__) - -#include <linux/ioctl.h> - #ifdef __KERNEL__ - +#include <linux/ioctl.h> #include <linux/types.h> #include <linux/time.h> #include <asm/byteorder.h> @@ -43,25 +39,7 @@ #endif #endif -#else /* !__KERNEL__ */ - -#include <endian.h> -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define SNDRV_LITTLE_ENDIAN -#elif __BYTE_ORDER == __BIG_ENDIAN -#define SNDRV_BIG_ENDIAN -#else -#error "Unsupported endian..." -#endif - -#endif /* __KERNEL **/ - -#endif /* LINUX */ - -#ifndef __KERNEL__ -#include <sys/time.h> -#include <sys/types.h> -#endif +#endif /* __KERNEL__ **/ /* * protocol version |