From b3b53a1bec47aaa2baef724cc9e79adadd603caf Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 23 Jul 2013 14:50:41 +0200
Subject: [PATCH] local.h: use __kernel_off_t from <linux/types.h>

Also, make the empty definitions __user and __force conditional.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 include/local.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/local.h b/include/local.h
index 53cb647d..f0db188e 100644
--- a/include/local.h
+++ b/include/local.h
@@ -32,6 +32,7 @@
 #include <stdarg.h>
 #include <sys/poll.h>
 #include <errno.h>
+#include <linux/types.h>
 #include <linux/ioctl.h>
 
 #include "config.h"
@@ -114,9 +115,12 @@
 #define snd_ctl_tlv		sndrv_ctl_tlv
 
 /* kill and replace kernel-specific types */
+#ifndef __user
 #define __user
+#endif
+#ifndef __force
 #define __force
-#define __kernel_off_t		off_t
+#endif
 
 #include <sound/asound.h>
 
-- 
2.47.1