diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-10 15:08:28 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-10 15:08:28 +0000 |
| commit | aed622fd2cccaac076436139e74fe408f6f1d9d7 (patch) | |
| tree | 7206261baf65bf8906b2dd2c2b57e5c0e41f2817 /target/linux/amazon/files/drivers/net/admmod.c | |
| parent | 077377a294aa659cd11c6ba52d05382de9d0b0e0 (diff) | |
| download | mtk-20170518-aed622fd2cccaac076436139e74fe408f6f1d9d7.zip mtk-20170518-aed622fd2cccaac076436139e74fe408f6f1d9d7.tar.gz mtk-20170518-aed622fd2cccaac076436139e74fe408f6f1d9d7.tar.bz2 | |
amazon: Upgrade amazon target to kernel 2.6.37
This was just a little bit tested on an SAMSUNG SMT-G3020 and pci and usb do not work like before.
SVN-Revision: 26576
Diffstat (limited to 'target/linux/amazon/files/drivers/net/admmod.c')
| -rw-r--r-- | target/linux/amazon/files/drivers/net/admmod.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/target/linux/amazon/files/drivers/net/admmod.c b/target/linux/amazon/files/drivers/net/admmod.c index 70ba149..473a1f6 100644 --- a/target/linux/amazon/files/drivers/net/admmod.c +++ b/target/linux/amazon/files/drivers/net/admmod.c @@ -39,6 +39,7 @@ /* 507281:linmars 2005/07/28 support MDIO/EEPROM config mode */ /* 509201:linmars remove driver testing codes */ +#include <linux/version.h> #include <linux/module.h> #include <linux/string.h> #include <linux/proc_fs.h> @@ -948,7 +949,12 @@ int adm_release(struct inode *inode, struct file *filp) } /* IOCTL function */ -int adm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long args) + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) +static long adm_ioctl(struct file *filp, unsigned int cmd, unsigned long args) +#else +static int adm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long args) +#endif { PREGRW uREGRW; unsigned int rtval; @@ -1346,7 +1352,11 @@ struct file_operations adm_ops = write: adm_write, open: adm_open, release: adm_release, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unlocked_ioctl: adm_ioctl +#else ioctl: adm_ioctl +#endif }; int adm_proc(char *buf, char **start, off_t offset, int count, int *eof, void *data) |