Commit 6da387fb authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] 2.5.54 -- ohci-dbg.c: 358: In function `show_list': `data1'

OK here's the version that without the kernel version #ifdef
that helped the backport ... it fixes the build by restoring
the "debug support only if CONFIG_USB_DEBUG" semantics.
parent 5a21f15b
...@@ -318,6 +318,8 @@ ohci_dump_ed (struct ohci_hcd *ohci, char *label, struct ed *ed, int verbose) ...@@ -318,6 +318,8 @@ ohci_dump_ed (struct ohci_hcd *ohci, char *label, struct ed *ed, int verbose)
} }
} }
#define DRIVERFS_DEBUG_FILES /* only on 2.5 versions */
#else #else
static inline void ohci_dump (struct ohci_hcd *controller, int verbose) {} static inline void ohci_dump (struct ohci_hcd *controller, int verbose) {}
...@@ -325,6 +327,8 @@ static inline void ohci_dump (struct ohci_hcd *controller, int verbose) {} ...@@ -325,6 +327,8 @@ static inline void ohci_dump (struct ohci_hcd *controller, int verbose) {}
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#ifdef DRIVERFS_DEBUG_FILES
static ssize_t static ssize_t
show_list (struct ohci_hcd *ohci, char *buf, size_t count, struct ed *ed) show_list (struct ohci_hcd *ohci, char *buf, size_t count, struct ed *ed)
{ {
...@@ -522,5 +526,12 @@ static inline void remove_debug_files (struct ohci_hcd *bus) ...@@ -522,5 +526,12 @@ static inline void remove_debug_files (struct ohci_hcd *bus)
device_remove_file (bus->hcd.controller, &dev_attr_periodic); device_remove_file (bus->hcd.controller, &dev_attr_periodic);
} }
#else /* empty stubs for creating those files */
static inline void create_debug_files (struct ohci_hcd *bus) { }
static inline void remove_debug_files (struct ohci_hcd *bus) { }
#endif /* DRIVERFS_DEBUG_FILES */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment