diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-10-13 00:02:44 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-10-13 13:41:54 -0400 |
commit | 951fe829c73b89a2e4a5b1aaae4c0a43ffa7c68e (patch) | |
tree | d0b9a3e2ac53f2773a09e6793014e12038f2fc4a /drivers/usb/renesas_usbhs | |
parent | 482982062f1bc25ffb5383ab724d73d1a7af07cf (diff) |
usb: gadget: renesas_usbhs: fixup driver compile style
In current renesas-usbhs,
there was inconsistency about the style of kernel module or built-in.
This patch solve it.
[ balbi@ti.com : fix compile issue when building modules ]
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/renesas_usbhs')
-rw-r--r-- | drivers/usb/renesas_usbhs/Kconfig | 1 | ||||
-rw-r--r-- | drivers/usb/renesas_usbhs/Makefile | 9 | ||||
-rw-r--r-- | drivers/usb/renesas_usbhs/mod.h | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig index 286cbf1ca7d..97a44016def 100644 --- a/drivers/usb/renesas_usbhs/Kconfig +++ b/drivers/usb/renesas_usbhs/Kconfig | |||
@@ -5,6 +5,7 @@ | |||
5 | config USB_RENESAS_USBHS | 5 | config USB_RENESAS_USBHS |
6 | tristate 'Renesas USBHS controller' | 6 | tristate 'Renesas USBHS controller' |
7 | depends on SUPERH || ARCH_SHMOBILE | 7 | depends on SUPERH || ARCH_SHMOBILE |
8 | depends on USB && USB_GADGET | ||
8 | default n | 9 | default n |
9 | help | 10 | help |
10 | Renesas USBHS is a discrete USB host and peripheral controller chip | 11 | Renesas USBHS is a discrete USB host and peripheral controller chip |
diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile index e44984d233f..bc8aef4311a 100644 --- a/drivers/usb/renesas_usbhs/Makefile +++ b/drivers/usb/renesas_usbhs/Makefile | |||
@@ -6,5 +6,10 @@ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs.o | |||
6 | 6 | ||
7 | renesas_usbhs-y := common.o mod.o pipe.o fifo.o | 7 | renesas_usbhs-y := common.o mod.o pipe.o fifo.o |
8 | 8 | ||
9 | renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_HCD) += mod_host.o | 9 | ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),) |
10 | renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_UDC) += mod_gadget.o | 10 | renesas_usbhs-y += mod_host.o |
11 | endif | ||
12 | |||
13 | ifneq ($(CONFIG_USB_RENESAS_USBHS_UDC),) | ||
14 | renesas_usbhs-y += mod_gadget.o | ||
15 | endif | ||
diff --git a/drivers/usb/renesas_usbhs/mod.h b/drivers/usb/renesas_usbhs/mod.h index 1f28ed2e9ab..8ae3733031c 100644 --- a/drivers/usb/renesas_usbhs/mod.h +++ b/drivers/usb/renesas_usbhs/mod.h | |||
@@ -141,7 +141,8 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod); | |||
141 | /* | 141 | /* |
142 | * host / gadget control | 142 | * host / gadget control |
143 | */ | 143 | */ |
144 | #ifdef CONFIG_USB_RENESAS_USBHS_HCD | 144 | #if defined(CONFIG_USB_RENESAS_USBHS_HCD) || \ |
145 | defined(CONFIG_USB_RENESAS_USBHS_HCD_MODULE) | ||
145 | extern int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv); | 146 | extern int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv); |
146 | extern int __devexit usbhs_mod_host_remove(struct usbhs_priv *priv); | 147 | extern int __devexit usbhs_mod_host_remove(struct usbhs_priv *priv); |
147 | #else | 148 | #else |
@@ -154,7 +155,8 @@ static inline void usbhs_mod_host_remove(struct usbhs_priv *priv) | |||
154 | } | 155 | } |
155 | #endif | 156 | #endif |
156 | 157 | ||
157 | #ifdef CONFIG_USB_RENESAS_USBHS_UDC | 158 | #if defined(CONFIG_USB_RENESAS_USBHS_UDC) || \ |
159 | defined(CONFIG_USB_RENESAS_USBHS_UDC_MODULE) | ||
158 | extern int __devinit usbhs_mod_gadget_probe(struct usbhs_priv *priv); | 160 | extern int __devinit usbhs_mod_gadget_probe(struct usbhs_priv *priv); |
159 | extern void __devexit usbhs_mod_gadget_remove(struct usbhs_priv *priv); | 161 | extern void __devexit usbhs_mod_gadget_remove(struct usbhs_priv *priv); |
160 | #else | 162 | #else |