Update of /cvsroot/gc-linux/linux/drivers/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/net
Modified Files:
Kconfig Makefile gcn-bba.c
Log Message:
Merge gc-linux-v2.6.30.
Index: gcn-bba.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gcn-bba.c 2 Mar 2009 18:46:20 -0000 1.18
--- gcn-bba.c 25 Oct 2009 18:50:27 -0000 1.19
***************
*** 348,357 ****
#if defined(__BIG_ENDIAN_BITFIELD)
__u32 status:8,
! packet_len : 12,
! next_packet_ptr : 12;
#else
__u32 next_packet_ptr:12,
! packet_len : 12,
! status : 8;
#endif
} __attribute((packed));
--- 348,357 ----
#if defined(__BIG_ENDIAN_BITFIELD)
__u32 status:8,
! packet_len:12,
! next_packet_ptr:12;
#else
__u32 next_packet_ptr:12,
! packet_len:12,
! status:8;
#endif
} __attribute((packed));
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Makefile 25 Oct 2009 18:45:35 -0000 1.34
--- Makefile 25 Oct 2009 18:50:27 -0000 1.35
***************
*** 234,237 ****
--- 234,238 ----
obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_ETHOC) += ethoc.o
+ obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Kconfig 25 Oct 2009 18:45:35 -0000 1.40
--- Kconfig 25 Oct 2009 18:50:27 -0000 1.41
***************
*** 281,284 ****
--- 281,293 ----
will be called bmac.
+ config GAMECUBE_BBA
+ tristate "Nintendo GameCube ethernet BroadBand Adapter (BBA)"
+ depends on GAMECUBE_EXI && GAMECUBE
+ help
+ Say Y here to add ethernet support for the Broadband Adapter (BBA).
+
+ To compile this driver as a module, choose M here: the module
+ will be called gcn-bba.
+
config ARIADNE
tristate "Ariadne support"
|
