diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 09:11:18 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 09:11:18 +0100 |
| commit | a4ad68d57e4dc4138304df23d1817eb094149389 (patch) | |
| tree | ca7d8c4ce5377c4251560de06e15dd7be7063351 /drivers/infiniband/hw/nes/nes_user.h | |
| parent | cd9d95a55550555da8e587ead9cbba5f98a371a3 (diff) | |
| parent | c97259df3f2e163c72f4d0685c61fb2e026dc989 (diff) | |
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_user.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_user.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/drivers/infiniband/hw/nes/nes_user.h index cc90c14b49eb..71e133ab209b 100644 --- a/drivers/infiniband/hw/nes/nes_user.h +++ b/drivers/infiniband/hw/nes/nes_user.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 - 2009 Intel-NE, Inc. All rights reserved. + * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. * Copyright (c) 2005 Topspin Communications. All rights reserved. * Copyright (c) 2005 Cisco Systems. All rights reserved. * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. @@ -86,6 +86,7 @@ enum iwnes_memreg_type { IWNES_MEMREG_TYPE_CQ = 0x0002, IWNES_MEMREG_TYPE_MW = 0x0003, IWNES_MEMREG_TYPE_FMR = 0x0004, + IWNES_MEMREG_TYPE_FMEM = 0x0005, }; struct nes_mem_reg_req { |