diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/cpc-usb/cpcusb.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/cpc-usb/cpcusb.h')
-rw-r--r-- | drivers/staging/cpc-usb/cpcusb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/cpc-usb/cpcusb.h b/drivers/staging/cpc-usb/cpcusb.h index e5273dd..6bdf30b 100644 --- a/drivers/staging/cpc-usb/cpcusb.h +++ b/drivers/staging/cpc-usb/cpcusb.h @@ -75,7 +75,7 @@ typedef struct CPC_USB { #define CPC_DRIVER_VERSION "0.724" #define CPC_DRIVER_SERIAL "not applicable" -#define OBUF_SIZE 255 // 4096 +#define OBUF_SIZE 255 /* 4096 */ /* read timeouts -- RD_NAK_TIMEOUT * RD_EXPIRE = Number of seconds */ #define RD_NAK_TIMEOUT (10*HZ) /* Default number of X seconds to wait */ |