diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-03 22:45:52 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-03 22:45:52 (GMT) |
| commit | 0f7ca5917e989c4f77db3e97f92badaf3266d4dc (patch) | |
| tree | 0f29c4d45870c7d6317ff768c751aebf0948098a /drivers/net/phy/Makefile | |
| parent | a2f3be17c07ad9bd45ab300f79642ecb39cfb553 (diff) | |
| parent | d05070091849015f8c5b7d55cd75b86ebb61b3ec (diff) | |
| download | linux-fsl-qoriq-0f7ca5917e989c4f77db3e97f92badaf3266d4dc.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/phy/Makefile')
| -rw-r--r-- | drivers/net/phy/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 1342585..13bebab 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -20,4 +20,5 @@ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_NATIONAL_PHY) += national.o obj-$(CONFIG_STE10XP) += ste10Xp.o +obj-$(CONFIG_MICREL_PHY) += micrel.o obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o |