Modules: ALSA sequencer,ALSA Core Clean up includes in asound.h and asequencer.h. Signed-off-by: Takashi Iwai <tiwai@suse.de>
@@ -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)
@@ -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
-#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 /* __KERNEL **/
-#endif /* LINUX */
-#include <sys/time.h>
-#include <sys/types.h>
+#endif /* __KERNEL__ **/
/*
* protocol version