git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
char
/
rio
/
rio_linux.c
diff --git
a/drivers/char/rio/rio_linux.c
b/drivers/char/rio/rio_linux.c
index
aa43436
..
3fa80aa
100644
(file)
--- a/
drivers/char/rio/rio_linux.c
+++ b/
drivers/char/rio/rio_linux.c
@@
-33,7
+33,6
@@
* */
#include <linux/module.h>
* */
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
@@
-244,7
+243,7
@@
static struct real_driver rio_real_driver = {
*
*/
*
*/
-static struct file_operations rio_fw_fops = {
+static
const
struct file_operations rio_fw_fops = {
.owner = THIS_MODULE,
.ioctl = rio_fw_ioctl,
};
.owner = THIS_MODULE,
.ioctl = rio_fw_ioctl,
};
@@
-1120,7
+1119,7
@@
static int __init rio_init(void)
for (i = 0; i < p->RIONumHosts; i++) {
hp = &p->RIOHosts[i];
if (hp->Ivec) {
for (i = 0; i < p->RIONumHosts; i++) {
hp = &p->RIOHosts[i];
if (hp->Ivec) {
- int mode =
SA_SHIRQ
;
+ int mode =
IRQF_SHARED
;
if (hp->Ivec & 0x8000) {
mode = 0;
hp->Ivec &= 0x7fff;
if (hp->Ivec & 0x8000) {
mode = 0;
hp->Ivec &= 0x7fff;