Skip to content

Commit

Permalink
usb: gadget: renesas_usbhs: fixup driver compile style
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Felipe Balbi committed Oct 13, 2011
1 parent 4829820 commit 951fe82
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions drivers/usb/renesas_usbhs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
config USB_RENESAS_USBHS
tristate 'Renesas USBHS controller'
depends on SUPERH || ARCH_SHMOBILE
depends on USB && USB_GADGET
default n
help
Renesas USBHS is a discrete USB host and peripheral controller chip
Expand Down
9 changes: 7 additions & 2 deletions drivers/usb/renesas_usbhs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs.o

renesas_usbhs-y := common.o mod.o pipe.o fifo.o

renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_HCD) += mod_host.o
renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_UDC) += mod_gadget.o
ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),)
renesas_usbhs-y += mod_host.o
endif

ifneq ($(CONFIG_USB_RENESAS_USBHS_UDC),)
renesas_usbhs-y += mod_gadget.o
endif
6 changes: 4 additions & 2 deletions drivers/usb/renesas_usbhs/mod.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod);
/*
* host / gadget control
*/
#ifdef CONFIG_USB_RENESAS_USBHS_HCD
#if defined(CONFIG_USB_RENESAS_USBHS_HCD) || \
defined(CONFIG_USB_RENESAS_USBHS_HCD_MODULE)
extern int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv);
extern int __devexit usbhs_mod_host_remove(struct usbhs_priv *priv);
#else
Expand All @@ -154,7 +155,8 @@ static inline void usbhs_mod_host_remove(struct usbhs_priv *priv)
}
#endif

#ifdef CONFIG_USB_RENESAS_USBHS_UDC
#if defined(CONFIG_USB_RENESAS_USBHS_UDC) || \
defined(CONFIG_USB_RENESAS_USBHS_UDC_MODULE)
extern int __devinit usbhs_mod_gadget_probe(struct usbhs_priv *priv);
extern void __devexit usbhs_mod_gadget_remove(struct usbhs_priv *priv);
#else
Expand Down

0 comments on commit 951fe82

Please sign in to comment.