diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-10 15:14:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-10 15:14:26 +1000 |
| commit | dce750fa285f0107c1eb8b9edcf19e40e2628c4a (patch) | |
| tree | 506468613b6e4051fd9d3528b5f8026c757cd4f8 /drivers/staging/winbond/wbusb_s.h | |
| parent | 2b5e8511554f577dd5045a586aa513a3ecf1c4b6 (diff) | |
| parent | c1cfeb2b7e86543897b250717bcd4ae7c8f8a6b9 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
Diffstat (limited to 'drivers/staging/winbond/wbusb_s.h')
| -rw-r--r-- | drivers/staging/winbond/wbusb_s.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/staging/winbond/wbusb_s.h b/drivers/staging/winbond/wbusb_s.h index 0c7e6a383f2d..8961ae594c4e 100644 --- a/drivers/staging/winbond/wbusb_s.h +++ b/drivers/staging/winbond/wbusb_s.h @@ -1,16 +1,10 @@ -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Copyright (c) 1996-2004 Winbond Electronic Corporation -// -// Module Name: -// wbusb_s.h -// -// Abstract: -// Linux driver. -// -// Author: -// -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - +/* ========================================================= + * Copyright (c) 1996-2004 Winbond Electronic Corporation + * + * Module Name: + * wbusb_s.h + * ========================================================= + */ #ifndef __WINBOND_WBUSB_S_H #define __WINBOND_WBUSB_S_H @@ -18,8 +12,7 @@ struct wb_usb { u32 IsUsb20; - struct usb_device *udev; + struct usb_device *udev; u32 DetectCount; }; - #endif |