diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 13:22:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 13:22:49 -0400 |
commit | fbf8d7106c926d375c76e65cc878f4fa7b91cbc3 (patch) | |
tree | e9faf7f8a9ce8da9ad2e2a3f1768a4af414670d4 /drivers/net/ethernet/allwinner/Kconfig | |
parent | 98f62b7a082e1e9eb762c7329a704316f6e07698 (diff) | |
parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) |
Merge 3.11-rc5 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/allwinner/Kconfig')
-rw-r--r-- | drivers/net/ethernet/allwinner/Kconfig | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig index 53ad213e865b..d8d95d4cd45a 100644 --- a/drivers/net/ethernet/allwinner/Kconfig +++ b/drivers/net/ethernet/allwinner/Kconfig | |||
@@ -3,19 +3,20 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | config NET_VENDOR_ALLWINNER | 5 | config NET_VENDOR_ALLWINNER |
6 | bool "Allwinner devices" | 6 | bool "Allwinner devices" |
7 | default y | 7 | default y |
8 | depends on ARCH_SUNXI | ||
9 | ---help--- | ||
10 | If you have a network (Ethernet) card belonging to this | ||
11 | class, say Y and read the Ethernet-HOWTO, available from | ||
12 | <http://www.tldp.org/docs.html#howto>. | ||
13 | 8 | ||
14 | Note that the answer to this question doesn't directly | 9 | depends on ARCH_SUNXI |
15 | affect the kernel: saying N will just cause the configurator | 10 | ---help--- |
16 | to skip all the questions about Allwinner cards. If you say Y, | 11 | If you have a network (Ethernet) card belonging to this |
17 | you will be asked for your specific card in the following | 12 | class, say Y and read the Ethernet-HOWTO, available from |
18 | questions. | 13 | <http://www.tldp.org/docs.html#howto>. |
14 | |||
15 | Note that the answer to this question doesn't directly | ||
16 | affect the kernel: saying N will just cause the configurator | ||
17 | to skip all the questions about Allwinner cards. If you say Y, | ||
18 | you will be asked for your specific card in the following | ||
19 | questions. | ||
19 | 20 | ||
20 | if NET_VENDOR_ALLWINNER | 21 | if NET_VENDOR_ALLWINNER |
21 | 22 | ||
@@ -26,6 +27,7 @@ config SUN4I_EMAC | |||
26 | select CRC32 | 27 | select CRC32 |
27 | select MII | 28 | select MII |
28 | select PHYLIB | 29 | select PHYLIB |
30 | select MDIO_SUN4I | ||
29 | ---help--- | 31 | ---help--- |
30 | Support for Allwinner A10 EMAC ethernet driver. | 32 | Support for Allwinner A10 EMAC ethernet driver. |
31 | 33 | ||