diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /block/Kconfig | |
| parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'block/Kconfig')
| -rw-r--r-- | block/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig index e20fbde0875c..62a5921321cd 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
| @@ -78,7 +78,7 @@ config BLK_DEV_INTEGRITY | |||
| 78 | Protection. If in doubt, say N. | 78 | Protection. If in doubt, say N. |
| 79 | 79 | ||
| 80 | config BLK_CGROUP | 80 | config BLK_CGROUP |
| 81 | bool | 81 | tristate |
| 82 | depends on CGROUPS | 82 | depends on CGROUPS |
| 83 | default n | 83 | default n |
| 84 | ---help--- | 84 | ---help--- |