diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-18 20:10:33 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-18 20:10:33 +0000 |
commit | d9dab97d38ff0e24aa26d9c6ac123381c008db99 (patch) | |
tree | bcb9e9c129c66d79670c8f78e7c16d61780bb89f /package/ep80579-drivers/patches/712-3.3-can-fixes.patch | |
parent | 7217afc657789e0457fb065657bc757e897d5175 (diff) | |
download | mtk-20170518-d9dab97d38ff0e24aa26d9c6ac123381c008db99.zip mtk-20170518-d9dab97d38ff0e24aa26d9c6ac123381c008db99.tar.gz mtk-20170518-d9dab97d38ff0e24aa26d9c6ac123381c008db99.tar.bz2 |
x86/ep80579: switch to 3.3
Also fix build errors in the ep80579-drivers package.
Compile tested only.
SVN-Revision: 31802
Diffstat (limited to 'package/ep80579-drivers/patches/712-3.3-can-fixes.patch')
-rw-r--r-- | package/ep80579-drivers/patches/712-3.3-can-fixes.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/package/ep80579-drivers/patches/712-3.3-can-fixes.patch b/package/ep80579-drivers/patches/712-3.3-can-fixes.patch new file mode 100644 index 0000000..06a09e5 --- /dev/null +++ b/package/ep80579-drivers/patches/712-3.3-can-fixes.patch @@ -0,0 +1,41 @@ +--- a/Embedded/src/CAN/can_main.c ++++ b/Embedded/src/CAN/can_main.c +@@ -72,6 +72,7 @@ + #include "can_main.h" + #include "can_ioctl.h" + #include <linux/fs.h> ++#include <linux/module.h> + + + MODULE_AUTHOR("Intel(R) Corporation"); +@@ -110,7 +111,7 @@ struct file_operations file_ops = { + .owner = THIS_MODULE, + .read = can_read, + .write = can_write, +- .ioctl = can_dev_io, ++ .unlocked_ioctl = can_dev_io, + .open = can_open, + .release = can_release + }; +@@ -594,8 +595,7 @@ int icp_can_reset(can_os_t *can_os) + /***************************************************************************** + * Device IO control function. Used by user apps to configure CAN device. + *****************************************************************************/ +-int can_dev_io(struct inode *inode, struct file *filp, unsigned int cmd, +- unsigned long arg) ++long can_dev_io(struct file *filp, unsigned int cmd, unsigned long arg) + { + can_os_t *can_os; + unsigned int err=0; +--- a/Embedded/src/CAN/can_main.h ++++ b/Embedded/src/CAN/can_main.h +@@ -157,8 +157,7 @@ ssize_t can_write( + int icp_can_reset( + can_os_t *can_os); + +-int can_dev_io( +- struct inode *inode, ++long can_dev_io( + struct file *filp, + unsigned int cmd, + unsigned long arg); |