diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-16 07:02:34 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-16 07:02:34 +0100 |
commit | 02735a29d8ce882ec698803f064e17888874780c (patch) | |
tree | 6a4afa3bc8b6d4334df24910a56f77adf126b0c7 /drivers/net/ethernet/pasemi/Makefile | |
parent | Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'm... (diff) | |
parent | Merge branch 'for-arnd-3.3-defconfig' of git://github.com/at91linux/linux-at9... (diff) | |
download | linux-02735a29d8ce882ec698803f064e17888874780c.tar.xz linux-02735a29d8ce882ec698803f064e17888874780c.zip |
Merge branch 'at91/defconfig' into next/cleanup
Diffstat (limited to 'drivers/net/ethernet/pasemi/Makefile')
-rw-r--r-- | drivers/net/ethernet/pasemi/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/pasemi/Makefile b/drivers/net/ethernet/pasemi/Makefile index 05db5434bafc..90497ffb1ac3 100644 --- a/drivers/net/ethernet/pasemi/Makefile +++ b/drivers/net/ethernet/pasemi/Makefile @@ -2,4 +2,5 @@ # Makefile for the A Semi network device drivers. # -obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o +obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o +pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o |