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

Commit e68aee64 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.206(2be2d899) into msm-4.9"

parents fe9874eb 7f79f5f5

Documentation/hid/uhid.txt

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ them but you should handle them according to your needs. 
  UHID_OUTPUT:

  This is sent if the HID device driver wants to send raw data to the I/O

  device on the interrupt channel. You should read the payload and forward it to

  the device. The payload is of type "struct uhid_data_req".

  the device. The payload is of type "struct uhid_output_req".

  This may be received even though you haven't received UHID_OPEN, yet.



  UHID_GET_REPORT:

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 205

SUBLEVEL = 206

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/Kconfig.debug

+14 −14
Original line number Diff line number Diff line
@@ -1355,7 +1355,8 @@ config DEBUG_OMAP2PLUS_UART 
	depends on ARCH_OMAP2PLUS



config DEBUG_IMX_UART_PORT

	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \

	int "i.MX Debug UART Port Selection"

	depends on DEBUG_IMX1_UART || \

		   DEBUG_IMX25_UART || \

		   DEBUG_IMX21_IMX27_UART || \

		   DEBUG_IMX31_UART || \
@@ -1369,7 +1370,6 @@ config DEBUG_IMX_UART_PORT 
		   DEBUG_IMX6UL_UART || \

		   DEBUG_IMX7D_UART

	default 1

	depends on ARCH_MXC

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.

arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi

+2 −6
Original line number Diff line number Diff line
@@ -17,12 +17,8 @@ 


	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x20000000>;

	};



	memory@b0000000 {

		device_type = "memory";

		reg = <0xb0000000 0x20000000>;

		reg = <0x70000000 0x20000000>,

		      <0xb0000000 0x20000000>;

	};



	regulators {

arch/arm/mach-ks8695/board-acs5k.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = { 
	},

};



static void acs5k_i2c_init(void)

static void __init acs5k_i2c_init(void)

{

	/* The gpio interface */

	platform_device_register(&acs5k_i2c_device);