Skip to content

Commit 5488c75

Browse files
peterhurleygregkh
authored andcommitted
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: bc80fbe commit: 593fb1a 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 <[email protected]> Cc: George Spelvin <[email protected]> Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent bc80fbe commit 5488c75

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

include/linux/sunserialcore.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
#ifndef _SERIAL_SUN_H
1414
#define _SERIAL_SUN_H
1515

16+
#include <linux/device.h>
17+
#include <linux/serial_core.h>
18+
#include <linux/console.h>
19+
1620
/* Serial keyboard defines for L1-A processing... */
1721
#define SUNKBD_RESET 0xff
1822
#define SUNKBD_L1 0x01

0 commit comments

Comments
 (0)