Paul Gortmaker c84b51e65e sh: Fix conflicting definitions of ptrace_triggered ... The extra nmi argument is causing this compile fail: CC arch/sh/kernel/ptrace_32.o arch/sh/kernel/ptrace_32.c:66:6: error: conflicting types for 'ptrace_triggered' arch/sh/include/asm/ptrace.h:126:13: note: previous declaration of 'ptrace_triggered' was here make[3]: *** [arch/sh/kernel/ptrace_32.o] Error 1 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-08-03 12:37:22 +09:00
..
boards	Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x	2011-08-01 06:10:16 -10:00
boot	sh: Remove compressed kernel libgcc dependency.	2011-06-06 17:57:58 +09:00
cchips	sh: Convert to new function names	2011-03-29 14:48:13 +02:00
configs	sh: fix compile error using sh7757lcr_defconfig	2011-06-21 17:40:42 +09:00
drivers	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	2011-07-22 08:26:06 -07:00
include	sh: Fix conflicting definitions of ptrace_triggered	2011-08-03 12:37:22 +09:00
kernel	Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x	2011-08-01 06:10:16 -10:00
lib	sh: Ensure ST40-300 BogoMIPS value is consistent	2011-02-15 16:24:05 +09:00
lib64	Fix common misspellings	2011-03-31 11:26:23 -03:00
math-emu	perf: Remove the nmi parameter from the swevent and overflow interface	2011-07-01 11:06:35 +02:00
mm	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 16:44:39 -07:00
oprofile	sh: remove warning and warning_symbol from struct stacktrace_ops	2011-05-23 14:42:15 +09:00
tools	sh: Add support for AP-SH4AD-0A board.	2011-01-13 18:36:21 +09:00
Kconfig	virtio: expose for non-virtualization users too	2011-07-23 16:20:30 +09:30
Kconfig.cpu	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	serial: sh-sci: Abstract register maps.	2011-06-14 12:40:19 +09:00