diff options
author | Tony Lindgren <tony@atomide.com> | 2011-01-10 23:23:41 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 23:23:41 +0100 |
commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /drivers/scsi/ibmvscsi/ibmvfc.h | |
parent | arm: omap4: pandaboard: turn on PHY reference clock at init (diff) | |
parent | omap3: clocks: Fix build error 'CK_3430ES2' undeclared here (diff) | |
download | linux-274353674dd0337bdeeaee08a9f2047777b07ab0.tar.xz linux-274353674dd0337bdeeaee08a9f2047777b07ab0.zip |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvfc.h')
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index ef663e7c9bbc..834c37fc7ce9 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h @@ -542,8 +542,8 @@ enum ibmvfc_async_event { }; struct ibmvfc_async_desc { - enum ibmvfc_async_event ae; const char *desc; + enum ibmvfc_async_event ae; int log_level; }; |