diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 12:00:31 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 12:00:31 +0100 |
| commit | 9fc4b22679b3d79ea9d386702848456ba6168f2c (patch) | |
| tree | 01b763f9e6a146b5cd4092aa8240b75f3b97f88f /drivers/staging/Kconfig | |
| parent | 9781217932e53f19cb5a3ad9c553085f715aec9a (diff) | |
| parent | ab93b88c94dcf96cfc6daba570b75ea5024760c7 (diff) | |
Merge branch 'modem' into linux-stable-ux500-3.1
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/staging/Makefile
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index f49f685305e..63b640c3c1e 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -24,6 +24,16 @@ menuconfig STAGING if STAGING +config AB5500_SIM + bool "ST-Ericsson AB5500 SIM Interface driver" + depends on AB5500_CORE + help + SIM Interface driver provides interface to configure + various parameters of AB5550 SIM Level Shifter.Support provided are: + Configure Pull up on sim lines + Configure Operation Mode + Notify Sim Insert/Extract Interrupt + source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" |