diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/et131x/Makefile | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/et131x/Makefile')
-rw-r--r-- | drivers/staging/et131x/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/et131x/Makefile b/drivers/staging/et131x/Makefile index 3ad571d..95c645d 100644 --- a/drivers/staging/et131x/Makefile +++ b/drivers/staging/et131x/Makefile @@ -5,14 +5,11 @@ obj-$(CONFIG_ET131X) += et131x.o et131x-objs := et1310_eeprom.o \ - et1310_jagcore.o \ et1310_mac.o \ et1310_phy.o \ et1310_pm.o \ et1310_rx.o \ et1310_tx.o \ - et131x_config.o \ - et131x_debug.o \ et131x_initpci.o \ et131x_isr.o \ et131x_netdev.o |