diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-06 00:22:26 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-06 00:22:26 +0100 |
commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
tree | bae406a4b17229dcce7c11be5073f7a67665e477 /fs/quota/Kconfig | |
parent | mac80211: fix reorder buffer release (diff) | |
parent | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
download | linux-28b4d5cc17c20786848cdc07b7ea237a309776bb.tar.xz linux-28b4d5cc17c20786848cdc07b7ea237a309776bb.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
Diffstat (limited to 'fs/quota/Kconfig')
-rw-r--r-- | fs/quota/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/quota/Kconfig b/fs/quota/Kconfig index 8047e01ef46b..353e78a9ebee 100644 --- a/fs/quota/Kconfig +++ b/fs/quota/Kconfig @@ -17,7 +17,7 @@ config QUOTA config QUOTA_NETLINK_INTERFACE bool "Report quota messages through netlink interface" - depends on QUOTA && NET + depends on QUOTACTL && NET help If you say Y here, quota warnings (about exceeding softlimit, reaching hardlimit, etc.) will be reported through netlink interface. If unsure, |