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

Commit 55a9e7c8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v3.12-rc2-v2' of... 

Merge tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

From Sekhar Nori, DaVinci fixes for v3.12-rc2:
- a fix build breakage with DEBUG_LL
- a quell a build-time warning

* tag 'davinci-fixes-for-v3.12-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: dm365 evm: fix unused variable warning
  ARM: davinci: fix build breakage with DEBUG_LL

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b44cf022 016b9eb0

arch/arm/mach-davinci/board-dm365-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct at24_platform_data eeprom_info = { 
	.context	= (void *)0x7f00,

};



static struct snd_platform_data dm365_evm_snd_data = {

static struct snd_platform_data dm365_evm_snd_data __maybe_unused = {

	.asp_chan_q = EVENTQ_3,

};

arch/arm/mach-davinci/include/mach/serial.h

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


#include <mach/hardware.h>



#include <linux/platform_device.h>



#define DAVINCI_UART0_BASE	(IO_PHYS + 0x20000)

#define DAVINCI_UART1_BASE	(IO_PHYS + 0x20400)

#define DAVINCI_UART2_BASE	(IO_PHYS + 0x20800)
@@ -39,6 +37,8 @@ 
#define UART_DM646X_SCR_TX_WATERMARK	0x08



#ifndef __ASSEMBLY__

#include <linux/platform_device.h>



extern int davinci_serial_init(struct platform_device *);

#endif