diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
| commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
| tree | 41fd871990e888dd5616a6bf1891a1ff307221df /drivers/net/Makefile | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a3c5c002f224..aca8492db654 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -17,6 +17,7 @@ obj-$(CONFIG_BONDING) += bonding/ | |||
| 17 | obj-$(CONFIG_ATL1) += atlx/ | 17 | obj-$(CONFIG_ATL1) += atlx/ |
| 18 | obj-$(CONFIG_ATL2) += atlx/ | 18 | obj-$(CONFIG_ATL2) += atlx/ |
| 19 | obj-$(CONFIG_ATL1E) += atl1e/ | 19 | obj-$(CONFIG_ATL1E) += atl1e/ |
| 20 | obj-$(CONFIG_ATL1C) += atl1c/ | ||
| 20 | obj-$(CONFIG_GIANFAR) += gianfar_driver.o | 21 | obj-$(CONFIG_GIANFAR) += gianfar_driver.o |
| 21 | obj-$(CONFIG_TEHUTI) += tehuti.o | 22 | obj-$(CONFIG_TEHUTI) += tehuti.o |
| 22 | obj-$(CONFIG_ENIC) += enic/ | 23 | obj-$(CONFIG_ENIC) += enic/ |