diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-08 20:05:18 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-08 20:05:18 -0400 |
| commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
| tree | b7e792414fef2390718a657765719fbbb529ce84 /drivers/net/phy/Makefile | |
| parent | c3935e30495869dd611e1cd62253c94ebc7c6c04 (diff) | |
| parent | b160fdabe93a8a53094f90f02bf4dcb500782aab (diff) | |
| download | op-kernel-dev-44b56603c4c476b845a824cff6fe905c6268b2a1.zip op-kernel-dev-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.gz | |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
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 |
