From e77893079874eb0c8507d9057c7740141e2046a9 Mon Sep 17 00:00:00 2001
From: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Mon, 22 Sep 2008 20:03:00 -0700
Subject: [PATCH] --- yaml --- r: 111772 b: refs/heads/master c:
 8ead536dec142f27d5b5f72c3994eb39f4741717 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/Kconfig         |  1 +
 trunk/net/Makefile        |  1 +
 trunk/net/phonet/Kconfig  | 16 ++++++++++++++++
 trunk/net/phonet/Makefile |  4 ++++
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 trunk/net/phonet/Kconfig
 create mode 100644 trunk/net/phonet/Makefile

diff --git a/[refs] b/[refs]
index 290d21896582..93f273c4168f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b07b3f69a8471cdc142c51461a331226fef248a
+refs/heads/master: 8ead536dec142f27d5b5f72c3994eb39f4741717
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index d87de48ba656..9103a16a77be 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -232,6 +232,7 @@ source "net/can/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
+source "net/phonet/Kconfig"
 
 config FIB_RULES
 	bool
diff --git a/trunk/net/Makefile b/trunk/net/Makefile
index 4f43e7f874f3..acaf819f24aa 100644
--- a/trunk/net/Makefile
+++ b/trunk/net/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_AF_RXRPC)		+= rxrpc/
 obj-$(CONFIG_ATM)		+= atm/
 obj-$(CONFIG_DECNET)		+= decnet/
 obj-$(CONFIG_ECONET)		+= econet/
+obj-$(CONFIG_PHONET)		+= phonet/
 ifneq ($(CONFIG_VLAN_8021Q),)
 obj-y				+= 8021q/
 endif
diff --git a/trunk/net/phonet/Kconfig b/trunk/net/phonet/Kconfig
new file mode 100644
index 000000000000..51a5669573f2
--- /dev/null
+++ b/trunk/net/phonet/Kconfig
@@ -0,0 +1,16 @@
+#
+# Phonet protocol
+#
+
+config PHONET
+	tristate "Phonet protocols family"
+	help
+	  The Phone Network protocol (PhoNet) is a packet-oriented
+	  communication protocol developped by Nokia for use with its modems.
+
+	  This is required for Maemo to use cellular data connectivity (if
+	  supported). It can also be used to control Nokia phones
+	  from a Linux computer, although AT commands may be easier to use.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called phonet. If unsure, say N.
diff --git a/trunk/net/phonet/Makefile b/trunk/net/phonet/Makefile
new file mode 100644
index 000000000000..5dbff68a6f36
--- /dev/null
+++ b/trunk/net/phonet/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_PHONET) += phonet.o
+
+phonet-objs := \
+	af_phonet.o