diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-11 03:18:13 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-11 03:18:13 +0100 |
| commit | 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch) | |
| tree | a8506b9b15ed9a31c2171fc7b461ef52453307b0 /drivers/scsi/aacraid/aacraid.h | |
| parent | Merge branch 'for_2.6.34_4f4e65_a' of git://git.pwsan.com/linux-2.6 into omap... (diff) | |
| parent | OMAP: hsmmc: fix memory leak (diff) | |
| download | linux-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.tar.xz linux-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.zip | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
| -rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 83986ed86556..619c02d9c862 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -12,7 +12,7 @@ *----------------------------------------------------------------------------*/ #ifndef AAC_DRIVER_BUILD -# define AAC_DRIVER_BUILD 2461 +# define AAC_DRIVER_BUILD 24702 # define AAC_DRIVER_BRANCH "-ms" #endif #define MAXIMUM_NUM_CONTAINERS 32 @@ -1036,6 +1036,9 @@ struct aac_dev u8 printf_enabled; u8 in_reset; u8 msi; + int management_fib_count; + spinlock_t manage_lock; + }; #define aac_adapter_interrupt(dev) \ |