Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265258
b: refs/heads/master
c: 679ec0e
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Kirsher committed Aug 12, 2011
1 parent 4de761e commit 32e3689
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 57d0b7a0d77d0b770682e425ff3fa270c65a4eb5
refs/heads/master: 679ec0ef08afde98fd5b2d1aa9fb3e50cce657a0
2 changes: 1 addition & 1 deletion trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ F: arch/arm/mach-nuc93x/
F: drivers/input/keyboard/w90p910_keypad.c
F: drivers/input/touchscreen/w90p910_ts.c
F: drivers/watchdog/nuc900_wdt.c
F: drivers/net/arm/w90p910_ether.c
F: drivers/net/ethernet/nuvoton/w90p910_ether.c
F: drivers/mtd/nand/nuc900_nand.c
F: drivers/rtc/rtc-nuc900.c
F: drivers/spi/spi_nuc900.c
Expand Down
9 changes: 0 additions & 9 deletions trunk/drivers/net/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,3 @@ config ARM_AT91_ETHER
help
If you wish to compile a kernel for the AT91RM9200 and enable
ethernet support, then you should always answer Y to this.

config W90P910_ETH
tristate "Nuvoton w90p910 Ethernet support"
depends on ARM && ARCH_W90X900
select PHYLIB
select MII
help
Say Y here if you want to use built-in Ethernet ports
on w90p910 processor.
1 change: 0 additions & 1 deletion trunk/drivers/net/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
#

obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o
1 change: 1 addition & 0 deletions trunk/drivers/net/ethernet/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ source "drivers/net/ethernet/micrel/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/nuvoton/Kconfig"
source "drivers/net/ethernet/oki-semi/Kconfig"
source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/ethernet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
Expand Down
29 changes: 29 additions & 0 deletions trunk/drivers/net/ethernet/nuvoton/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#
# Nuvoton network device configuration
#

config NET_VENDOR_NUVOTON
bool "Nuvoton devices"
depends on ARM && ARCH_W90X900
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.

Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about Nuvoton cards. If you say Y, you will be asked
for your specific card in the following questions.

if NET_VENDOR_NUVOTON

config W90P910_ETH
tristate "Nuvoton w90p910 Ethernet support"
depends on ARM && ARCH_W90X900
select PHYLIB
select MII
---help---
Say Y here if you want to use built-in Ethernet ports
on w90p910 processor.

endif # NET_VENDOR_NUVOTON
5 changes: 5 additions & 0 deletions trunk/drivers/net/ethernet/nuvoton/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Makefile for the Nuvoton network device drivers.
#

obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o
File renamed without changes.

0 comments on commit 32e3689

Please sign in to comment.