summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-08 10:38:33 -0500
committerKyle McMartin <kyle@mcmartin.ca>2010-11-08 10:38:33 -0500
commit1aea2328b45aa547a36a8db2b75032727c1672a7 (patch)
treeec6ec0a992fe8d9b6e126689c4fe5315e629d342 /config-generic
parent7b2f649ec2da6640878c15298f5d3f8451dd8125 (diff)
downloadkernel-1aea2328b45aa547a36a8db2b75032727c1672a7.tar.gz
kernel-1aea2328b45aa547a36a8db2b75032727c1672a7.tar.xz
kernel-1aea2328b45aa547a36a8db2b75032727c1672a7.zip
Cherry-pick utrace-ptrace fixes from mayoung. Thanks!
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index a4ff8cfeb..9a0b10bc7 100644
--- a/config-generic
+++ b/config-generic
@@ -3116,7 +3116,6 @@ CONFIG_USB_SE401=m
CONFIG_USB_ZR364XX=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M001=m
CONFIG_SOC_CAMERA_MT9V022=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_SOC_CAMERA_MT9M111=m