Peter Hurley 5488c75353 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: bc80fbe46b commit: 593fb1ae45 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 <fengguang.wu@intel.com> Cc: George Spelvin <linux@horizon.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-02-13 12:15:50 -08:00
..
acpi	PCI changes for the v3.8 merge window:	2012-12-13 12:14:47 -08:00
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2013-01-23 13:31:15 -08:00
clocksource
crypto	crypto: cast5/cast6 - move lookup tables to shared module	2012-12-06 17:16:26 +08:00
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel	2013-01-11 07:52:48 +10:00
keys
linux	pps: Fix build breakage from decoupling pps from tty	2013-02-13 12:15:50 -08:00
math-emu
media	[media] V4L: Add driver for S3C24XX/S3C64XX SoC series camera interface	2012-11-28 09:43:34 -02:00
memory
misc
net	Merge branch 'master' of git://1984.lsi.us.es/nf	2012-12-28 14:28:17 -08:00
pcmcia
ras
rdma	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00
rxrpc
scsi	SCSI misc on 20121212	2012-12-13 19:20:31 -08:00
sound	Merge remote-tracking branch 'asoc/fix/cs4271' into tmp	2013-01-10 12:22:11 +00:00
target	target: Introduce TCM_NO_SENSE	2013-01-10 20:06:08 -08:00
trace	Various bug fixes for ext4. Perhaps the most serious bug fixed is one	2013-01-02 09:57:34 -08:00
uapi	serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.	2013-02-04 15:05:04 -08:00
video	Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2	2012-12-16 11:28:10 -08:00
xen	Bugfixes:	2012-12-18 12:26:54 -08:00
Kbuild	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00