diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 (patch) | |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 /drivers/sbus | |
| parent | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/openprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index d53e62ab09da..aacbe14e2e7a 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c | |||
| @@ -554,7 +554,7 @@ static int opiocgetnext(unsigned int cmd, void __user *argp) | |||
| 554 | static int openprom_bsd_ioctl(struct file * file, | 554 | static int openprom_bsd_ioctl(struct file * file, |
| 555 | unsigned int cmd, unsigned long arg) | 555 | unsigned int cmd, unsigned long arg) |
| 556 | { | 556 | { |
| 557 | DATA *data = (DATA *) file->private_data; | 557 | DATA *data = file->private_data; |
| 558 | void __user *argp = (void __user *)arg; | 558 | void __user *argp = (void __user *)arg; |
| 559 | int err; | 559 | int err; |
| 560 | 560 | ||
| @@ -601,7 +601,7 @@ static int openprom_bsd_ioctl(struct file * file, | |||
| 601 | static long openprom_ioctl(struct file * file, | 601 | static long openprom_ioctl(struct file * file, |
| 602 | unsigned int cmd, unsigned long arg) | 602 | unsigned int cmd, unsigned long arg) |
| 603 | { | 603 | { |
| 604 | DATA *data = (DATA *) file->private_data; | 604 | DATA *data = file->private_data; |
| 605 | 605 | ||
| 606 | switch (cmd) { | 606 | switch (cmd) { |
| 607 | case OPROMGETOPT: | 607 | case OPROMGETOPT: |