summaryrefslogtreecommitdiffstats
path: root/drivers/net/bna/bfi.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-05-10 13:30:45 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-10 13:30:45 -0700
commit8a1629c771b1a60bc6d73394d869fe69b13200dc (patch)
tree12f68138d95b70d450ab418fdfb300ebdcd2f003 /drivers/net/bna/bfi.h
parent04aebcbb1b6dccadc8862b2765265f65a946db57 (diff)
parent693d92a1bbc9e42681c42ed190bd42b636ca876f (diff)
downloadblackbird-op-linux-8a1629c771b1a60bc6d73394d869fe69b13200dc.tar.gz
blackbird-op-linux-8a1629c771b1a60bc6d73394d869fe69b13200dc.zip
Merge branch 2.6.39-rc7 into usb-linus
This was needed to resolve a conflict in: drivers/usb/host/isp1760-hcd.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/bna/bfi.h')
-rw-r--r--drivers/net/bna/bfi.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bna/bfi.h b/drivers/net/bna/bfi.h
index a97396811050..6050379526f7 100644
--- a/drivers/net/bna/bfi.h
+++ b/drivers/net/bna/bfi.h
@@ -184,12 +184,14 @@ enum bfi_mclass {
#define BFI_IOC_MSGLEN_MAX 32 /* 32 bytes */
#define BFI_BOOT_TYPE_OFF 8
-#define BFI_BOOT_PARAM_OFF 12
+#define BFI_BOOT_LOADER_OFF 12
-#define BFI_BOOT_TYPE_NORMAL 0 /* param is device id */
+#define BFI_BOOT_TYPE_NORMAL 0
#define BFI_BOOT_TYPE_FLASH 1
#define BFI_BOOT_TYPE_MEMTEST 2
+#define BFI_BOOT_LOADER_OS 0
+
#define BFI_BOOT_MEMTEST_RES_ADDR 0x900
#define BFI_BOOT_MEMTEST_RES_SIG 0xA0A1A2A3
OpenPOWER on IntegriCloud