Skip to contentSkip to conversation

pps: Fix build breakage from decoupling pps from tty

PATCH New Peter Hurley 1 participant 1 message Feb 13, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pps: Fix build breakage from decoupling pps from tty

Fixes:

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-next
head:   bc80fbe46be7430487a45ad92841932bb2eaa3e6
commit: 593fb1ae457aab28b392ac114f6e3358788da985 pps: Move timestamp read into PPS code proper
date:   78 minutes ago
config: make ARCH=sparc defconfig

All error/warnings:

In file included from drivers/tty/serial/suncore.c:20:0:

Quoted 4 lines
Quoted 4 lines

include/linux/sunserialcore.h:29:15: warning: 'struct device_node' declared inside parameter list [enabled by default] include/linux/sunserialcore.h:29:15: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/sunserialcore.h:31:18: warning: 'struct device_node' declared inside parameter list [enabled by default] drivers/tty/serial/suncore.c:55:5: error: conflicting types for 'sunserial_console_match'

include/linux/sunserialcore.h:28:12: note: previous declaration of 'sunserial_console_match' was here

Quoted 1 line
Quoted 1 line

drivers/tty/serial/suncore.c:83:1: error: conflicting types for 'sunserial_console_match'

include/linux/sunserialcore.h:28:12: note: previous declaration of 'sunserial_console_match' was here

Quoted 1 line
Quoted 1 line

drivers/tty/serial/suncore.c:85:6: error: conflicting types for 'sunserial_console_termios'

include/linux/sunserialcore.h:30:13: note: previous declaration of 'sunserial_console_termios' was here

---
 include/linux/sunserialcore.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/sunserialcore.h +4 -0
index 68e7430..dbe4d7f 100644
@@ -13,6 +13,10 @@
 #ifndef _SERIAL_SUN_H
 #define _SERIAL_SUN_H
 
+#include <linux/device.h>
+#include <linux/serial_core.h>
+#include <linux/console.h>
+
 /* Serial keyboard defines for L1-A processing... */
 #define SUNKBD_RESET		0xff
 #define SUNKBD_L1		0x01
Signature · 1 line
1.8.1.2