From 5488c753530b7b08437df6115a2c2c6156c2f0f6 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Wed, 13 Feb 2013 14:54:30 -0500 Subject: 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: >> 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 >> 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 >> 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 Reported-by: kbuild test robot Cc: George Spelvin Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- include/linux/sunserialcore.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/linux/sunserialcore.h') diff --git a/include/linux/sunserialcore.h b/include/linux/sunserialcore.h index 68e7430bb0fe..dbe4d7fca1b8 100644 --- a/include/linux/sunserialcore.h +++ b/include/linux/sunserialcore.h @@ -13,6 +13,10 @@ #ifndef _SERIAL_SUN_H #define _SERIAL_SUN_H +#include +#include +#include + /* Serial keyboard defines for L1-A processing... */ #define SUNKBD_RESET 0xff #define SUNKBD_L1 0x01 -- cgit v1.2.3