summaryrefslogtreecommitdiff
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-07-14 12:15:40 +0100
committerJeff Garzik <jeff@garzik.org>2006-07-19 13:50:39 -0400
commitb6e37e55c250f5233401b2566b1a4b512a98bc7b (patch)
treebf7f0e127619ac2b39fc76aee1fcb8157372b656 /drivers/net/Makefile
parent5f5d83fdbfb50ffb6f5fbf5fd69bc791d9d5cd20 (diff)
downloadlinux-3.10-b6e37e55c250f5233401b2566b1a4b512a98bc7b.tar.gz
linux-3.10-b6e37e55c250f5233401b2566b1a4b512a98bc7b.tar.bz2
linux-3.10-b6e37e55c250f5233401b2566b1a4b512a98bc7b.zip
[PATCH] Cleanup SLHC configuration
Convert selection of serial line header compression to use CONFIG_SLHC rather than makefile ifeq uglyness. This makes it easier to select the SLHC module from other code. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c91e95126f7..038a8e02f64 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -2,10 +2,6 @@
# Makefile for the Linux network (ethercard) device drivers.
#
-ifeq ($(CONFIG_ISDN_PPP),y)
- obj-$(CONFIG_ISDN) += slhc.o
-endif
-
obj-$(CONFIG_E1000) += e1000/
obj-$(CONFIG_IBM_EMAC) += ibm_emac/
obj-$(CONFIG_IXGB) += ixgb/
@@ -111,7 +107,7 @@ obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
-obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
+obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
@@ -120,9 +116,7 @@ obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
obj-$(CONFIG_SLIP) += slip.o
-ifeq ($(CONFIG_SLIP_COMPRESSED),y)
- obj-$(CONFIG_SLIP) += slhc.o
-endif
+obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_IFB) += ifb.o