Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 962393f1 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'linaro-android-3.18-lsk' of... 

Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-android

* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
  net: sysctl_net_core: delete unused variable
  usb: gadget: configfs: fix unused variable warnings
  net: PPPoPNS: Remove length argument from data_ready
  usb: gadget: function: fix unused function warnings
  android: configs: base: enable Android gadget functions
  usb: gadget: audio_source function depends on SND_PCM
  tcp: Silence warning: ‘in’ may be used uninitialized
  drivers/base: cpu: fix CPU_AUTOPROBE
  of/fdt: fix build warnings in early_init_dt_scan_chosen()
parents 070565ae ceec4d23

android/configs/android-base.cfg

+6 −0
Original line number Diff line number Diff line
@@ -150,5 +150,11 @@ CONFIG_TUN=y 
CONFIG_UNIX=y

CONFIG_USB_GADGET=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_OTG_WAKELOCK=y

CONFIG_XFRM_USER=y

drivers/base/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ int register_cpu(struct cpu *cpu, int num) 
	cpu->dev.offline_disabled = !cpu->hotpluggable;

	cpu->dev.offline = !cpu_online(num);

	cpu->dev.of_node = of_get_cpu_node(num, NULL);

#ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE

#ifdef CONFIG_HAVE_CPU_AUTOPROBE

	cpu->dev.bus->uevent = cpu_uevent;

#endif

	cpu->dev.groups = common_cpu_attr_groups;

drivers/net/ppp/pppopns.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ drop: 
	return NET_RX_DROP;

}



static void pppopns_recv(struct sock *sk_raw, int length)

static void pppopns_recv(struct sock *sk_raw)

{

	struct sk_buff *skb;

	while ((skb = skb_dequeue(&sk_raw->sk_receive_queue))) {

drivers/of/fdt.c

+2 −2
Original line number Diff line number Diff line
@@ -911,8 +911,8 @@ static const char *config_cmdline = ""; 
int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,

				     int depth, void *data)

{

	unsigned long l = 0;

	char *p = NULL;

	int l = 0;

	const char *p = NULL;

	char *cmdline = data;



	pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);

drivers/usb/gadget/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ config USB_CONFIGFS_F_ACC 
config USB_CONFIGFS_F_AUDIO_SRC

	boolean "Audio Source gadget"

	depends on USB_CONFIGFS && USB_CONFIGFS_F_ACC

	depends on SND_PCM

	select USB_F_AUDIO_SRC

	help

	  USB gadget Audio Source support