diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 18:31:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 18:31:04 +0100 |
| commit | 6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb (patch) | |
| tree | ee42b5053ffd3df4f6d9c2fe461c2b3cc015df1c /drivers/net/ethernet/xilinx/Kconfig | |
| parent | ntb: remove __dev* markings (diff) | |
| parent | Linux 3.8-rc4 (diff) | |
| download | linux-6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb.tar.xz linux-6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb.zip | |
Merge 3.8-rc4 into char-misc-next
This brings in all of the mei and other fixes that are needed to continue
development in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/xilinx/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/xilinx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig index 5778a4ae1164..122d60c0481b 100644 --- a/drivers/net/ethernet/xilinx/Kconfig +++ b/drivers/net/ethernet/xilinx/Kconfig @@ -27,7 +27,7 @@ config XILINX_EMACLITE config XILINX_AXI_EMAC tristate "Xilinx 10/100/1000 AXI Ethernet support" - depends on (PPC32 || MICROBLAZE) + depends on MICROBLAZE select PHYLIB ---help--- This driver supports the 10/100/1000 Ethernet from Xilinx for the |