From c58b69f52beaf21944838edabe54f71c7a30a101 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 29 Aug 2011 13:46:24 -0700 Subject: [PATCH] --- yaml --- r: 265700 b: refs/heads/master c: 1bddc59c2546a24a92b1e7d4d8fa1e1e38aeedb2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d74b6cd36be..1e8776d8a0bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba6e5eb107b4b26444cb67ce6fb8eb0973a97964 +refs/heads/master: 1bddc59c2546a24a92b1e7d4d8fa1e1e38aeedb2 diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index 1f52e73547b0..cd353008b27d 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/drivers/net/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_HIPPI) += hippi/ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_PLIP) += plip/ -onj-$(CONFIG_PPP) += ppp/ +obj-$(CONFIG_PPP) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/ obj-$(CONFIG_PPP_BSDCOMP) += ppp/ obj-$(CONFIG_PPP_DEFLATE) += ppp/ @@ -44,10 +44,10 @@ obj-$(CONFIG_PPP_SYNC_TTY) += ppp/ obj-$(CONFIG_PPPOE) += ppp/ obj-$(CONFIG_PPPOL2TP) += ppp/ obj-$(CONFIG_PPTP) += ppp/ -onj-$(CONFIG_SLIP) += slip/ +obj-$(CONFIG_SLIP) += slip/ obj-$(CONFIG_SLHC) += slip/ obj-$(CONFIG_NET_SB1000) += sb1000.o -onj-$(CONFIG_SLIP) += slip/ +obj-$(CONFIG_SLIP) += slip/ obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/