diff options
| author | jt1134 <jt1134@gmail.com> | 2011-12-23 22:15:22 -0600 |
|---|---|---|
| committer | jt1134 <jt1134@gmail.com> | 2011-12-23 22:15:22 -0600 |
| commit | 92db2b73e620dd963fe9fc6290f6a6e6ee08a857 (patch) | |
| tree | c391f7aca0bf6641f7f4e07e9a328be40db72ddd /drivers/misc | |
| parent | 50725b068daab60202ffa372ce655d4957a582a3 (diff) | |
| download | kernel_samsung_aries-92db2b73e620dd963fe9fc6290f6a6e6ee08a857.zip kernel_samsung_aries-92db2b73e620dd963fe9fc6290f6a6e6ee08a857.tar.gz kernel_samsung_aries-92db2b73e620dd963fe9fc6290f6a6e6ee08a857.tar.bz2 | |
fascinatemtd: fix build breakages
Diffstat (limited to 'drivers/misc')
| -rwxr-xr-x | drivers/misc/fsa9480.c | 12 | ||||
| -rwxr-xr-x | drivers/misc/samsung_modemctl/dpram/dpram.c | 7 |
2 files changed, 16 insertions, 3 deletions
diff --git a/drivers/misc/fsa9480.c b/drivers/misc/fsa9480.c index ca6b8e2..758bf6e 100755 --- a/drivers/misc/fsa9480.c +++ b/drivers/misc/fsa9480.c @@ -235,6 +235,7 @@ static const struct attribute_group fsa9480_group = { .attrs = fsa9480_attributes, }; +int dock_status = 0; static void fsa9480_detect_dev(struct fsa9480_usbsw *usbsw) { @@ -311,6 +312,7 @@ static void fsa9480_detect_dev(struct fsa9480_usbsw *usbsw) } else if (val2 & DEV_JIG_UART_ON) { if (pdata->cardock_cb) pdata->cardock_cb(FSA9480_ATTACHED); + dock_status = 1; } /* Detached */ } else { @@ -352,6 +354,7 @@ static void fsa9480_detect_dev(struct fsa9480_usbsw *usbsw) } else if (usbsw->dev2 & DEV_JIG_UART_ON) { if (pdata->cardock_cb) pdata->cardock_cb(FSA9480_DETACHED); + dock_status = 0; } } @@ -359,6 +362,15 @@ static void fsa9480_detect_dev(struct fsa9480_usbsw *usbsw) usbsw->dev2 = val2; } +int fsa9480_get_dock_status(void) +{ + if (dock_status) + return 1; + else + return 0; +} +EXPORT_SYMBOL(fsa9480_get_dock_status); + static void fsa9480_reg_init(struct fsa9480_usbsw *usbsw) { struct i2c_client *client = usbsw->client; diff --git a/drivers/misc/samsung_modemctl/dpram/dpram.c b/drivers/misc/samsung_modemctl/dpram/dpram.c index 2b8fba4..8da220b 100755 --- a/drivers/misc/samsung_modemctl/dpram/dpram.c +++ b/drivers/misc/samsung_modemctl/dpram/dpram.c @@ -22,6 +22,7 @@ #include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/mm.h> +#include <linux/sched.h> #include <linux/tty.h> #include <linux/tty_driver.h> #include <linux/tty_flip.h> @@ -2158,7 +2159,7 @@ static int multipdp_ioctl(struct inode *inode, struct file *file, static struct file_operations multipdp_fops = { .owner = THIS_MODULE, - .ioctl = multipdp_ioctl, + .unlocked_ioctl = multipdp_ioctl, .llseek = no_llseek, }; @@ -2530,11 +2531,11 @@ static void init_hw_setting(void) /* initial pin settings - dpram driver control */ s3c_gpio_cfgpin(GPIO_PHONE_ACTIVE, S3C_GPIO_SFN(GPIO_PHONE_ACTIVE_AF)); s3c_gpio_setpull(GPIO_PHONE_ACTIVE, S3C_GPIO_PULL_NONE); - set_irq_type(IRQ_PHONE_ACTIVE, IRQ_TYPE_EDGE_BOTH); + irq_set_irq_type(IRQ_PHONE_ACTIVE, IRQ_TYPE_EDGE_BOTH); s3c_gpio_cfgpin(GPIO_ONEDRAM_INT_N, S3C_GPIO_SFN(GPIO_ONEDRAM_INT_N_AF)); s3c_gpio_setpull(GPIO_ONEDRAM_INT_N, S3C_GPIO_PULL_NONE); - set_irq_type(IRQ_ONEDRAM_INT_N, IRQ_TYPE_EDGE_FALLING); + irq_set_irq_type(IRQ_ONEDRAM_INT_N, IRQ_TYPE_EDGE_FALLING); if (gpio_is_valid(GPIO_PHONE_ON)) { if (gpio_request(GPIO_PHONE_ON, "dpram/GPIO_PHONE_ON")) |