diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/qla3xxx.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/qla3xxx.h')
| -rw-r--r-- | drivers/net/qla3xxx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h index 3362a661248c..73e234366a82 100644 --- a/drivers/net/qla3xxx.h +++ b/drivers/net/qla3xxx.h | |||
| @@ -770,7 +770,7 @@ enum { | |||
| 770 | FM93C56A_WDS = 0x0, | 770 | FM93C56A_WDS = 0x0, |
| 771 | FM93C56A_ERASE = 0x3, | 771 | FM93C56A_ERASE = 0x3, |
| 772 | FM93C56A_ERASE_ALL = 0x0, | 772 | FM93C56A_ERASE_ALL = 0x0, |
| 773 | /* Command Extentions */ | 773 | /* Command Extensions */ |
| 774 | FM93C56A_WEN_EXT = 0x3, | 774 | FM93C56A_WEN_EXT = 0x3, |
| 775 | FM93C56A_WRITE_ALL_EXT = 0x1, | 775 | FM93C56A_WRITE_ALL_EXT = 0x1, |
| 776 | FM93C56A_WDS_EXT = 0x0, | 776 | FM93C56A_WDS_EXT = 0x0, |