aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2015-04-02 10:26:32 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-04-02 10:26:32 -0400
commit6b09adcf6a96bbc1d7456b0a4da160fa737c6c2f (patch)
tree78370ca1f550cf72a54e66e2dab16f06986e253c
parent85f215cf9b8a8888e1742bbfb00a29f609f28022 (diff)
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>
-rw-r--r--arch/mips/mti-sead3/Makefile7
-rw-r--r--arch/mips/mti-sead3/sead3-ehci.c8
2 files changed, 5 insertions, 10 deletions
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 @@
8# Copyright (C) 2012 MIPS Technoligies, Inc. All rights reserved. 8# Copyright (C) 2012 MIPS Technoligies, Inc. All rights reserved.
9# Steven J. Hill <sjhill@mips.com> 9# Steven J. Hill <sjhill@mips.com>
10# 10#
11obj-y := sead3-lcd.o sead3-display.o sead3-init.o \ 11obj-y := sead3-lcd.o sead3-display.o sead3-ehci.o \
12 sead3-int.o sead3-mtd.o sead3-net.o \ 12 sead3-init.o sead3-int.o sead3-mtd.o \
13 sead3-platform.o sead3-reset.o \ 13 sead3-net.o sead3-platform.o sead3-reset.o \
14 sead3-setup.o sead3-time.o 14 sead3-setup.o sead3-time.o
15 15
16obj-y += leds-sead3.o sead3-leds.o 16obj-y += leds-sead3.o sead3-leds.o
17 17
18obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o 18obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o
19obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o
20 19
21CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt 20CFLAGS_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 @@
5 * 5 *
6 * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. 6 * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
7 */ 7 */
8#include <linux/module.h> 8#include <linux/init.h>
9#include <linux/irq.h> 9#include <linux/irq.h>
10#include <linux/dma-mapping.h> 10#include <linux/dma-mapping.h>
11#include <linux/platform_device.h> 11#include <linux/platform_device.h>
@@ -46,8 +46,4 @@ static int __init ehci_init(void)
46 return platform_device_register(&ehci_device); 46 return platform_device_register(&ehci_device);
47} 47}
48 48
49module_init(ehci_init); 49device_initcall(ehci_init);
50
51MODULE_AUTHOR("Chris Dearman <chris@mips.com>");
52MODULE_LICENSE("GPL");
53MODULE_DESCRIPTION("EHCI probe driver for SEAD3");