summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2007-05-06 14:51:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 12:13:04 -0700
commit2fda4c90f65fd96ef910ba285d66984caf600a08 (patch)
treeb2b1e774f8805df686afdfdfaa1f7d986b499e0d
parentf0ac675806441d17303707856f4d23bd27092014 (diff)
downloadlinux-3.10-2fda4c90f65fd96ef910ba285d66984caf600a08.tar.gz
linux-3.10-2fda4c90f65fd96ef910ba285d66984caf600a08.tar.bz2
linux-3.10-2fda4c90f65fd96ef910ba285d66984caf600a08.zip
ehci-ps3, ohci-ps3: fix compilation
As seen on powerpc-cell et al: CC [M] drivers/usb/host/ehci-hcd.o In file included from drivers/usb/host/ehci-hcd.c:941: drivers/usb/host/ehci-ps3.c:79: error: conflicting types for 'dev_dbg' include/linux/device.h:576: error: previous definition of 'dev_dbg' was here make[4]: *** [drivers/usb/host/ehci-hcd.o] Error 1 CC [M] drivers/usb/host/ohci-hcd.o In file included from drivers/usb/host/ohci-hcd.c:921: drivers/usb/host/ohci-ps3.c:83: error: conflicting types for 'dev_dbg' include/linux/device.h:576: error: previous definition of 'dev_dbg' was here dev_dbg() will check format string for you in dummy case also, so remove buggers. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg KH <greg@kroah.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/usb/host/ehci-ps3.c7
-rw-r--r--drivers/usb/host/ohci-ps3.c8
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 4d781a2a980..93107453f12 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -73,13 +73,6 @@ static const struct hc_driver ps3_ehci_hc_driver = {
#endif
};
-#if !defined(DEBUG)
-#undef dev_dbg
-static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
- const struct device *_dev, const char *fmt, ...) {return 0;}
-#endif
-
-
static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
{
int result;
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 62283a3926d..c849f72b508 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -75,14 +75,6 @@ static const struct hc_driver ps3_ohci_hc_driver = {
#endif
};
-/* redefine dev_dbg to do a syntax check */
-
-#if !defined(DEBUG)
-#undef dev_dbg
-static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
- const struct device *_dev, const char *fmt, ...) {return 0;}
-#endif
-
static int ps3_ohci_sb_probe(struct ps3_system_bus_device *dev)
{
int result;