---

yaml --- r: 122591 b: refs/heads/master c: 7a3c66e h: refs/heads/master i: 122589: 8f2b24f 122587: 623aa6c 122583: 5166678 122575: ac5cceb 122559: 2e4679d v: v3
git-mirror · Dec 12, 2008 · 92e2513 · 92e2513
1 parent 7491066
commit 92e2513
Show file tree

Hide file tree

Showing 5 changed files with 1,793 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82a9928db560c429807f02467d22394f944a8916
+refs/heads/master: 7a3c66e2d322c638e9306e739d96b2192dacde88
diff --git a/trunk/drivers/net/arm/Kconfig b/trunk/drivers/net/arm/Kconfig
@@ -40,6 +40,14 @@ config ARM_AT91_ETHER
 	  If you wish to compile a kernel for the AT91RM9200 and enable
 	  ethernet support, then you should always answer Y to this.
 
+config ARM_KS8695_ETHER
+	tristate "KS8695 Ethernet support"
+	depends on ARM && ARCH_KS8695
+	select MII
+	help
+	  If you wish to compile a kernel for the KS8695 and want to
+	  use the internal ethernet then you should answer Y to this.
+
 config EP93XX_ETH
 	tristate "EP93xx Ethernet support"
 	depends on ARM && ARCH_EP93XX

diff --git a/trunk/drivers/net/arm/Makefile b/trunk/drivers/net/arm/Makefile
@@ -8,5 +8,6 @@ obj-$(CONFIG_ARM_ETHERH)	+= etherh.o ../8390.o
 obj-$(CONFIG_ARM_ETHER3)	+= ether3.o
 obj-$(CONFIG_ARM_ETHER1)	+= ether1.o
 obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o
+obj-$(CONFIG_ARM_KS8695_ETHER)	+= ks8695net.o
 obj-$(CONFIG_EP93XX_ETH)	+= ep93xx_eth.o
 obj-$(CONFIG_IXP4XX_ETH)	+= ixp4xx_eth.o