Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:
"Only two changes. One removes unused code, the other makes local clock
code arguments consistent with generic clock code"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: remove dead code
m68k: allow NULL clock for clk_get_rate

+3 -37
+3
arch/m68k/coldfire/clk.c
··· 121 121 122 122 unsigned long clk_get_rate(struct clk *clk) 123 123 { 124 + if (!clk) 125 + return 0; 126 + 124 127 return clk->rate; 125 128 } 126 129 EXPORT_SYMBOL(clk_get_rate);
-37
arch/m68k/coldfire/m5441x.c
··· 222 222 m5441x_uarts_init(); 223 223 m5441x_fec_init(); 224 224 } 225 - 226 - 227 - #if IS_ENABLED(CONFIG_RTC_DRV_M5441x) 228 - static struct resource m5441x_rtc_resources[] = { 229 - { 230 - .start = MCFRTC_BASE, 231 - .end = MCFRTC_BASE + MCFRTC_SIZE - 1, 232 - .flags = IORESOURCE_MEM, 233 - }, 234 - { 235 - .start = MCF_IRQ_RTC, 236 - .end = MCF_IRQ_RTC, 237 - .flags = IORESOURCE_IRQ, 238 - }, 239 - }; 240 - 241 - static struct platform_device m5441x_rtc = { 242 - .name = "mcfrtc", 243 - .id = 0, 244 - .resource = m5441x_rtc_resources, 245 - .num_resources = ARRAY_SIZE(m5441x_rtc_resources), 246 - }; 247 - #endif 248 - 249 - static struct platform_device *m5441x_devices[] __initdata = { 250 - #if IS_ENABLED(CONFIG_RTC_DRV_M5441x) 251 - &m5441x_rtc, 252 - #endif 253 - }; 254 - 255 - static int __init init_BSP(void) 256 - { 257 - platform_add_devices(m5441x_devices, ARRAY_SIZE(m5441x_devices)); 258 - return 0; 259 - } 260 - 261 - arch_initcall(init_BSP);