Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fascinatemtd: fix build breakages

  • Loading branch information...
commit 92db2b73e620dd963fe9fc6290f6a6e6ee08a857 1 parent 50725b0
@jt1134 jt1134 authored
View
2  drivers/input/misc/kr3dh.c
@@ -677,5 +677,5 @@ module_exit(kr3dh_exit);
MODULE_AUTHOR("Samsung");
MODULE_DESCRIPTION("KR3DH 3 axis accelerometer driver");
MODULE_LICENSE("GPL");
-MODULE_VERSION(KR3DH_VERSION);
+MODULE_VERSION("1.0.0");
View
10 drivers/media/video/ce147.c
@@ -4158,7 +4158,9 @@ static int ce147_set_face_lock(struct v4l2_subdev *sd,
static int ce147_finish_auto_focus(struct v4l2_subdev *sd)
{
+ int err;
struct ce147_state *state = to_state(sd);
+ struct i2c_client *client = v4l2_get_subdevdata(sd);
#if defined(CONFIG_ARIES_NTT) || defined(CONFIG_SAMSUNG_FASCINATE)
if (!state->disable_aeawb_lock) {
err = ce147_set_awb_lock(sd, 1);
@@ -5262,14 +5264,10 @@ static int ce147_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
err = 0;
break;
-#if defined(CONFIG_ARIES_NTT) || defined(CONFIG_SAMSUNG_FASCINATE) /* Modify NTTS1 */
- case V4L2_CID_CAMERA_AE_AWB_DISABLE_LOCK:
+ case V4L2_CID_CAMERA_FINISH_AUTO_FOCUS:
+#if defined(CONFIG_SAMSUNG_FASCINATE)
state->disable_aeawb_lock = ctrl->value;
- err = 0;
- break;
#endif
-
- case V4L2_CID_CAMERA_FINISH_AUTO_FOCUS:
err = ce147_finish_auto_focus(sd);
break;
View
12 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;
View
7 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"))
View
2  include/linux/fsa9480.h
@@ -38,4 +38,6 @@ struct fsa9480_platform_data {
void (*reset_cb) (void);
};
+extern int fsa9480_get_dock_status(void);
+
#endif /* _FSA9480_H_ */
View
3  include/linux/gp2a.h
@@ -26,6 +26,9 @@
#define GP2A_OPT "gp2a-opt"
struct gp2a_platform_data {
int p_out; /* proximity-sensor-output gpio */
+#ifdef CONFIG_SAMSUNG_FASCINATE
+ int p_irq;
+#endif
int (*power)(bool); /* power to the chip */
int (*light_adc_value)(void); /* get light level from adc */
int light_adc_max;
View
3  include/linux/semaphore.h
@@ -36,6 +36,9 @@ static inline void sema_init(struct semaphore *sem, int val)
lockdep_init_map(&sem->lock.dep_map, "semaphore->lock", &__key, 0);
}
+#define init_MUTEX(sem) sema_init(sem, 1)
+#define init_MUTEX_LOCKED(sem) sema_init(sem, 0)
+
extern void down(struct semaphore *sem);
extern int __must_check down_interruptible(struct semaphore *sem);
extern int __must_check down_killable(struct semaphore *sem);
View
1  include/linux/videodev2_samsung.h
@@ -482,7 +482,6 @@ enum v4l2_slow_ae_mode {
#ifdef CONFIG_SAMSUNG_FASCINATE
#define V4L2_CID_CAMERA_LENS_SOFTLANDING (V4L2_CID_PRIVATE_BASE + 120)
-#define V4L2_CID_CAMERA_AE_AWB_DISABLE_LOCK (V4L2_CID_PRIVATE_BASE + 121)
#endif
/* Pixel format FOURCC depth Description */

0 comments on commit 92db2b7

Please sign in to comment.
Something went wrong with that request. Please try again.