projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
block
/
Kconfig
diff --git
a/drivers/block/Kconfig
b/drivers/block/Kconfig
index b81ddfea1da075ad3c1d0cbeb9ab7bf854593436..9da952c9af9131169184deeb000df1d934548a43 100644
(file)
--- a/
drivers/block/Kconfig
+++ b/
drivers/block/Kconfig
@@
-105,6
+105,8
@@
source "drivers/block/paride/Kconfig"
source "drivers/block/mtip32xx/Kconfig"
+source "drivers/block/zram/Kconfig"
+
config BLK_CPQ_DA
tristate "Compaq SMART2 support"
depends on PCI && VIRT_TO_BUS