diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-16 01:07:18 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-16 01:07:18 +0100 |
commit | 97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c (patch) | |
tree | a71115af6c30fdc9de0878e2cf1c51e95b17a324 /drivers/Kconfig | |
parent | Input: ALPS - move v7 packet info to Documentation and v6 packet info (diff) | |
parent | Input: bfin_rotary - introduce open and close methods (diff) | |
download | linux-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.tar.xz linux-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.zip |
Merge branch 'bfin_rotary' into next
Merge bfin_rotary driver changes from Sonic Zhang.
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 694d5a70d6ce..c70d6e45dc10 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -134,8 +134,6 @@ source "drivers/staging/Kconfig" source "drivers/platform/Kconfig" -source "drivers/soc/Kconfig" - source "drivers/clk/Kconfig" source "drivers/hwspinlock/Kconfig" |