Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68knommu-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
- spelling in comment
- compilation when flexcan driver enabled
- sparse warning
* tag 'm68knommu-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Fix syntax errors in comments
m68k: coldfire: make symbol m523x_clk_lookup static
m68k: coldfire/device.c: protect FLEXCAN blocks
+5
-5
+3
-3
arch/m68k/coldfire/device.c
+3
-3
arch/m68k/coldfire/device.c
···
581
581
};
582
582
#endif /* MCFSDHC_BASE */
583
583
584
-
#if IS_ENABLED(CONFIG_CAN_FLEXCAN)
584
+
#ifdef MCFFLEXCAN_SIZE
585
585
586
586
#include <linux/can/platform/flexcan.h>
587
587
···
620
620
.resource = mcf5441x_flexcan0_resource,
621
621
.dev.platform_data = &mcf5441x_flexcan_info,
622
622
};
623
-
#endif /* IS_ENABLED(CONFIG_CAN_FLEXCAN) */
623
+
#endif /* MCFFLEXCAN_SIZE */
624
624
625
625
static struct platform_device *mcf_devices[] __initdata = {
626
626
&mcf_uart,
···
657
657
#ifdef MCFSDHC_BASE
658
658
&mcf_esdhc,
659
659
#endif
660
-
#if IS_ENABLED(CONFIG_CAN_FLEXCAN)
660
+
#ifdef MCFFLEXCAN_SIZE
661
661
&mcf_flexcan0,
662
662
#endif
663
663
};
+1
-1
arch/m68k/coldfire/intc-2.c
+1
-1
arch/m68k/coldfire/intc-2.c
···
7
7
* family, the 5270, 5271, 5274, 5275, and the 528x family which have two such
8
8
* controllers, and the 547x and 548x families which have only one of them.
9
9
*
10
-
* The external 7 fixed interrupts are part the the Edge Port unit of these
10
+
* The external 7 fixed interrupts are part of the Edge Port unit of these
11
11
* ColdFire parts. They can be configured as level or edge triggered.
12
12
*
13
13
* (C) Copyright 2009-2011, Greg Ungerer <gerg@snapgear.com>
+1
-1
arch/m68k/coldfire/m523x.c
+1
-1
arch/m68k/coldfire/m523x.c
···
28
28
DEFINE_CLK(pll, "pll.0", MCF_CLK);
29
29
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
30
30
31
-
struct clk_lookup m523x_clk_lookup[] = {
31
+
static struct clk_lookup m523x_clk_lookup[] = {
32
32
CLKDEV_INIT(NULL, "pll.0", &clk_pll),
33
33
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
34
34
CLKDEV_INIT("mcfpit.0", NULL, &clk_pll),