diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
| commit | 36cee0c070a631eb744aff33916dba0d8c92d3d6 (patch) | |
| tree | 707bca58e7bf89a8f1883a8726f0c8c08ec9da11 /drivers/misc/Kconfig | |
| parent | 609cbf05e36abcc92b1e60749b8dd0dc420144fa (diff) | |
| parent | e2673ac489a6fd2f8c4016b1a617f708efb21cc2 (diff) | |
Merge topic branch 'trace-debug' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index c7795096d43..7b7fc5c7489 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -498,6 +498,7 @@ config MAX8997_MUIC Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory detector and switch. +source "drivers/misc/Kconfig.stm" source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" |