From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 8 Aug 2010 23:49:58 +0000 (+0200)
Subject: Merge commit 'linus/master' into bkl/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1;p=mv-sheeva.git

Merge commit 'linus/master' into bkl/core

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
---

d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1
diff --cc fs/compat_ioctl.c
index 618f3813630,63ae8583146..5d9b936c458
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@@ -577,9 -594,18 +577,12 @@@ static int do_smb_getmountuid(unsigned 
  	return err;
  }
  
 -static int ioc_settimeout(unsigned int fd, unsigned int cmd,
 -		compat_ulong_t __user *argp)
 -{
 -	return rw_long(fd, AUTOFS_IOC_SETTIMEOUT, argp);
 -}
 -
  /* Bluetooth ioctls */
- #define HCIUARTSETPROTO	_IOW('U', 200, int)
- #define HCIUARTGETPROTO	_IOR('U', 201, int)
+ #define HCIUARTSETPROTO		_IOW('U', 200, int)
+ #define HCIUARTGETPROTO		_IOR('U', 201, int)
+ #define HCIUARTGETDEVICE	_IOR('U', 202, int)
+ #define HCIUARTSETFLAGS		_IOW('U', 203, int)
+ #define HCIUARTGETFLAGS		_IOR('U', 204, int)
  
  #define BNEPCONNADD	_IOW('B', 200, int)
  #define BNEPCONNDEL	_IOW('B', 201, int)