diff options
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/configs/TQM8540_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/TQM8541_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/TQM8555_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/TQM8560_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/ev64360_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/ml300_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/ml403_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/mpc834x_sys_defconfig | 2 | ||||
-rw-r--r-- | arch/ppc/configs/prep_defconfig | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/ppc/configs/TQM8540_defconfig b/arch/ppc/configs/TQM8540_defconfig index 99bf3b7a2762..f33f0e772dcb 100644 --- a/arch/ppc/configs/TQM8540_defconfig +++ b/arch/ppc/configs/TQM8540_defconfig | |||
@@ -136,7 +136,7 @@ CONFIG_BINFMT_ELF=y | |||
136 | # CONFIG_BINFMT_MISC is not set | 136 | # CONFIG_BINFMT_MISC is not set |
137 | # CONFIG_CMDLINE_BOOL is not set | 137 | # CONFIG_CMDLINE_BOOL is not set |
138 | # CONFIG_PM is not set | 138 | # CONFIG_PM is not set |
139 | # CONFIG_SOFTWARE_SUSPEND is not set | 139 | # CONFIG_HIBERNATION is not set |
140 | CONFIG_SECCOMP=y | 140 | CONFIG_SECCOMP=y |
141 | CONFIG_ISA_DMA_API=y | 141 | CONFIG_ISA_DMA_API=y |
142 | 142 | ||
diff --git a/arch/ppc/configs/TQM8541_defconfig b/arch/ppc/configs/TQM8541_defconfig index 0ff56695d349..e00cd62daa3f 100644 --- a/arch/ppc/configs/TQM8541_defconfig +++ b/arch/ppc/configs/TQM8541_defconfig | |||
@@ -138,7 +138,7 @@ CONFIG_BINFMT_ELF=y | |||
138 | # CONFIG_BINFMT_MISC is not set | 138 | # CONFIG_BINFMT_MISC is not set |
139 | # CONFIG_CMDLINE_BOOL is not set | 139 | # CONFIG_CMDLINE_BOOL is not set |
140 | # CONFIG_PM is not set | 140 | # CONFIG_PM is not set |
141 | # CONFIG_SOFTWARE_SUSPEND is not set | 141 | # CONFIG_HIBERNATION is not set |
142 | CONFIG_SECCOMP=y | 142 | CONFIG_SECCOMP=y |
143 | CONFIG_ISA_DMA_API=y | 143 | CONFIG_ISA_DMA_API=y |
144 | 144 | ||
diff --git a/arch/ppc/configs/TQM8555_defconfig b/arch/ppc/configs/TQM8555_defconfig index 730b3db2e47a..43a0d9df1e23 100644 --- a/arch/ppc/configs/TQM8555_defconfig +++ b/arch/ppc/configs/TQM8555_defconfig | |||
@@ -138,7 +138,7 @@ CONFIG_BINFMT_ELF=y | |||
138 | # CONFIG_BINFMT_MISC is not set | 138 | # CONFIG_BINFMT_MISC is not set |
139 | # CONFIG_CMDLINE_BOOL is not set | 139 | # CONFIG_CMDLINE_BOOL is not set |
140 | # CONFIG_PM is not set | 140 | # CONFIG_PM is not set |
141 | # CONFIG_SOFTWARE_SUSPEND is not set | 141 | # CONFIG_HIBERNATION is not set |
142 | CONFIG_SECCOMP=y | 142 | CONFIG_SECCOMP=y |
143 | CONFIG_ISA_DMA_API=y | 143 | CONFIG_ISA_DMA_API=y |
144 | 144 | ||
diff --git a/arch/ppc/configs/TQM8560_defconfig b/arch/ppc/configs/TQM8560_defconfig index 1d902072825e..a814d17a2be9 100644 --- a/arch/ppc/configs/TQM8560_defconfig +++ b/arch/ppc/configs/TQM8560_defconfig | |||
@@ -137,7 +137,7 @@ CONFIG_BINFMT_ELF=y | |||
137 | # CONFIG_BINFMT_MISC is not set | 137 | # CONFIG_BINFMT_MISC is not set |
138 | # CONFIG_CMDLINE_BOOL is not set | 138 | # CONFIG_CMDLINE_BOOL is not set |
139 | # CONFIG_PM is not set | 139 | # CONFIG_PM is not set |
140 | # CONFIG_SOFTWARE_SUSPEND is not set | 140 | # CONFIG_HIBERNATION is not set |
141 | CONFIG_SECCOMP=y | 141 | CONFIG_SECCOMP=y |
142 | CONFIG_ISA_DMA_API=y | 142 | CONFIG_ISA_DMA_API=y |
143 | 143 | ||
diff --git a/arch/ppc/configs/ev64360_defconfig b/arch/ppc/configs/ev64360_defconfig index d471e578dcb5..f297c4bb632b 100644 --- a/arch/ppc/configs/ev64360_defconfig +++ b/arch/ppc/configs/ev64360_defconfig | |||
@@ -142,7 +142,7 @@ CONFIG_BINFMT_MISC=y | |||
142 | CONFIG_CMDLINE_BOOL=y | 142 | CONFIG_CMDLINE_BOOL=y |
143 | CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2" | 143 | CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2" |
144 | # CONFIG_PM is not set | 144 | # CONFIG_PM is not set |
145 | # CONFIG_SOFTWARE_SUSPEND is not set | 145 | # CONFIG_HIBERNATION is not set |
146 | CONFIG_SECCOMP=y | 146 | CONFIG_SECCOMP=y |
147 | CONFIG_ISA_DMA_API=y | 147 | CONFIG_ISA_DMA_API=y |
148 | 148 | ||
diff --git a/arch/ppc/configs/ml300_defconfig b/arch/ppc/configs/ml300_defconfig index 4a33aca948cc..69bad91a6b65 100644 --- a/arch/ppc/configs/ml300_defconfig +++ b/arch/ppc/configs/ml300_defconfig | |||
@@ -148,7 +148,7 @@ CONFIG_BINFMT_ELF=y | |||
148 | CONFIG_CMDLINE_BOOL=y | 148 | CONFIG_CMDLINE_BOOL=y |
149 | CONFIG_CMDLINE="console=ttyS0,9600" | 149 | CONFIG_CMDLINE="console=ttyS0,9600" |
150 | # CONFIG_PM is not set | 150 | # CONFIG_PM is not set |
151 | # CONFIG_SOFTWARE_SUSPEND is not set | 151 | # CONFIG_HIBERNATION is not set |
152 | CONFIG_SECCOMP=y | 152 | CONFIG_SECCOMP=y |
153 | CONFIG_ISA_DMA_API=y | 153 | CONFIG_ISA_DMA_API=y |
154 | 154 | ||
diff --git a/arch/ppc/configs/ml403_defconfig b/arch/ppc/configs/ml403_defconfig index fafd2516fa51..a78896ea4560 100644 --- a/arch/ppc/configs/ml403_defconfig +++ b/arch/ppc/configs/ml403_defconfig | |||
@@ -149,7 +149,7 @@ CONFIG_BINFMT_ELF=y | |||
149 | CONFIG_CMDLINE_BOOL=y | 149 | CONFIG_CMDLINE_BOOL=y |
150 | CONFIG_CMDLINE="console=ttyS0,9600" | 150 | CONFIG_CMDLINE="console=ttyS0,9600" |
151 | # CONFIG_PM is not set | 151 | # CONFIG_PM is not set |
152 | # CONFIG_SOFTWARE_SUSPEND is not set | 152 | # CONFIG_HIBERNATION is not set |
153 | CONFIG_SECCOMP=y | 153 | CONFIG_SECCOMP=y |
154 | CONFIG_ISA_DMA_API=y | 154 | CONFIG_ISA_DMA_API=y |
155 | 155 | ||
diff --git a/arch/ppc/configs/mpc834x_sys_defconfig b/arch/ppc/configs/mpc834x_sys_defconfig index b96a6d6dad0e..d90c8a7e060c 100644 --- a/arch/ppc/configs/mpc834x_sys_defconfig +++ b/arch/ppc/configs/mpc834x_sys_defconfig | |||
@@ -130,7 +130,7 @@ CONFIG_BINFMT_ELF=y | |||
130 | # CONFIG_BINFMT_MISC is not set | 130 | # CONFIG_BINFMT_MISC is not set |
131 | # CONFIG_CMDLINE_BOOL is not set | 131 | # CONFIG_CMDLINE_BOOL is not set |
132 | # CONFIG_PM is not set | 132 | # CONFIG_PM is not set |
133 | # CONFIG_SOFTWARE_SUSPEND is not set | 133 | # CONFIG_HIBERNATION is not set |
134 | CONFIG_SECCOMP=y | 134 | CONFIG_SECCOMP=y |
135 | CONFIG_ISA_DMA_API=y | 135 | CONFIG_ISA_DMA_API=y |
136 | 136 | ||
diff --git a/arch/ppc/configs/prep_defconfig b/arch/ppc/configs/prep_defconfig index 0aa333178b2a..b7cee2d71405 100644 --- a/arch/ppc/configs/prep_defconfig +++ b/arch/ppc/configs/prep_defconfig | |||
@@ -166,7 +166,7 @@ CONFIG_PROC_PREPRESIDUAL=y | |||
166 | CONFIG_PM=y | 166 | CONFIG_PM=y |
167 | # CONFIG_PM_LEGACY is not set | 167 | # CONFIG_PM_LEGACY is not set |
168 | # CONFIG_PM_DEBUG is not set | 168 | # CONFIG_PM_DEBUG is not set |
169 | CONFIG_SOFTWARE_SUSPEND=y | 169 | CONFIG_HIBERNATION=y |
170 | CONFIG_PM_STD_PARTITION="" | 170 | CONFIG_PM_STD_PARTITION="" |
171 | # CONFIG_SECCOMP is not set | 171 | # CONFIG_SECCOMP is not set |
172 | CONFIG_ISA_DMA_API=y | 172 | CONFIG_ISA_DMA_API=y |