android_kernel_oneplus_msm8998/arch/m68k
Boris Brezillon f03531d091 m68k: Fix ndelay() macro
commit 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa upstream.

The current ndelay() macro definition has an extra semi-colon at the
end of the line thus leading to a compilation error when ndelay is used
in a conditional block without curly braces like this one:

	if (cond)
		ndelay(t);
	else
		...

which, after the preprocessor pass gives:

	if (cond)
		m68k_ndelay(t);;
	else
		...

thus leading to the following gcc error:

	error: 'else' without a previous 'if'

Remove this extra semi-colon.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: c8ee038bd1 ("m68k: Implement ndelay() based on the existing udelay() logic")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2016-12-15 08:49:23 -08:00
..
68000 m68k: Use vsprintf %pM extension 2015-06-16 16:45:38 +10:00
68360 m68k: Use vsprintf %pM extension 2015-06-16 16:45:38 +10:00
amiga genirq: Remove irq argument from irq flow handlers 2015-09-16 15:47:51 +02:00
apollo m68k/apollo: Convert printk to pr_foo() 2014-05-28 10:11:55 +02:00
atari m68k/atari: Remove obsolete IRQ_TYPE_* 2015-01-15 13:44:51 +01:00
bvme6000
coldfire m68k/mm: m54xx - Add missing initialization of max_pfn 2015-11-22 11:35:24 +01:00
configs m68k/defconfig: Update defconfigs for v4.3-rc1 2015-09-28 10:01:09 +02:00
emu block: change ->make_request_fn() and users to return a queue cookie 2015-11-07 10:40:46 -07:00
fpsp040
hp300 m68k/hp300: Convert printk to pr_foo() 2014-05-28 10:11:55 +02:00
ifpsp060
include m68k: Fix ndelay() macro 2016-12-15 08:49:23 -08:00
kernel m68k: Wire up mlock2 2015-11-22 11:35:26 +01:00
lib m68k: Remove FSF address 2015-03-15 10:23:30 +01:00
mac m68k/mac: Export Peripheral System Controller (PSC) base address to modules 2015-09-29 21:11:13 -07:00
math-emu
mm m68k/mm: motorola - Add missing initialization of max_pfn 2015-11-22 11:35:24 +01:00
mvme16x m68k/mvme16x: rtc - Don't use module_init in non-modular code 2015-01-11 11:38:41 +01:00
mvme147 m68k/mvme147: config.c - Remove unused functions 2015-01-11 11:38:45 +01:00
q40
sun3 m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn 2015-11-22 11:35:25 +01:00
sun3x
tools/amiga
install.sh
Kconfig kexec: split kexec_load syscall from kexec core code 2015-09-10 13:29:01 -07:00
Kconfig.bus
Kconfig.cpu m68knommu: make ColdFire SoC selection a choice 2015-07-13 09:34:39 +10:00
Kconfig.debug m68k: Multi-platform EARLY_PRINTK 2014-05-28 10:10:04 +02:00
Kconfig.devices Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2014-10-08 05:40:17 -04:00
Kconfig.machine
Makefile m68k: move non-mmu 68360 platform code 2014-09-29 09:18:35 +10:00