diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-01-20 13:32:57 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-20 13:32:57 -0500 |
commit | e8409b1dce1d927283cb4999d9902b8cda4f86fc (patch) | |
tree | aebdcb0443b56c5cee9135f08f5cf8b9678d76e6 /config-powerpc64 | |
parent | 0a621ccdd414267ae3ff952951be5547f0512383 (diff) | |
download | kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.tar.gz kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.tar.xz kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.zip |
Rebase to Linux 3.3-rc1
The utrace patch is left unapplied as it doesn't apply cleanly any longer
Diffstat (limited to 'config-powerpc64')
-rw-r--r-- | config-powerpc64 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config-powerpc64 b/config-powerpc64 index 42b501675..39f979234 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -158,3 +158,7 @@ CONFIG_IO_EVENT_IRQ=y CONFIG_HW_RANDOM_AMD=m CONFIG_BPF_JIT=y +# CONFIG_PPC_ICSWX_PID is not set +# CONFIG_PPC_ICSWX_USE_SIGILL is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set + |