diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 06:59:22 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 06:59:22 (GMT) |
| commit | 604d11d99180806d94a9c48d76f96428dc5bcaa5 (patch) | |
| tree | f4853faccfb144706dd10be1c469d726643bf072 /drivers/net/ethernet/intel/ixgbe/Makefile | |
| parent | e28c99a85b3e9ab09944fb285c0c035fa997fa33 (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| download | linux-fsl-qoriq-604d11d99180806d94a9c48d76f96428dc5bcaa5.tar.xz | |
Merge tag 'v3.8-rc6' into next/dt
Linux 3.8-rc6
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/Makefile')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile index f3a632b..687c83d 100644 --- a/drivers/net/ethernet/intel/ixgbe/Makefile +++ b/drivers/net/ethernet/intel/ixgbe/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_IXGBE) += ixgbe.o -ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o ixgbe_debugfs.o\ +ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \ ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \ ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o @@ -40,4 +40,5 @@ ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \ ixgbe_dcb_82599.o ixgbe_dcb_nl.o ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o +ixgbe-$(CONFIG_DEBUG_FS) += ixgbe_debugfs.o ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o |