Merge branch 'perf/urgent' into perf/core, to pick up fixes

[karo-tx-linux.git] / drivers / scsi / aacraid / rx.c

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 0e69a80c327583cd1c6bbce0408a328123d1bb10..5d19c31e3bbac58b9f63908af81c656545c43690 100644 (file)
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -475,7 +475,7 @@ static int aac_rx_restart_adapter(struct aac_dev *dev, int bled, u8 reset_type)
 {
        u32 var = 0;
 
-       if (!(dev->supplement_adapter_info.SupportedOptions2 &
+       if (!(dev->supplement_adapter_info.supported_options2 &
          AAC_OPTION_MU_RESET) || (bled >= 0) || (bled == -2)) {
                if (bled)
                        printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",