Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / sfc / boards.h

diff --git a/drivers/net/sfc/boards.h b/drivers/net/sfc/boards.h
index c6e01b64bfb471ff57ce99cc33c0ef3622771d7f..44942de0e080a07de6377b26ce5539535dba6e59 100644 (file)
--- a/drivers/net/sfc/boards.h
+++ b/drivers/net/sfc/boards.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2007 Solarflare Communications Inc.
+ * Copyright 2007-2008 Solarflare Communications Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -12,14 +12,17 @@
 
 /* Board IDs (must fit in 8 bits) */
 enum efx_board_type {
-       EFX_BOARD_INVALID = 0,
-       EFX_BOARD_SFE4001 = 1,   /* SFE4001 (10GBASE-T) */
+       EFX_BOARD_SFE4001 = 1,
        EFX_BOARD_SFE4002 = 2,
-       /* Insert new types before here */
-       EFX_BOARD_MAX
+       EFX_BOARD_SFN4111T = 0x51,
+       EFX_BOARD_SFN4112F = 0x52,
 };
 
-extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info);
+extern void efx_set_board_info(struct efx_nic *efx, u16 revision_info);
+
+/* SFE4001 (10GBASE-T) */
 extern int sfe4001_init(struct efx_nic *efx);
+/* SFN4111T (100/1000/10GBASE-T) */
+extern int sfn4111t_init(struct efx_nic *efx);
 
 #endif