diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-13 22:18:22 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-13 22:18:22 -0500 |
| commit | 1d6dcd2719d378a507a5369c6017e8f616333f06 (patch) | |
| tree | 399a7c2c89b660a67f73bcdba5c06d2bc6f9acc9 /config-generic | |
| parent | 8383538959a3705b40f1f533e1da3145dbbb7a7f (diff) | |
| download | kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.tar.gz kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.tar.xz kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.zip | |
Merge 2.6.37-rc1-git10
- Pull in 2.6.37-rc1-git10 snapshot
- SECURITY_DMESG_RESTRICT added, the principle of least surprise dictates
we should probably have it off. If you want to restrict dmesg access
you may use the kernel.dmesg_restrict sysctl.
- linux-2.6-bluetooth-autosuspend.patch: merged upstream.
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 9a0b10bc7..5b6b2912d 100644 --- a/config-generic +++ b/config-generic @@ -3670,6 +3670,7 @@ CONFIG_KGDB_LOW_LEVEL_TRAP=y # Security options # CONFIG_SECURITY=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y # CONFIG_SECURITY_PATH is not set @@ -4019,6 +4020,8 @@ CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y |