xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'v2.6.35-rc6' into devicetree/next

Browse Source 
Conflicts:
	arch/sparc/kernel/prom_64.c
This commit is contained in:
Grant Likely
2010-07-24 09:49:13 -06:00
parent 9e3288dc9a b37fa16e78
commit 4e4f62bf73
994 changed files with 10066 additions and 201378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/sbus/char/openprom.c
View File

@@ -554,7 +554,7 @@ static int opiocgetnext(unsigned int cmd, void __user *argp)
static int openprom_bsd_ioctl(struct file * file,
unsigned int cmd, unsigned long arg)
{
DATA *data = (DATA *) file->private_data;
DATA *data = file->private_data;
void __user *argp = (void __user *)arg;
int err;
@@ -601,7 +601,7 @@ static int openprom_bsd_ioctl(struct file * file,
static long openprom_ioctl(struct file * file,
unsigned int cmd, unsigned long arg)
{
DATA *data = (DATA *) file->private_data;
DATA *data = file->private_data;
switch (cmd) {
case OPROMGETOPT: