diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 01:56:37 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 01:56:37 +0100 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /drivers/message/fusion/lsi/mpi_ioc.h | |
| parent | Merge branch 'rmobile-fixes-for-linus' into rmobile-latest (diff) | |
| parent | audit: always follow va_copy() with va_end() (diff) | |
| download | linux-04cf399640b7acfa9abe2eb7900cd934db8af697.tar.xz linux-04cf399640b7acfa9abe2eb7900cd934db8af697.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/message/fusion/lsi/mpi_ioc.h')
| -rw-r--r-- | drivers/message/fusion/lsi/mpi_ioc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h index fd6222882a0e..19fb21b8f0ce 100644 --- a/drivers/message/fusion/lsi/mpi_ioc.h +++ b/drivers/message/fusion/lsi/mpi_ioc.h @@ -857,7 +857,7 @@ typedef struct _EVENT_DATA_SAS_DISCOVERY #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) -/* SAS Discovery Errror Event data */ +/* SAS Discovery Error Event data */ typedef struct _EVENT_DATA_DISCOVERY_ERROR { |