diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-27 21:49:13 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-27 21:49:13 +0200 |
commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /drivers/net/usb/Kconfig | |
parent | net: suppress RCU lockdep false positive in twsk_net() (diff) | |
parent | cxgb3: Wait longer for control packets on initialization (diff) | |
download | linux-e1703b36c358dde24ececba4fd609ecd91433ba3.tar.xz linux-e1703b36c358dde24ececba4fd609ecd91433ba3.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/usb/Kconfig')
-rw-r--r-- | drivers/net/usb/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index ba56ce4382d9..63be4caec70e 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -385,4 +385,16 @@ config USB_CDC_PHONET cellular modem, as found on most Nokia handsets with the "PC suite" USB profile. +config USB_IPHETH + tristate "Apple iPhone USB Ethernet driver" + default n + ---help--- + Module used to share Internet connection (tethering) from your + iPhone (Original, 3G and 3GS) to your system. + Note that you need userspace libraries and programs that are needed + to pair your device with your system and that understand the iPhone + protocol. + + For more information: http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver + endmenu |