diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-12-18 10:35:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-18 10:35:16 +0100 |
commit | 6e5ed276374c329b93a968d640f4d26c8c05411b (patch) | |
tree | 3b0d42269f0f52ea7764511de3a58b01d12bcb23 /drivers/net/ethernet/pasemi/Makefile | |
parent | x86/mrst: Add additional debug prints for pb_keys (diff) | |
parent | Linux 3.2-rc6 (diff) | |
download | linux-6e5ed276374c329b93a968d640f4d26c8c05411b.tar.xz linux-6e5ed276374c329b93a968d640f4d26c8c05411b.zip |
Merge commit 'v3.2-rc6' into x86/platform
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 |