Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb693d29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 6dec3cf5 01d40f28

drivers/net/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -548,6 +548,14 @@ config SUNGEM 
	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also

	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also

	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.

	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.





config CASSINI

	tristate "Sun Cassini support"

	depends on NET_ETHERNET && PCI

	select CRC32

	help

	  Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also

	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>



config NET_VENDOR_3COM

config NET_VENDOR_3COM

	bool "3COM cards"

	bool "3COM cards"

	depends on NET_ETHERNET && (ISA || EISA || MCA || PCI)

	depends on NET_ETHERNET && (ISA || EISA || MCA || PCI)

drivers/net/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_SUNQE) += sunqe.o 
obj-$(CONFIG_SUNBMAC) += sunbmac.o

obj-$(CONFIG_SUNBMAC) += sunbmac.o

obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o

obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o

obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o

obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o

obj-$(CONFIG_CASSINI) += cassini.o





obj-$(CONFIG_MACE) += mace.o

obj-$(CONFIG_MACE) += mace.o

obj-$(CONFIG_BMAC) += bmac.o

obj-$(CONFIG_BMAC) += bmac.o

drivers/net/cassini.c

0 → 100644
+5311 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/cassini.h

0 → 100644
+4425 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/if_ether.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -111,7 +111,9 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb) 
	return (struct ethhdr *)skb->mac.raw;

	return (struct ethhdr *)skb->mac.raw;

}

}





#ifdef CONFIG_SYSCTL

extern struct ctl_table ether_table[];

extern struct ctl_table ether_table[];

#endif

#endif

#endif





#endif	/* _LINUX_IF_ETHER_H */
 
#endif	/* _LINUX_IF_ETHER_H */