@@ -1368,6 +1368,27 @@ config AC3200
To compile this driver as a module, choose M here. The module
will be called ac3200.
+config KSZ884X_PCI
+ tristate "Micrel KSZ8841/2 PCI"
+ depends on NET_PCI && PCI
+ select MII
+ select CRC32
+ help
+ This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
+
+ To compile this driver as a module, choose M here. The module
+ will be called ksz884x.
+
+config KSZ8842_STP
+ bool "STP support (EXPERIMENTAL)"
+ depends on KSZ884X_PCI && EXPERIMENTAL
+ help
+ This enables a feature to aid KSZ8842 running Spanning Tree Protocol.
+ To actually use it pass the stp=1 parameter to the driver.
+
+ This feature is experimental and may not work correctly compared to
+ the Linux bridge using STP.
+
config APRICOT
tristate "Apricot Xen-II on board Ethernet"
depends on NET_PCI && ISA