From e32a177913248ee06c7321c5a83ca02f9eee2438 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 18 May 2012 20:10:33 +0000 Subject: x86/ep80579: switch to 3.3 Also fix build errors in the ep80579-drivers package. Compile tested only. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31802 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/712-3.3-can-fixes.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/ep80579-drivers/patches/712-3.3-can-fixes.patch (limited to 'package/ep80579-drivers/patches/712-3.3-can-fixes.patch') 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 000000000..f46f90093 --- /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 ++#include + + + 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); -- cgit v1.2.3