From fadc8cf700d43c65fcb778279cb14648e1ed98ea Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 17 Nov 2005 10:29:33 +0100
Subject: [PATCH] --- yaml --- r: 15935 b: refs/heads/master c:
 6560c349c501388a1f3030d02fb49e7067e6597e h: refs/heads/master i:   15933:
 8f5ff6b4fc51213569642be5efd68fe23cc1a7c0   15931:
 6ca48d95c7a9e7609bc3460309b6bf9c62a3e86e   15927:
 203586171e6a9ab27f64fe43b88957674f1e2924   15919:
 a52956e8c3517f4b63cda75baa47f93baf4ce1d1   15903:
 f91178caa2ffe0b2fed305c59dec0c09919a10a6   15871:
 96b097471a5efccf41a91bd7ac0dc96c72b4d8c2 v: v3

---
 [refs]                           |  2 +-
 trunk/include/sound/asequencer.h |  5 ++---
 trunk/include/sound/asound.h     | 26 ++------------------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index a6189a78ea1f..1f38e9fd316c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc1ff7fc0ae6ec2d7f2202d9126901aeb3f596cd
+refs/heads/master: 6560c349c501388a1f3030d02fb49e7067e6597e
diff --git a/trunk/include/sound/asequencer.h b/trunk/include/sound/asequencer.h
index 728efd504262..562637b4884b 100644
--- a/trunk/include/sound/asequencer.h
+++ b/trunk/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/trunk/include/sound/asound.h b/trunk/include/sound/asound.h
index 8e552d627fa5..1389704d8d61 100644
--- a/trunk/include/sound/asound.h
+++ b/trunk/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