summaryrefslogtreecommitdiff
path: root/package/ep80579-drivers/patches/715-3.3-1588-fixes.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-18 20:10:33 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-18 20:10:33 +0000
commite32a177913248ee06c7321c5a83ca02f9eee2438 (patch)
tree774f8ea37948879fbd72e3837910ead917c1fcbc /package/ep80579-drivers/patches/715-3.3-1588-fixes.patch
parenta8aba4599dd75a659a5e803beaf79d5a60a48447 (diff)
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
Diffstat (limited to 'package/ep80579-drivers/patches/715-3.3-1588-fixes.patch')
-rw-r--r--package/ep80579-drivers/patches/715-3.3-1588-fixes.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/package/ep80579-drivers/patches/715-3.3-1588-fixes.patch b/package/ep80579-drivers/patches/715-3.3-1588-fixes.patch
new file mode 100644
index 0000000000..ac5dd1f2ec
--- /dev/null
+++ b/package/ep80579-drivers/patches/715-3.3-1588-fixes.patch
@@ -0,0 +1,33 @@
+--- a/Embedded/src/1588/1588.c
++++ b/Embedded/src/1588/1588.c
+@@ -664,8 +664,7 @@ irqreturn_t timesync_isr(int irq, void *
+ 0 => success
+ < 0 => error
+ ******************************************************************************/
+-int timesync_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
+- unsigned long arg)
++long timesync_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ wait_queue_head_t *event = NULL;
+ unsigned int bytes_ret = 0;
+--- a/Embedded/src/1588/1588.h
++++ b/Embedded/src/1588/1588.h
+@@ -121,8 +121,7 @@ MODULE_DEVICE_TABLE(pci, pci_ids);
+ // Linux functions
+ int timesync_open(struct inode *inode, struct file *filp);
+ int timesync_release(struct inode *inode, struct file *filp);
+-int timesync_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
+- unsigned long arg);
++long timesync_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
+ void timesync_close(void);
+ int pci_suspend(struct pci_dev *dev, pm_message_t state);
+ int pci_resume(struct pci_dev *dev);
+@@ -142,7 +141,7 @@ struct file_operations file_ops =
+ .owner = THIS_MODULE,
+ .open = timesync_open,
+ .release = timesync_release,
+- .ioctl = timesync_ioctl,
++ .unlocked_ioctl = timesync_ioctl,
+ };
+
+ // Linux pci operations