diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-11 15:15:50 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-11 15:15:50 -0800 |
| commit | 5b3382aad6a7c7e17fb61607d051772649cb1eef (patch) | |
| tree | 1a004ee24f8c5b6d58107dd7d4246504cc67ff48 /drivers/scsi/bfa/bfa_modules.h | |
| parent | 76c80a9a04eab07a74f363a161e215679ba4eb5f (diff) | |
| parent | dcb8baeceaa1c629bbd06f472cea023ad08a0c33 (diff) | |
Merge branch 'upstream/blkfront' into upstream/xen
* upstream/blkfront: (716 commits)
xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests
xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
xen/blkfront: change blk_shadow.request to proper pointer
xen/blkfront: map REQ_FLUSH into a full barrier
Linux 2.6.37-rc1
CRIS: Add paths for CRISv10 serial driver
spi/pl022: fix erroneous platform data in U300
Input: ir-keytable - fix uninitialized variable warning
i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
i2c-i801: Handle multiple instances instead of keeping global state
i2c-i801: Add Intel Patsburg device ID
i2c: Drop unused I2C_CLASS_TV flags
Input: appletouch - remove extra KERN_DEBUG use from dprintk
locks: remove fl_copy_lock lock_manager operation
locks: let the caller free file_lock on ->setlease failure
initramfs: Fix initramfs size for 32-bit arches
nfsd4: initialize delegation pointer to lease
locks: fix setlease methods to free passed-in lock
locks: fix leaks on setlease errors
locks: prevent ENOMEM on lease unlock
...
Diffstat (limited to 'drivers/scsi/bfa/bfa_modules.h')
| -rw-r--r-- | drivers/scsi/bfa/bfa_modules.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h index 2cd527338677..15407ab39e77 100644 --- a/drivers/scsi/bfa/bfa_modules.h +++ b/drivers/scsi/bfa/bfa_modules.h @@ -15,7 +15,7 @@ * General Public License for more details. */ -/** +/* * bfa_modules.h BFA modules */ @@ -52,7 +52,7 @@ enum { }; -/** +/* * Macro to define a new BFA module */ #define BFA_MODULE(__mod) \ @@ -80,7 +80,7 @@ enum { #define BFA_CACHELINE_SZ (256) -/** +/* * Structure used to interact between different BFA sub modules * * Each sub module needs to implement only the entry points relevant to it (and |