From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 29 Jun 2007 03:14:45 +0000 (+0000)
Subject: bring in sync with fedora-2_6_20-1_2949_fc6_vs2_2_0_1
X-Git-Tag: linux-2.6-22-1~49
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=ebfc527832374f284f8023b8477959592ac18e8c

bring in sync with fedora-2_6_20-1_2949_fc6_vs2_2_0_1
---

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index cfd74b5d2..4c0d4e5ce 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/