android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/linux-on-wince-htc/linux_on_wince_htc

Browse Source
This commit is contained in:
Jon Benson
2010-11-10 23:56:53 +11:00
parent 914f7ce2b5 7d8b0f7344
commit 1d971023be
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/configs/htcleo_defconfig
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.15
# Fri Oct 29 13:59:28 2010
# Mon Nov 8 20:09:00 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -971,7 +971,8 @@ CONFIG_PPPOPNS=y
# CONFIG_SLIP is not set
CONFIG_SLHC=y
# CONFIG_NETCONSOLE is not set
# CONFIG_MSM_RMNET is not set
CONFIG_MSM_RMNET=m
# CONFIG_MSM_RMNET_DEBUG is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_KINETO_GAN is not set
@@ -1285,7 +1286,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_MSM_CAMERA=y
CONFIG_MSM_CAMERA_LEGACY=y
# CONFIG_MSM_CAMERA_7X30 is not set
# CONFIG_720P_CAMERA is not set
CONFIG_720P_CAMERA=y
# CONFIG_MSM_CAMERA_DEBUG is not set
#

4
arch/arm/mach-msm/smd.c
View File

@@ -885,6 +885,7 @@ int smd_open(const char *name, smd_channel_t **_ch,
return 0;
}
EXPORT_SYMBOL(smd_open);
int smd_close(smd_channel_t *ch)
{
@@ -915,6 +916,7 @@ int smd_read(smd_channel_t *ch, void *data, int len)
{
return ch->read(ch, data, len);
}
EXPORT_SYMBOL(smd_read);
int smd_write(smd_channel_t *ch, const void *data, int len)
{
@@ -930,11 +932,13 @@ int smd_write_atomic(smd_channel_t *ch, const void *data, int len)
spin_unlock_irqrestore(&smd_lock, flags);
return res;
}
EXPORT_SYMBOL(smd_write_atomic);
int smd_read_avail(smd_channel_t *ch)
{
return ch->read_avail(ch);
}
EXPORT_SYMBOL(smd_read_avail);
int smd_write_avail(smd_channel_t *ch)
{

16
drivers/media/video/msm/s5k3e2fx.c
View File

@@ -3379,11 +3379,27 @@ static DEVICE_ATTR(sensor, 0444, sensor_vendor_show, NULL);
static DEVICE_ATTR(node, 0444, sensor_read_node, NULL);
static struct kobject *android_s5k3e2fx;
static struct kobject *android_s5k3e2fx_des;
static int s5k3e2fx_sysfs_init(void)
{
int ret ;
pr_info("s5k3e2fx:kobject creat and add\n");
android_s5k3e2fx_des = kobject_create_and_add("android_camera", NULL);
if (android_s5k3e2fx_des == NULL) {
pr_info("s5k3e2fx_sysfs_init: subsystem_register " \
"failed\n");
ret = -ENOMEM;
return ret ;
}
pr_info("s5k3e2fx:sysfs_create_file\n");
ret = sysfs_create_file(android_s5k3e2fx_des, &dev_attr_sensor.attr);
if (ret) {
pr_info("s5k3e2fx_sysfs_init: sysfs_create_file " \
"failed\n");
kobject_del(android_s5k3e2fx_des);
}
android_s5k3e2fx = kobject_create_and_add("android_camera2", NULL);
if (android_s5k3e2fx == NULL) {
pr_info("s5k3e2fx_sysfs_init: subsystem_register " \

5
drivers/net/msm_rmnet_wince.c
View File

@@ -87,6 +87,11 @@ static int count_this_packet(void *_hdr, int len)
static int in_suspend;
static unsigned long timeout_us;
static struct workqueue_struct *rmnet_wq;
extern int smd_read(smd_channel_t *ch, void *data, int len);
extern int smd_open(const char *name, smd_channel_t **_ch,
void *priv, void (*notify)(void *, unsigned));
extern int smd_write_atomic(smd_channel_t *ch, const void *data, int len);
extern int smd_read_avail(smd_channel_t *ch);
static void do_check_active(struct work_struct *work)
{