diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-16 03:05:19 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 19:29:01 -0400 |
| commit | 7ac6653a085b41405758bc16b2525db56ee0a23f (patch) | |
| tree | 1a3fc878f338778dd8a9ee8b06dab899a4ec5a87 /drivers/net/Kconfig | |
| parent | ef7f54297df683665145859501f63c801f6c7ea8 (diff) | |
stmmac: Move the STMicroelectronics driver
Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and
make the necessary Kconfig and Makefile changes.
CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d3d2febeda17..a7ec50f197fc 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1406,8 +1406,6 @@ config S6GMAC | |||
| 1406 | To compile this driver as a module, choose M here. The module | 1406 | To compile this driver as a module, choose M here. The module |
| 1407 | will be called s6gmac. | 1407 | will be called s6gmac. |
| 1408 | 1408 | ||
| 1409 | source "drivers/net/stmmac/Kconfig" | ||
| 1410 | |||
| 1411 | config PCH_GBE | 1409 | config PCH_GBE |
| 1412 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" | 1410 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" |
| 1413 | depends on PCI | 1411 | depends on PCI |