From 64cc843d7257ee02ca927a644562452a75e43b8e Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 29 Aug 2011 11:49:40 -0700
Subject: [PATCH] --- yaml --- r: 265599 b: refs/heads/master c:
 4f16061ede08b6bea34c4e699c9dfa7ba6c88793 h: refs/heads/master i:   265597:
 19cc37cd9c60e7cffbd5eba7efb4b1baa6775068   265595:
 aee2e653926523b52b65cba6a8e4f721d415c96d   265591:
 a08fab289f040b62382c4dddc0039eec892f5200   265583:
 2f7c46fb4ce123fa79af0143d95ee8e10454fcc3   265567:
 a7a6e46f6ef42e843efd9ba1ff046f8488fdd612   265535:
 1c30f5bd6b499b43fdaac385e4180419fd3e965a   265471:
 771a27707552047ac97519729e20d0b85a727781 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/Makefile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 937b7aa40f20..4635e732ab17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3116f62cb56ef5efd172371fab688bb27529f69
+refs/heads/master: 4f16061ede08b6bea34c4e699c9dfa7ba6c88793
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/