git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
usb
/
gadget
/
pxa2xx_udc.c
diff --git
a/drivers/usb/gadget/pxa2xx_udc.c
b/drivers/usb/gadget/pxa2xx_udc.c
index
c1139b5
..
710f7a4
100644
(file)
--- a/
drivers/usb/gadget/pxa2xx_udc.c
+++ b/
drivers/usb/gadget/pxa2xx_udc.c
@@
-92,10
+92,6
@@
static const char ep0name [] = "ep0";
// #define USE_OUT_DMA
// #define DISABLE_TEST_MODE
// #define USE_OUT_DMA
// #define DISABLE_TEST_MODE
-#ifdef CONFIG_PROC_FS
-#define UDC_PROC_FILE
-#endif
-
#ifdef CONFIG_ARCH_IXP4XX
#undef USE_DMA
#ifdef CONFIG_ARCH_IXP4XX
#undef USE_DMA
@@
-109,12
+105,6
@@
static const char ep0name [] = "ep0";
#include "pxa2xx_udc.h"
#include "pxa2xx_udc.h"
-#ifdef CONFIG_EMBEDDED
-/* few strings, and little code to use them */
-#undef DEBUG
-#undef UDC_PROC_FILE
-#endif
-
#ifdef USE_DMA
static int use_dma = 1;
module_param(use_dma, bool, 0);
#ifdef USE_DMA
static int use_dma = 1;
module_param(use_dma, bool, 0);
@@
-1212,7
+1202,7
@@
static const struct usb_gadget_ops pxa2xx_udc_ops = {
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-#ifdef
UDC_PROC_FILE
+#ifdef
CONFIG_USB_GADGET_DEBUG_FILES
static const char proc_node_name [] = "driver/udc";
static const char proc_node_name [] = "driver/udc";
@@
-1368,11
+1358,12
@@
done:
#define remove_proc_files() \
remove_proc_entry(proc_node_name, NULL)
#define remove_proc_files() \
remove_proc_entry(proc_node_name, NULL)
-#else /* !UDC_PROC_FILE */
+#else /* !CONFIG_USB_GADGET_DEBUG_FILES */
+
#define create_proc_files() do {} while (0)
#define remove_proc_files() do {} while (0)
#define create_proc_files() do {} while (0)
#define remove_proc_files() do {} while (0)
-#endif /*
UDC_PROC_FILE
*/
+#endif /*
CONFIG_USB_GADGET_DEBUG_FILES
*/
/* "function" sysfs attribute */
static ssize_t
/* "function" sysfs attribute */
static ssize_t