diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:54 -0400 |
| commit | 9134d02bc0af4a8747d448d1f811ec5f8eb96df6 (patch) | |
| tree | 704c3e5dcc10f360815c4868a74711f82fb62e27 /drivers/net/usb/Kconfig | |
| parent | bbb20089a3275a19e475dbc21320c3742e3ca423 (diff) | |
| parent | 80ffb3cceaefa405f2ecd46d66500ed8d53efe74 (diff) | |
Merge commit 'md/for-linus' into async-tx-next
Conflicts:
drivers/md/raid5.c
Diffstat (limited to 'drivers/net/usb/Kconfig')
| -rw-r--r-- | drivers/net/usb/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index a906d3998131..c47237c2d638 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
| @@ -369,4 +369,12 @@ config USB_NET_INT51X1 | |||
| 369 | (Powerline Communications) solution with an Intellon | 369 | (Powerline Communications) solution with an Intellon |
| 370 | INT51x1/INT5200 chip, like the "devolo dLan duo". | 370 | INT51x1/INT5200 chip, like the "devolo dLan duo". |
| 371 | 371 | ||
| 372 | config USB_CDC_PHONET | ||
| 373 | tristate "CDC Phonet support" | ||
| 374 | depends on PHONET | ||
| 375 | help | ||
| 376 | Choose this option to support the Phonet interface to a Nokia | ||
| 377 | cellular modem, as found on most Nokia handsets with the | ||
| 378 | "PC suite" USB profile. | ||
| 379 | |||
| 372 | endmenu | 380 | endmenu |