From: Ralf Baechle <ralf@linux-mips.org> Date: Thu, 2 Apr 2015 14:26:32 +0000 (+0200) Subject: MIPS: SEAD3: sead3-ehci should not be a module. X-Git-Tag: v4.1-rc1~98^2~60 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6b09adcf6a96bbc1d7456b0a4da160fa737c6c2f;p=linux.git MIPS: SEAD3: sead3-ehci should not be a module. So let's remove everythig that only make sense for a kernel module and build the thing unconditionally. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile index 46d83b362635..37f95f2ac997 100644 --- a/arch/mips/mti-sead3/Makefile +++ b/arch/mips/mti-sead3/Makefile @@ -8,14 +8,13 @@ # Copyright (C) 2012 MIPS Technoligies, Inc. All rights reserved. # Steven J. Hill <sjhill@mips.com> # -obj-y := sead3-lcd.o sead3-display.o sead3-init.o \ - sead3-int.o sead3-mtd.o sead3-net.o \ - sead3-platform.o sead3-reset.o \ +obj-y := sead3-lcd.o sead3-display.o sead3-ehci.o \ + sead3-init.o sead3-int.o sead3-mtd.o \ + sead3-net.o sead3-platform.o sead3-reset.o \ sead3-setup.o sead3-time.o obj-y += leds-sead3.o sead3-leds.o obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o -obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt diff --git a/arch/mips/mti-sead3/sead3-ehci.c b/arch/mips/mti-sead3/sead3-ehci.c index 014dd7ba4d68..c46b14f3ccb7 100644 --- a/arch/mips/mti-sead3/sead3-ehci.c +++ b/arch/mips/mti-sead3/sead3-ehci.c @@ -5,7 +5,7 @@ * * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. */ -#include <linux/module.h> +#include <linux/init.h> #include <linux/irq.h> #include <linux/dma-mapping.h> #include <linux/platform_device.h> @@ -46,8 +46,4 @@ static int __init ehci_init(void) return platform_device_register(&ehci_device); } -module_init(ehci_init); - -MODULE_AUTHOR("Chris Dearman <chris@mips.com>"); -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("EHCI probe driver for SEAD3"); +device_initcall(ehci_init);