---

yaml
---
r: 265599
b: refs/heads/master
c: 4f16061
h: refs/heads/master
i:
  265597: 19cc37c
  265595: aee2e65
  265591: a08fab2
  265583: 2f7c46f
  265567: a7a6e46
  265535: 1c30f5b
  265471: 771a277
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3116f62cb56ef5efd172371fab688bb27529f69
+refs/heads/master: 4f16061ede08b6bea34c4e699c9dfa7ba6c88793

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/