diff options
Diffstat (limited to 'arch')
61 files changed, 3229 insertions, 3244 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e380a8322a94..b50be449d3f5 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -6,8 +6,6 @@ config MIPS | |||
| 6 | 6 | ||
| 7 | mainmenu "Linux/MIPS Kernel Configuration" | 7 | mainmenu "Linux/MIPS Kernel Configuration" |
| 8 | 8 | ||
| 9 | source "init/Kconfig" | ||
| 10 | |||
| 11 | menu "Machine selection" | 9 | menu "Machine selection" |
| 12 | 10 | ||
| 13 | choice | 11 | choice |
| @@ -1643,6 +1641,8 @@ config RWSEM_GENERIC_SPINLOCK | |||
| 1643 | bool | 1641 | bool |
| 1644 | default y | 1642 | default y |
| 1645 | 1643 | ||
| 1644 | source "init/Kconfig" | ||
| 1645 | |||
| 1646 | menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" | 1646 | menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" |
| 1647 | 1647 | ||
| 1648 | config HW_HAS_EISA | 1648 | config HW_HAS_EISA |
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c index ac05ba0ff63f..f00ec3b175d8 100644 --- a/arch/mips/au1000/db1x00/board_setup.c +++ b/arch/mips/au1000/db1x00/board_setup.c | |||
| @@ -45,13 +45,12 @@ | |||
| 45 | #include <asm/mach-au1x00/au1000.h> | 45 | #include <asm/mach-au1x00/au1000.h> |
| 46 | #include <asm/mach-db1x00/db1x00.h> | 46 | #include <asm/mach-db1x00/db1x00.h> |
| 47 | 47 | ||
| 48 | /* not correct for db1550 */ | 48 | static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; |
| 49 | static BCSR * const bcsr = (BCSR *)0xAE000000; | ||
| 50 | 49 | ||
| 51 | void board_reset (void) | 50 | void board_reset (void) |
| 52 | { | 51 | { |
| 53 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 52 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
| 54 | au_writel(0x00000000, 0xAE00001C); | 53 | bcsr->swreset = 0x0000; |
| 55 | } | 54 | } |
| 56 | 55 | ||
| 57 | void __init board_setup(void) | 56 | void __init board_setup(void) |
| @@ -75,7 +74,7 @@ void __init board_setup(void) | |||
| 75 | bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF; | 74 | bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF; |
| 76 | au_sync(); | 75 | au_sync(); |
| 77 | #endif | 76 | #endif |
| 78 | au_writel(0, 0xAE000010); /* turn off pcmcia power */ | 77 | bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */ |
| 79 | 78 | ||
| 80 | #ifdef CONFIG_MIPS_MIRAGE | 79 | #ifdef CONFIG_MIPS_MIRAGE |
| 81 | /* enable GPIO[31:0] inputs */ | 80 | /* enable GPIO[31:0] inputs */ |
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 4b9d5e46edbb..41e0522f3cf1 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
| @@ -61,7 +61,17 @@ void __init prom_init(void) | |||
| 61 | prom_envp = (char **) fw_arg2; | 61 | prom_envp = (char **) fw_arg2; |
| 62 | 62 | ||
| 63 | mips_machgroup = MACH_GROUP_ALCHEMY; | 63 | mips_machgroup = MACH_GROUP_ALCHEMY; |
| 64 | mips_machtype = MACH_DB1000; /* set the platform # */ | 64 | |
| 65 | /* Set the platform # */ | ||
| 66 | #if defined (CONFIG_MIPS_DB1550) | ||
| 67 | mips_machtype = MACH_DB1550; | ||
| 68 | #elif defined (CONFIG_MIPS_DB1500) | ||
| 69 | mips_machtype = MACH_DB1500; | ||
| 70 | #elif defined (CONFIG_MIPS_DB1100) | ||
| 71 | mips_machtype = MACH_DB1100; | ||
| 72 | #else | ||
| 73 | mips_machtype = MACH_DB1000; | ||
| 74 | #endif | ||
| 65 | 75 | ||
| 66 | prom_init_cmdline(); | 76 | prom_init_cmdline(); |
| 67 | 77 | ||
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 74990758154b..89c21572a59c 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 12:14:02 2005 | 4 | # Thu Nov 24 01:05:52 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -215,6 +146,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 215 | # CONFIG_PREEMPT is not set | 146 | # CONFIG_PREEMPT is not set |
| 216 | 147 | ||
| 217 | # | 148 | # |
| 149 | # Code maturity level options | ||
| 150 | # | ||
| 151 | CONFIG_EXPERIMENTAL=y | ||
| 152 | CONFIG_CLEAN_COMPILE=y | ||
| 153 | CONFIG_BROKEN_ON_SMP=y | ||
| 154 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 155 | |||
| 156 | # | ||
| 157 | # General setup | ||
| 158 | # | ||
| 159 | CONFIG_LOCALVERSION="" | ||
| 160 | CONFIG_LOCALVERSION_AUTO=y | ||
| 161 | CONFIG_SWAP=y | ||
| 162 | CONFIG_SYSVIPC=y | ||
| 163 | # CONFIG_POSIX_MQUEUE is not set | ||
| 164 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 165 | CONFIG_SYSCTL=y | ||
| 166 | # CONFIG_AUDIT is not set | ||
| 167 | CONFIG_HOTPLUG=y | ||
| 168 | CONFIG_KOBJECT_UEVENT=y | ||
| 169 | # CONFIG_IKCONFIG is not set | ||
| 170 | CONFIG_INITRAMFS_SOURCE="" | ||
| 171 | CONFIG_EMBEDDED=y | ||
| 172 | CONFIG_KALLSYMS=y | ||
| 173 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 174 | CONFIG_PRINTK=y | ||
| 175 | CONFIG_BUG=y | ||
| 176 | CONFIG_BASE_FULL=y | ||
| 177 | CONFIG_FUTEX=y | ||
| 178 | CONFIG_EPOLL=y | ||
| 179 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 180 | CONFIG_SHMEM=y | ||
| 181 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 182 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 183 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 184 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 185 | # CONFIG_TINY_SHMEM is not set | ||
| 186 | CONFIG_BASE_SMALL=0 | ||
| 187 | |||
| 188 | # | ||
| 189 | # Loadable module support | ||
| 190 | # | ||
| 191 | CONFIG_MODULES=y | ||
| 192 | CONFIG_MODULE_UNLOAD=y | ||
| 193 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 194 | CONFIG_OBSOLETE_MODPARM=y | ||
| 195 | CONFIG_MODVERSIONS=y | ||
| 196 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 197 | CONFIG_KMOD=y | ||
| 198 | |||
| 199 | # | ||
| 200 | # Block layer | ||
| 201 | # | ||
| 202 | # CONFIG_LBD is not set | ||
| 203 | |||
| 204 | # | ||
| 205 | # IO Schedulers | ||
| 206 | # | ||
| 207 | CONFIG_IOSCHED_NOOP=y | ||
| 208 | CONFIG_IOSCHED_AS=y | ||
| 209 | CONFIG_IOSCHED_DEADLINE=y | ||
| 210 | CONFIG_IOSCHED_CFQ=y | ||
| 211 | CONFIG_DEFAULT_AS=y | ||
| 212 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 213 | # CONFIG_DEFAULT_CFQ is not set | ||
| 214 | # CONFIG_DEFAULT_NOOP is not set | ||
| 215 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 216 | |||
| 217 | # | ||
| 218 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 218 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 219 | # | 219 | # |
| 220 | CONFIG_HW_HAS_PCI=y | 220 | CONFIG_HW_HAS_PCI=y |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index ea4b75604c23..069f9d14983e 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
| @@ -1,83 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:04:36 2005 | 4 | # Thu Nov 24 01:05:54 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | # CONFIG_CPUSETS is not set | ||
| 32 | CONFIG_INITRAMFS_SOURCE="" | ||
| 33 | CONFIG_EMBEDDED=y | ||
| 34 | CONFIG_KALLSYMS=y | ||
| 35 | # CONFIG_KALLSYMS_ALL is not set | ||
| 36 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 37 | CONFIG_PRINTK=y | ||
| 38 | CONFIG_BUG=y | ||
| 39 | CONFIG_BASE_FULL=y | ||
| 40 | CONFIG_FUTEX=y | ||
| 41 | CONFIG_EPOLL=y | ||
| 42 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 43 | CONFIG_SHMEM=y | ||
| 44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 45 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 46 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 47 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 48 | # CONFIG_TINY_SHMEM is not set | ||
| 49 | CONFIG_BASE_SMALL=0 | ||
| 50 | |||
| 51 | # | ||
| 52 | # Loadable module support | ||
| 53 | # | ||
| 54 | CONFIG_MODULES=y | ||
| 55 | CONFIG_MODULE_UNLOAD=y | ||
| 56 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 57 | CONFIG_OBSOLETE_MODPARM=y | ||
| 58 | CONFIG_MODVERSIONS=y | ||
| 59 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 60 | CONFIG_KMOD=y | ||
| 61 | CONFIG_STOP_MACHINE=y | ||
| 62 | |||
| 63 | # | ||
| 64 | # Block layer | ||
| 65 | # | ||
| 66 | |||
| 67 | # | ||
| 68 | # IO Schedulers | ||
| 69 | # | ||
| 70 | CONFIG_IOSCHED_NOOP=y | ||
| 71 | CONFIG_IOSCHED_AS=y | ||
| 72 | CONFIG_IOSCHED_DEADLINE=y | ||
| 73 | CONFIG_IOSCHED_CFQ=y | ||
| 74 | CONFIG_DEFAULT_AS=y | ||
| 75 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 76 | # CONFIG_DEFAULT_CFQ is not set | ||
| 77 | # CONFIG_DEFAULT_NOOP is not set | ||
| 78 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 79 | |||
| 80 | # | ||
| 81 | # Machine selection | 9 | # Machine selection |
| 82 | # | 10 | # |
| 83 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -224,6 +152,78 @@ CONFIG_PREEMPT_NONE=y | |||
| 224 | # CONFIG_PREEMPT_BKL is not set | 152 | # CONFIG_PREEMPT_BKL is not set |
| 225 | 153 | ||
| 226 | # | 154 | # |
| 155 | # Code maturity level options | ||
| 156 | # | ||
| 157 | CONFIG_EXPERIMENTAL=y | ||
| 158 | CONFIG_CLEAN_COMPILE=y | ||
| 159 | CONFIG_LOCK_KERNEL=y | ||
| 160 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 161 | |||
| 162 | # | ||
| 163 | # General setup | ||
| 164 | # | ||
| 165 | CONFIG_LOCALVERSION="" | ||
| 166 | CONFIG_LOCALVERSION_AUTO=y | ||
| 167 | CONFIG_SWAP=y | ||
| 168 | CONFIG_SYSVIPC=y | ||
| 169 | # CONFIG_POSIX_MQUEUE is not set | ||
| 170 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 171 | CONFIG_SYSCTL=y | ||
| 172 | # CONFIG_AUDIT is not set | ||
| 173 | # CONFIG_HOTPLUG is not set | ||
| 174 | CONFIG_KOBJECT_UEVENT=y | ||
| 175 | CONFIG_IKCONFIG=y | ||
| 176 | CONFIG_IKCONFIG_PROC=y | ||
| 177 | # CONFIG_CPUSETS is not set | ||
| 178 | CONFIG_INITRAMFS_SOURCE="" | ||
| 179 | CONFIG_EMBEDDED=y | ||
| 180 | CONFIG_KALLSYMS=y | ||
| 181 | # CONFIG_KALLSYMS_ALL is not set | ||
| 182 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 183 | CONFIG_PRINTK=y | ||
| 184 | CONFIG_BUG=y | ||
| 185 | CONFIG_BASE_FULL=y | ||
| 186 | CONFIG_FUTEX=y | ||
| 187 | CONFIG_EPOLL=y | ||
| 188 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 189 | CONFIG_SHMEM=y | ||
| 190 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 191 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 192 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 193 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 194 | # CONFIG_TINY_SHMEM is not set | ||
| 195 | CONFIG_BASE_SMALL=0 | ||
| 196 | |||
| 197 | # | ||
| 198 | # Loadable module support | ||
| 199 | # | ||
| 200 | CONFIG_MODULES=y | ||
| 201 | CONFIG_MODULE_UNLOAD=y | ||
| 202 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 203 | CONFIG_OBSOLETE_MODPARM=y | ||
| 204 | CONFIG_MODVERSIONS=y | ||
| 205 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 206 | CONFIG_KMOD=y | ||
| 207 | CONFIG_STOP_MACHINE=y | ||
| 208 | |||
| 209 | # | ||
| 210 | # Block layer | ||
| 211 | # | ||
| 212 | |||
| 213 | # | ||
| 214 | # IO Schedulers | ||
| 215 | # | ||
| 216 | CONFIG_IOSCHED_NOOP=y | ||
| 217 | CONFIG_IOSCHED_AS=y | ||
| 218 | CONFIG_IOSCHED_DEADLINE=y | ||
| 219 | CONFIG_IOSCHED_CFQ=y | ||
| 220 | CONFIG_DEFAULT_AS=y | ||
| 221 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 222 | # CONFIG_DEFAULT_CFQ is not set | ||
| 223 | # CONFIG_DEFAULT_NOOP is not set | ||
| 224 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 225 | |||
| 226 | # | ||
| 227 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 227 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 228 | # | 228 | # |
| 229 | CONFIG_HW_HAS_PCI=y | 229 | CONFIG_HW_HAS_PCI=y |
| @@ -318,7 +318,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 318 | # QoS and/or fair queueing | 318 | # QoS and/or fair queueing |
| 319 | # | 319 | # |
| 320 | # CONFIG_NET_SCHED is not set | 320 | # CONFIG_NET_SCHED is not set |
| 321 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 322 | 321 | ||
| 323 | # | 322 | # |
| 324 | # Network testing | 323 | # Network testing |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index a86cc9d9bdae..5261e29ccf37 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:04:39 2005 | 4 | # Thu Nov 24 01:05:55 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -206,6 +137,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 206 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 207 | 138 | ||
| 208 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | CONFIG_SWAP=y | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_POSIX_MQUEUE is not set | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | # CONFIG_IKCONFIG is not set | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | ||
| 162 | CONFIG_EMBEDDED=y | ||
| 163 | CONFIG_KALLSYMS=y | ||
| 164 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 165 | CONFIG_PRINTK=y | ||
| 166 | CONFIG_BUG=y | ||
| 167 | CONFIG_BASE_FULL=y | ||
| 168 | CONFIG_FUTEX=y | ||
| 169 | CONFIG_EPOLL=y | ||
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 171 | CONFIG_SHMEM=y | ||
| 172 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 173 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 174 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 175 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 176 | # CONFIG_TINY_SHMEM is not set | ||
| 177 | CONFIG_BASE_SMALL=0 | ||
| 178 | |||
| 179 | # | ||
| 180 | # Loadable module support | ||
| 181 | # | ||
| 182 | CONFIG_MODULES=y | ||
| 183 | CONFIG_MODULE_UNLOAD=y | ||
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | ||
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 188 | CONFIG_KMOD=y | ||
| 189 | |||
| 190 | # | ||
| 191 | # Block layer | ||
| 192 | # | ||
| 193 | # CONFIG_LBD is not set | ||
| 194 | |||
| 195 | # | ||
| 196 | # IO Schedulers | ||
| 197 | # | ||
| 198 | CONFIG_IOSCHED_NOOP=y | ||
| 199 | CONFIG_IOSCHED_AS=y | ||
| 200 | CONFIG_IOSCHED_DEADLINE=y | ||
| 201 | CONFIG_IOSCHED_CFQ=y | ||
| 202 | CONFIG_DEFAULT_AS=y | ||
| 203 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 204 | # CONFIG_DEFAULT_CFQ is not set | ||
| 205 | # CONFIG_DEFAULT_NOOP is not set | ||
| 206 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 207 | |||
| 208 | # | ||
| 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 210 | # | 210 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 211 | CONFIG_HW_HAS_PCI=y |
| @@ -294,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 294 | # QoS and/or fair queueing | 294 | # QoS and/or fair queueing |
| 295 | # | 295 | # |
| 296 | # CONFIG_NET_SCHED is not set | 296 | # CONFIG_NET_SCHED is not set |
| 297 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 298 | 297 | ||
| 299 | # | 298 | # |
| 300 | # Network testing | 299 | # Network testing |
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 3558c79b0eb7..216f4023a81b 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:04:42 2005 | 4 | # Thu Nov 24 01:05:57 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -196,6 +133,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 196 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 197 | 134 | ||
| 198 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | CONFIG_SHMEM=y | ||
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | # CONFIG_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | # CONFIG_MODULES is not set | ||
| 179 | |||
| 180 | # | ||
| 181 | # Block layer | ||
| 182 | # | ||
| 183 | # CONFIG_LBD is not set | ||
| 184 | |||
| 185 | # | ||
| 186 | # IO Schedulers | ||
| 187 | # | ||
| 188 | CONFIG_IOSCHED_NOOP=y | ||
| 189 | CONFIG_IOSCHED_AS=y | ||
| 190 | CONFIG_IOSCHED_DEADLINE=y | ||
| 191 | CONFIG_IOSCHED_CFQ=y | ||
| 192 | CONFIG_DEFAULT_AS=y | ||
| 193 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 194 | # CONFIG_DEFAULT_CFQ is not set | ||
| 195 | # CONFIG_DEFAULT_NOOP is not set | ||
| 196 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 197 | |||
| 198 | # | ||
| 199 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 199 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 200 | # | 200 | # |
| 201 | CONFIG_HW_HAS_PCI=y | 201 | CONFIG_HW_HAS_PCI=y |
| @@ -280,7 +280,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # QoS and/or fair queueing | 280 | # QoS and/or fair queueing |
| 281 | # | 281 | # |
| 282 | # CONFIG_NET_SCHED is not set | 282 | # CONFIG_NET_SCHED is not set |
| 283 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 284 | 283 | ||
| 285 | # | 284 | # |
| 286 | # Network testing | 285 | # Network testing |
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 3b103fec7b86..18ac7926c058 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:04 2005 | 4 | # Thu Nov 24 01:05:59 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +133,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 203 | 134 | ||
| 204 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | CONFIG_SHMEM=y | ||
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | # CONFIG_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | CONFIG_MODVERSIONS=y | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -320,7 +320,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 320 | # QoS and/or fair queueing | 320 | # QoS and/or fair queueing |
| 321 | # | 321 | # |
| 322 | # CONFIG_NET_SCHED is not set | 322 | # CONFIG_NET_SCHED is not set |
| 323 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 324 | 323 | ||
| 325 | # | 324 | # |
| 326 | # Network testing | 325 | # Network testing |
| @@ -668,6 +667,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 668 | # | 667 | # |
| 669 | # TPM devices | 668 | # TPM devices |
| 670 | # | 669 | # |
| 670 | # CONFIG_TCG_TPM is not set | ||
| 671 | # CONFIG_TELCLOCK is not set | 671 | # CONFIG_TELCLOCK is not set |
| 672 | 672 | ||
| 673 | # | 673 | # |
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index 79cdd940c6a8..4f55f7414c9c 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:07 2005 | 4 | # Thu Nov 24 01:06:00 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +133,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 203 | 134 | ||
| 204 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | CONFIG_SHMEM=y | ||
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | # CONFIG_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | CONFIG_MODVERSIONS=y | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_MMU=y | 207 | CONFIG_MMU=y |
| @@ -309,7 +309,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 309 | # QoS and/or fair queueing | 309 | # QoS and/or fair queueing |
| 310 | # | 310 | # |
| 311 | # CONFIG_NET_SCHED is not set | 311 | # CONFIG_NET_SCHED is not set |
| 312 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 313 | 312 | ||
| 314 | # | 313 | # |
| 315 | # Network testing | 314 | # Network testing |
| @@ -636,6 +635,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 636 | # | 635 | # |
| 637 | # TPM devices | 636 | # TPM devices |
| 638 | # | 637 | # |
| 638 | # CONFIG_TCG_TPM is not set | ||
| 639 | # CONFIG_TELCLOCK is not set | 639 | # CONFIG_TELCLOCK is not set |
| 640 | 640 | ||
| 641 | # | 641 | # |
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index b6bad69398e1..0e5de7d05f23 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:10 2005 | 4 | # Thu Nov 24 01:06:03 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +133,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 204 | 134 | ||
| 205 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | CONFIG_IKCONFIG=y | ||
| 157 | CONFIG_IKCONFIG_PROC=y | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_MMU=y | 208 | CONFIG_MMU=y |
| @@ -314,7 +314,6 @@ CONFIG_NETFILTER=y | |||
| 314 | # QoS and/or fair queueing | 314 | # QoS and/or fair queueing |
| 315 | # | 315 | # |
| 316 | # CONFIG_NET_SCHED is not set | 316 | # CONFIG_NET_SCHED is not set |
| 317 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 318 | 317 | ||
| 319 | # | 318 | # |
| 320 | # Network testing | 319 | # Network testing |
| @@ -475,7 +474,6 @@ CONFIG_IDE_GENERIC=y | |||
| 475 | CONFIG_BLK_DEV_IDE_AU1XXX=y | 474 | CONFIG_BLK_DEV_IDE_AU1XXX=y |
| 476 | CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA=y | 475 | CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA=y |
| 477 | # CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is not set | 476 | # CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is not set |
| 478 | # CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON is not set | ||
| 479 | CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128 | 477 | CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128 |
| 480 | # CONFIG_IDE_ARM is not set | 478 | # CONFIG_IDE_ARM is not set |
| 481 | # CONFIG_BLK_DEV_IDEDMA is not set | 479 | # CONFIG_BLK_DEV_IDEDMA is not set |
| @@ -709,6 +707,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 709 | # | 707 | # |
| 710 | # TPM devices | 708 | # TPM devices |
| 711 | # | 709 | # |
| 710 | # CONFIG_TCG_TPM is not set | ||
| 712 | # CONFIG_TELCLOCK is not set | 711 | # CONFIG_TELCLOCK is not set |
| 713 | 712 | ||
| 714 | # | 713 | # |
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index dbaf189fc9c0..86e7be8412f3 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:15 2005 | 4 | # Thu Nov 24 01:06:05 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | CONFIG_HOTPLUG=y | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | CONFIG_SHMEM=y | ||
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | # CONFIG_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 328 | # QoS and/or fair queueing | 328 | # QoS and/or fair queueing |
| 329 | # | 329 | # |
| 330 | # CONFIG_NET_SCHED is not set | 330 | # CONFIG_NET_SCHED is not set |
| 331 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 332 | 331 | ||
| 333 | # | 332 | # |
| 334 | # Network testing | 333 | # Network testing |
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 59c1ef214fc0..ea5ab0ca5774 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:11:18 2005 | 4 | # Thu Nov 24 01:06:07 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +134,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 204 | 135 | ||
| 205 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -327,7 +327,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 327 | # QoS and/or fair queueing | 327 | # QoS and/or fair queueing |
| 328 | # | 328 | # |
| 329 | # CONFIG_NET_SCHED is not set | 329 | # CONFIG_NET_SCHED is not set |
| 330 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 331 | 330 | ||
| 332 | # | 331 | # |
| 333 | # Network testing | 332 | # Network testing |
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 4ba29e612bdf..bea00a9e9269 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:04 2005 | 4 | # Thu Nov 24 01:06:09 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -197,6 +134,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 198 | 135 | ||
| 199 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | # CONFIG_MODULES is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # Block layer | ||
| 183 | # | ||
| 184 | # CONFIG_LBD is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # IO Schedulers | ||
| 188 | # | ||
| 189 | CONFIG_IOSCHED_NOOP=y | ||
| 190 | CONFIG_IOSCHED_AS=y | ||
| 191 | CONFIG_IOSCHED_DEADLINE=y | ||
| 192 | CONFIG_IOSCHED_CFQ=y | ||
| 193 | CONFIG_DEFAULT_AS=y | ||
| 194 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 195 | # CONFIG_DEFAULT_CFQ is not set | ||
| 196 | # CONFIG_DEFAULT_NOOP is not set | ||
| 197 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 198 | |||
| 199 | # | ||
| 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 201 | # | 201 | # |
| 202 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| @@ -285,7 +285,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 285 | # QoS and/or fair queueing | 285 | # QoS and/or fair queueing |
| 286 | # | 286 | # |
| 287 | # CONFIG_NET_SCHED is not set | 287 | # CONFIG_NET_SCHED is not set |
| 288 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 289 | 288 | ||
| 290 | # | 289 | # |
| 291 | # Network testing | 290 | # Network testing |
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index ea4e9046bbee..61f7171ca7ed 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:08 2005 | 4 | # Thu Nov 24 01:06:11 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -197,6 +134,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 198 | 135 | ||
| 199 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | # CONFIG_MODULES is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # Block layer | ||
| 183 | # | ||
| 184 | # CONFIG_LBD is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # IO Schedulers | ||
| 188 | # | ||
| 189 | CONFIG_IOSCHED_NOOP=y | ||
| 190 | CONFIG_IOSCHED_AS=y | ||
| 191 | CONFIG_IOSCHED_DEADLINE=y | ||
| 192 | CONFIG_IOSCHED_CFQ=y | ||
| 193 | CONFIG_DEFAULT_AS=y | ||
| 194 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 195 | # CONFIG_DEFAULT_CFQ is not set | ||
| 196 | # CONFIG_DEFAULT_NOOP is not set | ||
| 197 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 198 | |||
| 199 | # | ||
| 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 201 | # | 201 | # |
| 202 | CONFIG_HW_HAS_PCI=y | 202 | CONFIG_HW_HAS_PCI=y |
| @@ -284,7 +284,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 284 | # QoS and/or fair queueing | 284 | # QoS and/or fair queueing |
| 285 | # | 285 | # |
| 286 | # CONFIG_NET_SCHED is not set | 286 | # CONFIG_NET_SCHED is not set |
| 287 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 288 | 287 | ||
| 289 | # | 288 | # |
| 290 | # Network testing | 289 | # Network testing |
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 1ac6c9b7ef96..08a4de6ec4a6 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Fri Nov 11 13:29:30 2005 | 4 | # Thu Nov 24 01:06:13 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_ALL is not set | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODVERSIONS is not set | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +132,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 132 | # CONFIG_PREEMPT is not set |
| 203 | 133 | ||
| 204 | # | 134 | # |
| 135 | # Code maturity level options | ||
| 136 | # | ||
| 137 | CONFIG_EXPERIMENTAL=y | ||
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | ||
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 141 | |||
| 142 | # | ||
| 143 | # General setup | ||
| 144 | # | ||
| 145 | CONFIG_LOCALVERSION="" | ||
| 146 | CONFIG_LOCALVERSION_AUTO=y | ||
| 147 | CONFIG_SWAP=y | ||
| 148 | CONFIG_SYSVIPC=y | ||
| 149 | # CONFIG_POSIX_MQUEUE is not set | ||
| 150 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 151 | CONFIG_SYSCTL=y | ||
| 152 | # CONFIG_AUDIT is not set | ||
| 153 | # CONFIG_HOTPLUG is not set | ||
| 154 | CONFIG_KOBJECT_UEVENT=y | ||
| 155 | # CONFIG_IKCONFIG is not set | ||
| 156 | CONFIG_INITRAMFS_SOURCE="" | ||
| 157 | CONFIG_EMBEDDED=y | ||
| 158 | CONFIG_KALLSYMS=y | ||
| 159 | # CONFIG_KALLSYMS_ALL is not set | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | CONFIG_SHMEM=y | ||
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | # CONFIG_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | # CONFIG_MODVERSIONS is not set | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_TC=y | 207 | CONFIG_TC=y |
| @@ -286,7 +286,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # QoS and/or fair queueing | 286 | # QoS and/or fair queueing |
| 287 | # | 287 | # |
| 288 | # CONFIG_NET_SCHED is not set | 288 | # CONFIG_NET_SCHED is not set |
| 289 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 290 | 289 | ||
| 291 | # | 290 | # |
| 292 | # Network testing | 291 | # Network testing |
| @@ -531,6 +530,7 @@ CONFIG_RTC=y | |||
| 531 | # | 530 | # |
| 532 | # TPM devices | 531 | # TPM devices |
| 533 | # | 532 | # |
| 533 | # CONFIG_TCG_TPM is not set | ||
| 534 | # CONFIG_TELCLOCK is not set | 534 | # CONFIG_TELCLOCK is not set |
| 535 | 535 | ||
| 536 | # | 536 | # |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index a89d2f66cdfa..c9070cef08b1 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:15 2005 | 4 | # Thu Nov 24 01:06:14 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | # CONFIG_HOTPLUG is not set | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | CONFIG_SHMEM=y | ||
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | # CONFIG_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_ISA=y | 209 | CONFIG_ISA=y |
| @@ -286,7 +286,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 286 | # QoS and/or fair queueing | 286 | # QoS and/or fair queueing |
| 287 | # | 287 | # |
| 288 | # CONFIG_NET_SCHED is not set | 288 | # CONFIG_NET_SCHED is not set |
| 289 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 290 | 289 | ||
| 291 | # | 290 | # |
| 292 | # Network testing | 291 | # Network testing |
| @@ -577,6 +576,7 @@ CONFIG_GPIO_VR41XX=y | |||
| 577 | # | 576 | # |
| 578 | # TPM devices | 577 | # TPM devices |
| 579 | # | 578 | # |
| 579 | # CONFIG_TCG_TPM is not set | ||
| 580 | # CONFIG_TELCLOCK is not set | 580 | # CONFIG_TELCLOCK is not set |
| 581 | 581 | ||
| 582 | # | 582 | # |
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index e6c3c27f41fe..14e3815f11e6 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Wed Nov 9 11:05:12 2005 | 4 | # Thu Nov 24 01:06:16 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | # CONFIG_KMOD is not set | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -205,6 +136,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 205 | # CONFIG_PREEMPT is not set | 136 | # CONFIG_PREEMPT is not set |
| 206 | 137 | ||
| 207 | # | 138 | # |
| 139 | # Code maturity level options | ||
| 140 | # | ||
| 141 | CONFIG_EXPERIMENTAL=y | ||
| 142 | CONFIG_CLEAN_COMPILE=y | ||
| 143 | CONFIG_BROKEN_ON_SMP=y | ||
| 144 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 145 | |||
| 146 | # | ||
| 147 | # General setup | ||
| 148 | # | ||
| 149 | CONFIG_LOCALVERSION="" | ||
| 150 | CONFIG_LOCALVERSION_AUTO=y | ||
| 151 | CONFIG_SWAP=y | ||
| 152 | CONFIG_SYSVIPC=y | ||
| 153 | # CONFIG_POSIX_MQUEUE is not set | ||
| 154 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 155 | CONFIG_SYSCTL=y | ||
| 156 | # CONFIG_AUDIT is not set | ||
| 157 | CONFIG_HOTPLUG=y | ||
| 158 | CONFIG_KOBJECT_UEVENT=y | ||
| 159 | # CONFIG_IKCONFIG is not set | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | ||
| 161 | CONFIG_EMBEDDED=y | ||
| 162 | CONFIG_KALLSYMS=y | ||
| 163 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 164 | CONFIG_PRINTK=y | ||
| 165 | CONFIG_BUG=y | ||
| 166 | CONFIG_BASE_FULL=y | ||
| 167 | CONFIG_FUTEX=y | ||
| 168 | CONFIG_EPOLL=y | ||
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 170 | CONFIG_SHMEM=y | ||
| 171 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 172 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 173 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 174 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 175 | # CONFIG_TINY_SHMEM is not set | ||
| 176 | CONFIG_BASE_SMALL=0 | ||
| 177 | |||
| 178 | # | ||
| 179 | # Loadable module support | ||
| 180 | # | ||
| 181 | CONFIG_MODULES=y | ||
| 182 | CONFIG_MODULE_UNLOAD=y | ||
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | ||
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 187 | # CONFIG_KMOD is not set | ||
| 188 | |||
| 189 | # | ||
| 190 | # Block layer | ||
| 191 | # | ||
| 192 | # CONFIG_LBD is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # IO Schedulers | ||
| 196 | # | ||
| 197 | CONFIG_IOSCHED_NOOP=y | ||
| 198 | CONFIG_IOSCHED_AS=y | ||
| 199 | CONFIG_IOSCHED_DEADLINE=y | ||
| 200 | CONFIG_IOSCHED_CFQ=y | ||
| 201 | CONFIG_DEFAULT_AS=y | ||
| 202 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 203 | # CONFIG_DEFAULT_CFQ is not set | ||
| 204 | # CONFIG_DEFAULT_NOOP is not set | ||
| 205 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 206 | |||
| 207 | # | ||
| 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 209 | # | 209 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| @@ -291,7 +291,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 291 | # QoS and/or fair queueing | 291 | # QoS and/or fair queueing |
| 292 | # | 292 | # |
| 293 | # CONFIG_NET_SCHED is not set | 293 | # CONFIG_NET_SCHED is not set |
| 294 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 295 | 294 | ||
| 296 | # | 295 | # |
| 297 | # Network testing | 296 | # Network testing |
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 52ca6bf5be66..510819581d8a 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:22 2005 | 4 | # Thu Nov 24 01:06:18 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | # CONFIG_KMOD is not set | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -209,6 +140,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 209 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
| 210 | 141 | ||
| 211 | # | 142 | # |
| 143 | # Code maturity level options | ||
| 144 | # | ||
| 145 | CONFIG_EXPERIMENTAL=y | ||
| 146 | CONFIG_CLEAN_COMPILE=y | ||
| 147 | CONFIG_BROKEN_ON_SMP=y | ||
| 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 149 | |||
| 150 | # | ||
| 151 | # General setup | ||
| 152 | # | ||
| 153 | CONFIG_LOCALVERSION="" | ||
| 154 | CONFIG_LOCALVERSION_AUTO=y | ||
| 155 | CONFIG_SWAP=y | ||
| 156 | CONFIG_SYSVIPC=y | ||
| 157 | # CONFIG_POSIX_MQUEUE is not set | ||
| 158 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 159 | CONFIG_SYSCTL=y | ||
| 160 | # CONFIG_AUDIT is not set | ||
| 161 | # CONFIG_HOTPLUG is not set | ||
| 162 | CONFIG_KOBJECT_UEVENT=y | ||
| 163 | # CONFIG_IKCONFIG is not set | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | ||
| 165 | CONFIG_EMBEDDED=y | ||
| 166 | CONFIG_KALLSYMS=y | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | CONFIG_SHMEM=y | ||
| 175 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 176 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 177 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 178 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 179 | # CONFIG_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | CONFIG_MODULES=y | ||
| 186 | CONFIG_MODULE_UNLOAD=y | ||
| 187 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 188 | CONFIG_OBSOLETE_MODPARM=y | ||
| 189 | CONFIG_MODVERSIONS=y | ||
| 190 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 191 | # CONFIG_KMOD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # Block layer | ||
| 195 | # | ||
| 196 | # CONFIG_LBD is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # IO Schedulers | ||
| 200 | # | ||
| 201 | CONFIG_IOSCHED_NOOP=y | ||
| 202 | CONFIG_IOSCHED_AS=y | ||
| 203 | CONFIG_IOSCHED_DEADLINE=y | ||
| 204 | CONFIG_IOSCHED_CFQ=y | ||
| 205 | CONFIG_DEFAULT_AS=y | ||
| 206 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 207 | # CONFIG_DEFAULT_CFQ is not set | ||
| 208 | # CONFIG_DEFAULT_NOOP is not set | ||
| 209 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 210 | |||
| 211 | # | ||
| 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 213 | # | 213 | # |
| 214 | CONFIG_HW_HAS_PCI=y | 214 | CONFIG_HW_HAS_PCI=y |
| @@ -293,7 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 293 | # QoS and/or fair queueing | 293 | # QoS and/or fair queueing |
| 294 | # | 294 | # |
| 295 | # CONFIG_NET_SCHED is not set | 295 | # CONFIG_NET_SCHED is not set |
| 296 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 297 | 296 | ||
| 298 | # | 297 | # |
| 299 | # Network testing | 298 | # Network testing |
| @@ -531,6 +530,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 531 | # | 530 | # |
| 532 | # TPM devices | 531 | # TPM devices |
| 533 | # | 532 | # |
| 533 | # CONFIG_TCG_TPM is not set | ||
| 534 | # CONFIG_TELCLOCK is not set | 534 | # CONFIG_TELCLOCK is not set |
| 535 | 535 | ||
| 536 | # | 536 | # |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 79e3fe7e2d54..67979e3e606e 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 13:38:41 2005 | 4 | # Thu Nov 24 01:06:20 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -211,6 +141,76 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 211 | # CONFIG_PREEMPT is not set | 141 | # CONFIG_PREEMPT is not set |
| 212 | 142 | ||
| 213 | # | 143 | # |
| 144 | # Code maturity level options | ||
| 145 | # | ||
| 146 | CONFIG_EXPERIMENTAL=y | ||
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | ||
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 150 | |||
| 151 | # | ||
| 152 | # General setup | ||
| 153 | # | ||
| 154 | CONFIG_LOCALVERSION="" | ||
| 155 | CONFIG_LOCALVERSION_AUTO=y | ||
| 156 | CONFIG_SWAP=y | ||
| 157 | CONFIG_SYSVIPC=y | ||
| 158 | # CONFIG_POSIX_MQUEUE is not set | ||
| 159 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 160 | CONFIG_SYSCTL=y | ||
| 161 | # CONFIG_AUDIT is not set | ||
| 162 | # CONFIG_HOTPLUG is not set | ||
| 163 | CONFIG_KOBJECT_UEVENT=y | ||
| 164 | CONFIG_IKCONFIG=y | ||
| 165 | CONFIG_IKCONFIG_PROC=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | CONFIG_SHMEM=y | ||
| 177 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 178 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 179 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 180 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 181 | # CONFIG_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | CONFIG_MODULES=y | ||
| 188 | CONFIG_MODULE_UNLOAD=y | ||
| 189 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 190 | CONFIG_OBSOLETE_MODPARM=y | ||
| 191 | CONFIG_MODVERSIONS=y | ||
| 192 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 193 | CONFIG_KMOD=y | ||
| 194 | |||
| 195 | # | ||
| 196 | # Block layer | ||
| 197 | # | ||
| 198 | # CONFIG_LBD is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # IO Schedulers | ||
| 202 | # | ||
| 203 | CONFIG_IOSCHED_NOOP=y | ||
| 204 | CONFIG_IOSCHED_AS=y | ||
| 205 | CONFIG_IOSCHED_DEADLINE=y | ||
| 206 | CONFIG_IOSCHED_CFQ=y | ||
| 207 | CONFIG_DEFAULT_AS=y | ||
| 208 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 209 | # CONFIG_DEFAULT_CFQ is not set | ||
| 210 | # CONFIG_DEFAULT_NOOP is not set | ||
| 211 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 212 | |||
| 213 | # | ||
| 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 215 | # | 215 | # |
| 216 | CONFIG_HW_HAS_EISA=y | 216 | CONFIG_HW_HAS_EISA=y |
| @@ -779,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 779 | # | 779 | # |
| 780 | # TPM devices | 780 | # TPM devices |
| 781 | # | 781 | # |
| 782 | # CONFIG_TCG_TPM is not set | ||
| 782 | # CONFIG_TELCLOCK is not set | 783 | # CONFIG_TELCLOCK is not set |
| 783 | 784 | ||
| 784 | # | 785 | # |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 72998ec35b0b..03af44d1d846 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
| @@ -1,82 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Sun Nov 13 23:56:52 2005 | 4 | # Thu Nov 24 01:06:21 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | CONFIG_POSIX_MQUEUE=y | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_CPUSETS=y | ||
| 32 | CONFIG_INITRAMFS_SOURCE="" | ||
| 33 | CONFIG_EMBEDDED=y | ||
| 34 | CONFIG_KALLSYMS=y | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | CONFIG_MODULE_UNLOAD=y | ||
| 55 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 56 | CONFIG_OBSOLETE_MODPARM=y | ||
| 57 | # CONFIG_MODVERSIONS is not set | ||
| 58 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 59 | CONFIG_KMOD=y | ||
| 60 | CONFIG_STOP_MACHINE=y | ||
| 61 | |||
| 62 | # | ||
| 63 | # Block layer | ||
| 64 | # | ||
| 65 | |||
| 66 | # | ||
| 67 | # IO Schedulers | ||
| 68 | # | ||
| 69 | CONFIG_IOSCHED_NOOP=y | ||
| 70 | CONFIG_IOSCHED_AS=y | ||
| 71 | CONFIG_IOSCHED_DEADLINE=y | ||
| 72 | CONFIG_IOSCHED_CFQ=y | ||
| 73 | CONFIG_DEFAULT_AS=y | ||
| 74 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 75 | # CONFIG_DEFAULT_CFQ is not set | ||
| 76 | # CONFIG_DEFAULT_NOOP is not set | ||
| 77 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 78 | |||
| 79 | # | ||
| 80 | # Machine selection | 9 | # Machine selection |
| 81 | # | 10 | # |
| 82 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -213,6 +142,77 @@ CONFIG_PREEMPT_BKL=y | |||
| 213 | # CONFIG_MIPS_INSANE_LARGE is not set | 142 | # CONFIG_MIPS_INSANE_LARGE is not set |
| 214 | 143 | ||
| 215 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | CONFIG_EXPERIMENTAL=y | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_LOCK_KERNEL=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | CONFIG_POSIX_MQUEUE=y | ||
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 161 | CONFIG_SYSCTL=y | ||
| 162 | # CONFIG_AUDIT is not set | ||
| 163 | CONFIG_HOTPLUG=y | ||
| 164 | CONFIG_KOBJECT_UEVENT=y | ||
| 165 | CONFIG_IKCONFIG=y | ||
| 166 | CONFIG_IKCONFIG_PROC=y | ||
| 167 | CONFIG_CPUSETS=y | ||
| 168 | CONFIG_INITRAMFS_SOURCE="" | ||
| 169 | CONFIG_EMBEDDED=y | ||
| 170 | CONFIG_KALLSYMS=y | ||
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 172 | CONFIG_PRINTK=y | ||
| 173 | CONFIG_BUG=y | ||
| 174 | CONFIG_BASE_FULL=y | ||
| 175 | CONFIG_FUTEX=y | ||
| 176 | CONFIG_EPOLL=y | ||
| 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 178 | CONFIG_SHMEM=y | ||
| 179 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 180 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 181 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 182 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 183 | # CONFIG_TINY_SHMEM is not set | ||
| 184 | CONFIG_BASE_SMALL=0 | ||
| 185 | |||
| 186 | # | ||
| 187 | # Loadable module support | ||
| 188 | # | ||
| 189 | CONFIG_MODULES=y | ||
| 190 | CONFIG_MODULE_UNLOAD=y | ||
| 191 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 192 | CONFIG_OBSOLETE_MODPARM=y | ||
| 193 | # CONFIG_MODVERSIONS is not set | ||
| 194 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 195 | CONFIG_KMOD=y | ||
| 196 | CONFIG_STOP_MACHINE=y | ||
| 197 | |||
| 198 | # | ||
| 199 | # Block layer | ||
| 200 | # | ||
| 201 | |||
| 202 | # | ||
| 203 | # IO Schedulers | ||
| 204 | # | ||
| 205 | CONFIG_IOSCHED_NOOP=y | ||
| 206 | CONFIG_IOSCHED_AS=y | ||
| 207 | CONFIG_IOSCHED_DEADLINE=y | ||
| 208 | CONFIG_IOSCHED_CFQ=y | ||
| 209 | CONFIG_DEFAULT_AS=y | ||
| 210 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 211 | # CONFIG_DEFAULT_CFQ is not set | ||
| 212 | # CONFIG_DEFAULT_NOOP is not set | ||
| 213 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 214 | |||
| 215 | # | ||
| 216 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 216 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 217 | # | 217 | # |
| 218 | CONFIG_HW_HAS_PCI=y | 218 | CONFIG_HW_HAS_PCI=y |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 955e30f1b1ad..cba2a49cceb1 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:32 2005 | 4 | # Thu Nov 24 01:06:24 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | CONFIG_HOTPLUG=y | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | # CONFIG_IKCONFIG is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | # CONFIG_MODULES is not set | ||
| 53 | |||
| 54 | # | ||
| 55 | # Block layer | ||
| 56 | # | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +139,69 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 202 | # CONFIG_PREEMPT is not set | 139 | # CONFIG_PREEMPT is not set |
| 203 | 140 | ||
| 204 | # | 141 | # |
| 142 | # Code maturity level options | ||
| 143 | # | ||
| 144 | CONFIG_EXPERIMENTAL=y | ||
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | ||
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 148 | |||
| 149 | # | ||
| 150 | # General setup | ||
| 151 | # | ||
| 152 | CONFIG_LOCALVERSION="" | ||
| 153 | CONFIG_LOCALVERSION_AUTO=y | ||
| 154 | CONFIG_SWAP=y | ||
| 155 | CONFIG_SYSVIPC=y | ||
| 156 | # CONFIG_POSIX_MQUEUE is not set | ||
| 157 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 158 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 159 | CONFIG_SYSCTL=y | ||
| 160 | # CONFIG_AUDIT is not set | ||
| 161 | CONFIG_HOTPLUG=y | ||
| 162 | CONFIG_KOBJECT_UEVENT=y | ||
| 163 | # CONFIG_IKCONFIG is not set | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | ||
| 165 | CONFIG_EMBEDDED=y | ||
| 166 | CONFIG_KALLSYMS=y | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | CONFIG_SHMEM=y | ||
| 175 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 176 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 177 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 178 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 179 | # CONFIG_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | # CONFIG_MODULES is not set | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -294,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 294 | # QoS and/or fair queueing | 294 | # QoS and/or fair queueing |
| 295 | # | 295 | # |
| 296 | # CONFIG_NET_SCHED is not set | 296 | # CONFIG_NET_SCHED is not set |
| 297 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 298 | 297 | ||
| 299 | # | 298 | # |
| 300 | # Network testing | 299 | # Network testing |
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index f631385217db..e7ee1679af90 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 13:42:45 2005 | 4 | # Thu Nov 24 01:06:26 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | # CONFIG_HOTPLUG is not set | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | # CONFIG_IKCONFIG is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -205,6 +135,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 205 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 206 | 136 | ||
| 207 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 154 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 155 | CONFIG_SYSCTL=y | ||
| 156 | # CONFIG_AUDIT is not set | ||
| 157 | # CONFIG_HOTPLUG is not set | ||
| 158 | CONFIG_KOBJECT_UEVENT=y | ||
| 159 | # CONFIG_IKCONFIG is not set | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | ||
| 161 | CONFIG_EMBEDDED=y | ||
| 162 | CONFIG_KALLSYMS=y | ||
| 163 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 164 | CONFIG_PRINTK=y | ||
| 165 | CONFIG_BUG=y | ||
| 166 | CONFIG_BASE_FULL=y | ||
| 167 | CONFIG_FUTEX=y | ||
| 168 | CONFIG_EPOLL=y | ||
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 170 | CONFIG_SHMEM=y | ||
| 171 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 172 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 173 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 174 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 175 | # CONFIG_TINY_SHMEM is not set | ||
| 176 | CONFIG_BASE_SMALL=0 | ||
| 177 | |||
| 178 | # | ||
| 179 | # Loadable module support | ||
| 180 | # | ||
| 181 | CONFIG_MODULES=y | ||
| 182 | CONFIG_MODULE_UNLOAD=y | ||
| 183 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 184 | CONFIG_OBSOLETE_MODPARM=y | ||
| 185 | CONFIG_MODVERSIONS=y | ||
| 186 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 187 | CONFIG_KMOD=y | ||
| 188 | |||
| 189 | # | ||
| 190 | # Block layer | ||
| 191 | # | ||
| 192 | # CONFIG_LBD is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # IO Schedulers | ||
| 196 | # | ||
| 197 | CONFIG_IOSCHED_NOOP=y | ||
| 198 | CONFIG_IOSCHED_AS=y | ||
| 199 | CONFIG_IOSCHED_DEADLINE=y | ||
| 200 | CONFIG_IOSCHED_CFQ=y | ||
| 201 | CONFIG_DEFAULT_AS=y | ||
| 202 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 203 | # CONFIG_DEFAULT_CFQ is not set | ||
| 204 | # CONFIG_DEFAULT_NOOP is not set | ||
| 205 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 206 | |||
| 207 | # | ||
| 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 209 | # | 209 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| @@ -290,7 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 290 | # QoS and/or fair queueing | 290 | # QoS and/or fair queueing |
| 291 | # | 291 | # |
| 292 | # CONFIG_NET_SCHED is not set | 292 | # CONFIG_NET_SCHED is not set |
| 293 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 294 | 293 | ||
| 295 | # | 294 | # |
| 296 | # Network testing | 295 | # Network testing |
| @@ -628,6 +627,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 628 | # | 627 | # |
| 629 | # TPM devices | 628 | # TPM devices |
| 630 | # | 629 | # |
| 630 | # CONFIG_TCG_TPM is not set | ||
| 631 | # CONFIG_TELCLOCK is not set | 631 | # CONFIG_TELCLOCK is not set |
| 632 | 632 | ||
| 633 | # | 633 | # |
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 8d94ac753e78..138c8a60a4dc 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:38 2005 | 4 | # Thu Nov 24 01:06:27 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | CONFIG_HOTPLUG=y | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | # CONFIG_IKCONFIG is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +132,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 132 | # CONFIG_PREEMPT is not set |
| 203 | 133 | ||
| 204 | # | 134 | # |
| 135 | # Code maturity level options | ||
| 136 | # | ||
| 137 | CONFIG_EXPERIMENTAL=y | ||
| 138 | CONFIG_CLEAN_COMPILE=y | ||
| 139 | CONFIG_BROKEN_ON_SMP=y | ||
| 140 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 141 | |||
| 142 | # | ||
| 143 | # General setup | ||
| 144 | # | ||
| 145 | CONFIG_LOCALVERSION="" | ||
| 146 | CONFIG_LOCALVERSION_AUTO=y | ||
| 147 | CONFIG_SWAP=y | ||
| 148 | CONFIG_SYSVIPC=y | ||
| 149 | # CONFIG_POSIX_MQUEUE is not set | ||
| 150 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | CONFIG_HOTPLUG=y | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | # CONFIG_IKCONFIG is not set | ||
| 157 | CONFIG_INITRAMFS_SOURCE="" | ||
| 158 | CONFIG_EMBEDDED=y | ||
| 159 | CONFIG_KALLSYMS=y | ||
| 160 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 161 | CONFIG_PRINTK=y | ||
| 162 | CONFIG_BUG=y | ||
| 163 | CONFIG_BASE_FULL=y | ||
| 164 | CONFIG_FUTEX=y | ||
| 165 | CONFIG_EPOLL=y | ||
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 167 | CONFIG_SHMEM=y | ||
| 168 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 169 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 170 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 171 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 172 | # CONFIG_TINY_SHMEM is not set | ||
| 173 | CONFIG_BASE_SMALL=0 | ||
| 174 | |||
| 175 | # | ||
| 176 | # Loadable module support | ||
| 177 | # | ||
| 178 | CONFIG_MODULES=y | ||
| 179 | CONFIG_MODULE_UNLOAD=y | ||
| 180 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 181 | CONFIG_OBSOLETE_MODPARM=y | ||
| 182 | CONFIG_MODVERSIONS=y | ||
| 183 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 184 | CONFIG_KMOD=y | ||
| 185 | |||
| 186 | # | ||
| 187 | # Block layer | ||
| 188 | # | ||
| 189 | # CONFIG_LBD is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -289,7 +289,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # QoS and/or fair queueing | 289 | # QoS and/or fair queueing |
| 290 | # | 290 | # |
| 291 | # CONFIG_NET_SCHED is not set | 291 | # CONFIG_NET_SCHED is not set |
| 292 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 293 | 292 | ||
| 294 | # | 293 | # |
| 295 | # Network testing | 294 | # Network testing |
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index a8b4c9a9a63b..6238e0d6a430 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig | |||
| @@ -1,78 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:41 2005 | 4 | # Thu Nov 24 01:06:29 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | # CONFIG_EXPERIMENTAL is not set | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | CONFIG_SYSCTL=y | ||
| 25 | # CONFIG_AUDIT is not set | ||
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | ||
| 29 | CONFIG_IKCONFIG_PROC=y | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | CONFIG_OBSOLETE_MODPARM=y | ||
| 54 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 55 | CONFIG_KMOD=y | ||
| 56 | |||
| 57 | # | ||
| 58 | # Block layer | ||
| 59 | # | ||
| 60 | # CONFIG_LBD is not set | ||
| 61 | |||
| 62 | # | ||
| 63 | # IO Schedulers | ||
| 64 | # | ||
| 65 | CONFIG_IOSCHED_NOOP=y | ||
| 66 | CONFIG_IOSCHED_AS=y | ||
| 67 | CONFIG_IOSCHED_DEADLINE=y | ||
| 68 | CONFIG_IOSCHED_CFQ=y | ||
| 69 | CONFIG_DEFAULT_AS=y | ||
| 70 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 71 | # CONFIG_DEFAULT_CFQ is not set | ||
| 72 | # CONFIG_DEFAULT_NOOP is not set | ||
| 73 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 74 | |||
| 75 | # | ||
| 76 | # Machine selection | 9 | # Machine selection |
| 77 | # | 10 | # |
| 78 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -209,6 +142,73 @@ CONFIG_PREEMPT_NONE=y | |||
| 209 | # CONFIG_PREEMPT is not set | 142 | # CONFIG_PREEMPT is not set |
| 210 | 143 | ||
| 211 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | # CONFIG_EXPERIMENTAL is not set | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 160 | CONFIG_SYSCTL=y | ||
| 161 | # CONFIG_AUDIT is not set | ||
| 162 | CONFIG_HOTPLUG=y | ||
| 163 | CONFIG_KOBJECT_UEVENT=y | ||
| 164 | CONFIG_IKCONFIG=y | ||
| 165 | CONFIG_IKCONFIG_PROC=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | CONFIG_SHMEM=y | ||
| 177 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 178 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 179 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 180 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 181 | # CONFIG_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | CONFIG_MODULES=y | ||
| 188 | CONFIG_MODULE_UNLOAD=y | ||
| 189 | CONFIG_OBSOLETE_MODPARM=y | ||
| 190 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 191 | CONFIG_KMOD=y | ||
| 192 | |||
| 193 | # | ||
| 194 | # Block layer | ||
| 195 | # | ||
| 196 | # CONFIG_LBD is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # IO Schedulers | ||
| 200 | # | ||
| 201 | CONFIG_IOSCHED_NOOP=y | ||
| 202 | CONFIG_IOSCHED_AS=y | ||
| 203 | CONFIG_IOSCHED_DEADLINE=y | ||
| 204 | CONFIG_IOSCHED_CFQ=y | ||
| 205 | CONFIG_DEFAULT_AS=y | ||
| 206 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 207 | # CONFIG_DEFAULT_CFQ is not set | ||
| 208 | # CONFIG_DEFAULT_NOOP is not set | ||
| 209 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 210 | |||
| 211 | # | ||
| 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 213 | # | 213 | # |
| 214 | CONFIG_HW_HAS_PCI=y | 214 | CONFIG_HW_HAS_PCI=y |
| @@ -283,7 +283,6 @@ CONFIG_IPV6_TUNNEL=m | |||
| 283 | # QoS and/or fair queueing | 283 | # QoS and/or fair queueing |
| 284 | # | 284 | # |
| 285 | # CONFIG_NET_SCHED is not set | 285 | # CONFIG_NET_SCHED is not set |
| 286 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 287 | 286 | ||
| 288 | # | 287 | # |
| 289 | # Network testing | 288 | # Network testing |
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index c0ac5c793ec7..a8ded3d74152 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:44 2005 | 4 | # Thu Nov 24 01:06:31 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -193,6 +130,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 193 | CONFIG_RTC_DS1742=y | 130 | CONFIG_RTC_DS1742=y |
| 194 | 131 | ||
| 195 | # | 132 | # |
| 133 | # Code maturity level options | ||
| 134 | # | ||
| 135 | CONFIG_EXPERIMENTAL=y | ||
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | ||
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 139 | |||
| 140 | # | ||
| 141 | # General setup | ||
| 142 | # | ||
| 143 | CONFIG_LOCALVERSION="" | ||
| 144 | CONFIG_LOCALVERSION_AUTO=y | ||
| 145 | CONFIG_SWAP=y | ||
| 146 | CONFIG_SYSVIPC=y | ||
| 147 | # CONFIG_POSIX_MQUEUE is not set | ||
| 148 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 149 | CONFIG_SYSCTL=y | ||
| 150 | # CONFIG_AUDIT is not set | ||
| 151 | CONFIG_HOTPLUG=y | ||
| 152 | CONFIG_KOBJECT_UEVENT=y | ||
| 153 | # CONFIG_IKCONFIG is not set | ||
| 154 | CONFIG_INITRAMFS_SOURCE="" | ||
| 155 | CONFIG_EMBEDDED=y | ||
| 156 | CONFIG_KALLSYMS=y | ||
| 157 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 158 | CONFIG_PRINTK=y | ||
| 159 | CONFIG_BUG=y | ||
| 160 | CONFIG_BASE_FULL=y | ||
| 161 | CONFIG_FUTEX=y | ||
| 162 | CONFIG_EPOLL=y | ||
| 163 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 164 | CONFIG_SHMEM=y | ||
| 165 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 166 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 167 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 168 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 169 | # CONFIG_TINY_SHMEM is not set | ||
| 170 | CONFIG_BASE_SMALL=0 | ||
| 171 | |||
| 172 | # | ||
| 173 | # Loadable module support | ||
| 174 | # | ||
| 175 | # CONFIG_MODULES is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Block layer | ||
| 179 | # | ||
| 180 | # CONFIG_LBD is not set | ||
| 181 | |||
| 182 | # | ||
| 183 | # IO Schedulers | ||
| 184 | # | ||
| 185 | CONFIG_IOSCHED_NOOP=y | ||
| 186 | CONFIG_IOSCHED_AS=y | ||
| 187 | CONFIG_IOSCHED_DEADLINE=y | ||
| 188 | CONFIG_IOSCHED_CFQ=y | ||
| 189 | CONFIG_DEFAULT_AS=y | ||
| 190 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 191 | # CONFIG_DEFAULT_CFQ is not set | ||
| 192 | # CONFIG_DEFAULT_NOOP is not set | ||
| 193 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 194 | |||
| 195 | # | ||
| 196 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 196 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 197 | # | 197 | # |
| 198 | CONFIG_HW_HAS_PCI=y | 198 | CONFIG_HW_HAS_PCI=y |
| @@ -280,7 +280,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 280 | # QoS and/or fair queueing | 280 | # QoS and/or fair queueing |
| 281 | # | 281 | # |
| 282 | # CONFIG_NET_SCHED is not set | 282 | # CONFIG_NET_SCHED is not set |
| 283 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 284 | 283 | ||
| 285 | # | 284 | # |
| 286 | # Network testing | 285 | # Network testing |
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index f2bd620ff0fa..a7ad99b12fe5 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:47 2005 | 4 | # Thu Nov 24 01:06:33 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -208,6 +139,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 208 | # CONFIG_PREEMPT is not set | 139 | # CONFIG_PREEMPT is not set |
| 209 | 140 | ||
| 210 | # | 141 | # |
| 142 | # Code maturity level options | ||
| 143 | # | ||
| 144 | CONFIG_EXPERIMENTAL=y | ||
| 145 | CONFIG_CLEAN_COMPILE=y | ||
| 146 | CONFIG_BROKEN_ON_SMP=y | ||
| 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 148 | |||
| 149 | # | ||
| 150 | # General setup | ||
| 151 | # | ||
| 152 | CONFIG_LOCALVERSION="" | ||
| 153 | CONFIG_LOCALVERSION_AUTO=y | ||
| 154 | CONFIG_SWAP=y | ||
| 155 | CONFIG_SYSVIPC=y | ||
| 156 | # CONFIG_POSIX_MQUEUE is not set | ||
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 158 | CONFIG_SYSCTL=y | ||
| 159 | # CONFIG_AUDIT is not set | ||
| 160 | CONFIG_HOTPLUG=y | ||
| 161 | CONFIG_KOBJECT_UEVENT=y | ||
| 162 | # CONFIG_IKCONFIG is not set | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | ||
| 164 | CONFIG_EMBEDDED=y | ||
| 165 | CONFIG_KALLSYMS=y | ||
| 166 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 167 | CONFIG_PRINTK=y | ||
| 168 | CONFIG_BUG=y | ||
| 169 | CONFIG_BASE_FULL=y | ||
| 170 | CONFIG_FUTEX=y | ||
| 171 | CONFIG_EPOLL=y | ||
| 172 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 173 | CONFIG_SHMEM=y | ||
| 174 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 175 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 176 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 177 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 178 | # CONFIG_TINY_SHMEM is not set | ||
| 179 | CONFIG_BASE_SMALL=0 | ||
| 180 | |||
| 181 | # | ||
| 182 | # Loadable module support | ||
| 183 | # | ||
| 184 | CONFIG_MODULES=y | ||
| 185 | CONFIG_MODULE_UNLOAD=y | ||
| 186 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | CONFIG_MODVERSIONS=y | ||
| 189 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 190 | CONFIG_KMOD=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Block layer | ||
| 194 | # | ||
| 195 | # CONFIG_LBD is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # IO Schedulers | ||
| 199 | # | ||
| 200 | CONFIG_IOSCHED_NOOP=y | ||
| 201 | CONFIG_IOSCHED_AS=y | ||
| 202 | CONFIG_IOSCHED_DEADLINE=y | ||
| 203 | CONFIG_IOSCHED_CFQ=y | ||
| 204 | CONFIG_DEFAULT_AS=y | ||
| 205 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 206 | # CONFIG_DEFAULT_CFQ is not set | ||
| 207 | # CONFIG_DEFAULT_NOOP is not set | ||
| 208 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 209 | |||
| 210 | # | ||
| 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 212 | # | 212 | # |
| 213 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| @@ -291,7 +291,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 291 | # QoS and/or fair queueing | 291 | # QoS and/or fair queueing |
| 292 | # | 292 | # |
| 293 | # CONFIG_NET_SCHED is not set | 293 | # CONFIG_NET_SCHED is not set |
| 294 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 295 | 294 | ||
| 296 | # | 295 | # |
| 297 | # Network testing | 296 | # Network testing |
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index e48e1de442b4..d1c44216f1c1 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 13:42:55 2005 | 4 | # Thu Nov 24 01:06:35 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -221,6 +152,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 221 | # CONFIG_PREEMPT is not set | 152 | # CONFIG_PREEMPT is not set |
| 222 | 153 | ||
| 223 | # | 154 | # |
| 155 | # Code maturity level options | ||
| 156 | # | ||
| 157 | CONFIG_EXPERIMENTAL=y | ||
| 158 | CONFIG_CLEAN_COMPILE=y | ||
| 159 | CONFIG_BROKEN_ON_SMP=y | ||
| 160 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 161 | |||
| 162 | # | ||
| 163 | # General setup | ||
| 164 | # | ||
| 165 | CONFIG_LOCALVERSION="" | ||
| 166 | CONFIG_LOCALVERSION_AUTO=y | ||
| 167 | CONFIG_SWAP=y | ||
| 168 | CONFIG_SYSVIPC=y | ||
| 169 | # CONFIG_POSIX_MQUEUE is not set | ||
| 170 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 171 | CONFIG_SYSCTL=y | ||
| 172 | # CONFIG_AUDIT is not set | ||
| 173 | CONFIG_HOTPLUG=y | ||
| 174 | CONFIG_KOBJECT_UEVENT=y | ||
| 175 | # CONFIG_IKCONFIG is not set | ||
| 176 | CONFIG_INITRAMFS_SOURCE="" | ||
| 177 | CONFIG_EMBEDDED=y | ||
| 178 | CONFIG_KALLSYMS=y | ||
| 179 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 180 | CONFIG_PRINTK=y | ||
| 181 | CONFIG_BUG=y | ||
| 182 | CONFIG_BASE_FULL=y | ||
| 183 | CONFIG_FUTEX=y | ||
| 184 | CONFIG_EPOLL=y | ||
| 185 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 186 | CONFIG_SHMEM=y | ||
| 187 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 188 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 189 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 190 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 191 | # CONFIG_TINY_SHMEM is not set | ||
| 192 | CONFIG_BASE_SMALL=0 | ||
| 193 | |||
| 194 | # | ||
| 195 | # Loadable module support | ||
| 196 | # | ||
| 197 | CONFIG_MODULES=y | ||
| 198 | CONFIG_MODULE_UNLOAD=y | ||
| 199 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 200 | CONFIG_OBSOLETE_MODPARM=y | ||
| 201 | CONFIG_MODVERSIONS=y | ||
| 202 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 203 | CONFIG_KMOD=y | ||
| 204 | |||
| 205 | # | ||
| 206 | # Block layer | ||
| 207 | # | ||
| 208 | # CONFIG_LBD is not set | ||
| 209 | |||
| 210 | # | ||
| 211 | # IO Schedulers | ||
| 212 | # | ||
| 213 | CONFIG_IOSCHED_NOOP=y | ||
| 214 | CONFIG_IOSCHED_AS=y | ||
| 215 | CONFIG_IOSCHED_DEADLINE=y | ||
| 216 | CONFIG_IOSCHED_CFQ=y | ||
| 217 | CONFIG_DEFAULT_AS=y | ||
| 218 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 219 | # CONFIG_DEFAULT_CFQ is not set | ||
| 220 | # CONFIG_DEFAULT_NOOP is not set | ||
| 221 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 222 | |||
| 223 | # | ||
| 224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 224 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 225 | # | 225 | # |
| 226 | CONFIG_HW_HAS_PCI=y | 226 | CONFIG_HW_HAS_PCI=y |
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 04abd1b3202b..ac39ab7feeb7 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:05:55 2005 | 4 | # Thu Nov 24 01:06:37 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_ALL is not set | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -208,6 +138,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 208 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
| 209 | 139 | ||
| 210 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | CONFIG_EXPERIMENTAL=y | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_POSIX_MQUEUE is not set | ||
| 156 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 157 | CONFIG_SYSCTL=y | ||
| 158 | # CONFIG_AUDIT is not set | ||
| 159 | CONFIG_HOTPLUG=y | ||
| 160 | CONFIG_KOBJECT_UEVENT=y | ||
| 161 | # CONFIG_IKCONFIG is not set | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | ||
| 163 | CONFIG_EMBEDDED=y | ||
| 164 | CONFIG_KALLSYMS=y | ||
| 165 | # CONFIG_KALLSYMS_ALL is not set | ||
| 166 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 167 | CONFIG_PRINTK=y | ||
| 168 | CONFIG_BUG=y | ||
| 169 | CONFIG_BASE_FULL=y | ||
| 170 | CONFIG_FUTEX=y | ||
| 171 | CONFIG_EPOLL=y | ||
| 172 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 173 | CONFIG_SHMEM=y | ||
| 174 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 175 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 176 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 177 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 178 | # CONFIG_TINY_SHMEM is not set | ||
| 179 | CONFIG_BASE_SMALL=0 | ||
| 180 | |||
| 181 | # | ||
| 182 | # Loadable module support | ||
| 183 | # | ||
| 184 | CONFIG_MODULES=y | ||
| 185 | CONFIG_MODULE_UNLOAD=y | ||
| 186 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | CONFIG_MODVERSIONS=y | ||
| 189 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 190 | CONFIG_KMOD=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Block layer | ||
| 194 | # | ||
| 195 | # CONFIG_LBD is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # IO Schedulers | ||
| 199 | # | ||
| 200 | CONFIG_IOSCHED_NOOP=y | ||
| 201 | CONFIG_IOSCHED_AS=y | ||
| 202 | CONFIG_IOSCHED_DEADLINE=y | ||
| 203 | CONFIG_IOSCHED_CFQ=y | ||
| 204 | CONFIG_DEFAULT_AS=y | ||
| 205 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 206 | # CONFIG_DEFAULT_CFQ is not set | ||
| 207 | # CONFIG_DEFAULT_NOOP is not set | ||
| 208 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 209 | |||
| 210 | # | ||
| 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 212 | # | 212 | # |
| 213 | CONFIG_MMU=y | 213 | CONFIG_MMU=y |
| @@ -558,6 +558,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 558 | # | 558 | # |
| 559 | # TPM devices | 559 | # TPM devices |
| 560 | # | 560 | # |
| 561 | # CONFIG_TCG_TPM is not set | ||
| 561 | # CONFIG_TELCLOCK is not set | 562 | # CONFIG_TELCLOCK is not set |
| 562 | 563 | ||
| 563 | # | 564 | # |
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 46814be0ac38..2b5ea37484e4 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:12:01 2005 | 4 | # Thu Nov 24 01:06:39 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -206,6 +137,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 206 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 207 | 138 | ||
| 208 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | CONFIG_SWAP=y | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_POSIX_MQUEUE is not set | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | # CONFIG_IKCONFIG is not set | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | ||
| 162 | CONFIG_EMBEDDED=y | ||
| 163 | CONFIG_KALLSYMS=y | ||
| 164 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 165 | CONFIG_PRINTK=y | ||
| 166 | CONFIG_BUG=y | ||
| 167 | CONFIG_BASE_FULL=y | ||
| 168 | CONFIG_FUTEX=y | ||
| 169 | CONFIG_EPOLL=y | ||
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 171 | CONFIG_SHMEM=y | ||
| 172 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 173 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 174 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 175 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 176 | # CONFIG_TINY_SHMEM is not set | ||
| 177 | CONFIG_BASE_SMALL=0 | ||
| 178 | |||
| 179 | # | ||
| 180 | # Loadable module support | ||
| 181 | # | ||
| 182 | CONFIG_MODULES=y | ||
| 183 | CONFIG_MODULE_UNLOAD=y | ||
| 184 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 185 | CONFIG_OBSOLETE_MODPARM=y | ||
| 186 | CONFIG_MODVERSIONS=y | ||
| 187 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 188 | CONFIG_KMOD=y | ||
| 189 | |||
| 190 | # | ||
| 191 | # Block layer | ||
| 192 | # | ||
| 193 | # CONFIG_LBD is not set | ||
| 194 | |||
| 195 | # | ||
| 196 | # IO Schedulers | ||
| 197 | # | ||
| 198 | CONFIG_IOSCHED_NOOP=y | ||
| 199 | CONFIG_IOSCHED_AS=y | ||
| 200 | CONFIG_IOSCHED_DEADLINE=y | ||
| 201 | CONFIG_IOSCHED_CFQ=y | ||
| 202 | CONFIG_DEFAULT_AS=y | ||
| 203 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 204 | # CONFIG_DEFAULT_CFQ is not set | ||
| 205 | # CONFIG_DEFAULT_NOOP is not set | ||
| 206 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 207 | |||
| 208 | # | ||
| 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 209 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 210 | # | 210 | # |
| 211 | CONFIG_HW_HAS_PCI=y | 211 | CONFIG_HW_HAS_PCI=y |
| @@ -304,7 +304,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 304 | # QoS and/or fair queueing | 304 | # QoS and/or fair queueing |
| 305 | # | 305 | # |
| 306 | # CONFIG_NET_SCHED is not set | 306 | # CONFIG_NET_SCHED is not set |
| 307 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 308 | 307 | ||
| 309 | # | 308 | # |
| 310 | # Network testing | 309 | # Network testing |
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index e12118c30db4..9081ea5a9dbd 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:01:36 2005 | 4 | # Thu Nov 24 01:06:41 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -212,6 +142,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 212 | # CONFIG_PREEMPT is not set | 142 | # CONFIG_PREEMPT is not set |
| 213 | 143 | ||
| 214 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | CONFIG_EXPERIMENTAL=y | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | # CONFIG_POSIX_MQUEUE is not set | ||
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 161 | CONFIG_SYSCTL=y | ||
| 162 | # CONFIG_AUDIT is not set | ||
| 163 | CONFIG_HOTPLUG=y | ||
| 164 | CONFIG_KOBJECT_UEVENT=y | ||
| 165 | CONFIG_IKCONFIG=y | ||
| 166 | CONFIG_IKCONFIG_PROC=y | ||
| 167 | CONFIG_INITRAMFS_SOURCE="" | ||
| 168 | CONFIG_EMBEDDED=y | ||
| 169 | CONFIG_KALLSYMS=y | ||
| 170 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 171 | CONFIG_PRINTK=y | ||
| 172 | CONFIG_BUG=y | ||
| 173 | CONFIG_BASE_FULL=y | ||
| 174 | CONFIG_FUTEX=y | ||
| 175 | CONFIG_EPOLL=y | ||
| 176 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 177 | CONFIG_SHMEM=y | ||
| 178 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 179 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 180 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 181 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 182 | # CONFIG_TINY_SHMEM is not set | ||
| 183 | CONFIG_BASE_SMALL=0 | ||
| 184 | |||
| 185 | # | ||
| 186 | # Loadable module support | ||
| 187 | # | ||
| 188 | CONFIG_MODULES=y | ||
| 189 | CONFIG_MODULE_UNLOAD=y | ||
| 190 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 191 | CONFIG_OBSOLETE_MODPARM=y | ||
| 192 | CONFIG_MODVERSIONS=y | ||
| 193 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 194 | CONFIG_KMOD=y | ||
| 195 | |||
| 196 | # | ||
| 197 | # Block layer | ||
| 198 | # | ||
| 199 | # CONFIG_LBD is not set | ||
| 200 | |||
| 201 | # | ||
| 202 | # IO Schedulers | ||
| 203 | # | ||
| 204 | CONFIG_IOSCHED_NOOP=y | ||
| 205 | CONFIG_IOSCHED_AS=y | ||
| 206 | CONFIG_IOSCHED_DEADLINE=y | ||
| 207 | CONFIG_IOSCHED_CFQ=y | ||
| 208 | CONFIG_DEFAULT_AS=y | ||
| 209 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 210 | # CONFIG_DEFAULT_CFQ is not set | ||
| 211 | # CONFIG_DEFAULT_NOOP is not set | ||
| 212 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 213 | |||
| 214 | # | ||
| 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 216 | # | 216 | # |
| 217 | CONFIG_HW_HAS_PCI=y | 217 | CONFIG_HW_HAS_PCI=y |
| @@ -333,7 +333,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 333 | # QoS and/or fair queueing | 333 | # QoS and/or fair queueing |
| 334 | # | 334 | # |
| 335 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 336 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 337 | 336 | ||
| 338 | # | 337 | # |
| 339 | # Network testing | 338 | # Network testing |
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index 99f0c980aee7..570fc4d18166 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig | |||
| @@ -1,73 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:05 2005 | 4 | # Thu Nov 24 01:06:43 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | |||
| 57 | # | ||
| 58 | # IO Schedulers | ||
| 59 | # | ||
| 60 | CONFIG_IOSCHED_NOOP=y | ||
| 61 | CONFIG_IOSCHED_AS=y | ||
| 62 | CONFIG_IOSCHED_DEADLINE=y | ||
| 63 | CONFIG_IOSCHED_CFQ=y | ||
| 64 | CONFIG_DEFAULT_AS=y | ||
| 65 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 66 | # CONFIG_DEFAULT_CFQ is not set | ||
| 67 | # CONFIG_DEFAULT_NOOP is not set | ||
| 68 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 69 | |||
| 70 | # | ||
| 71 | # Machine selection | 9 | # Machine selection |
| 72 | # | 10 | # |
| 73 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -199,6 +137,68 @@ CONFIG_PREEMPT_NONE=y | |||
| 199 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 200 | 138 | ||
| 201 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | CONFIG_SWAP=y | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_POSIX_MQUEUE is not set | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | # CONFIG_IKCONFIG is not set | ||
| 161 | CONFIG_INITRAMFS_SOURCE="" | ||
| 162 | CONFIG_EMBEDDED=y | ||
| 163 | CONFIG_KALLSYMS=y | ||
| 164 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 165 | CONFIG_PRINTK=y | ||
| 166 | CONFIG_BUG=y | ||
| 167 | CONFIG_BASE_FULL=y | ||
| 168 | CONFIG_FUTEX=y | ||
| 169 | CONFIG_EPOLL=y | ||
| 170 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 171 | CONFIG_SHMEM=y | ||
| 172 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 173 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 174 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 175 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 176 | # CONFIG_TINY_SHMEM is not set | ||
| 177 | CONFIG_BASE_SMALL=0 | ||
| 178 | |||
| 179 | # | ||
| 180 | # Loadable module support | ||
| 181 | # | ||
| 182 | # CONFIG_MODULES is not set | ||
| 183 | |||
| 184 | # | ||
| 185 | # Block layer | ||
| 186 | # | ||
| 187 | |||
| 188 | # | ||
| 189 | # IO Schedulers | ||
| 190 | # | ||
| 191 | CONFIG_IOSCHED_NOOP=y | ||
| 192 | CONFIG_IOSCHED_AS=y | ||
| 193 | CONFIG_IOSCHED_DEADLINE=y | ||
| 194 | CONFIG_IOSCHED_CFQ=y | ||
| 195 | CONFIG_DEFAULT_AS=y | ||
| 196 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 197 | # CONFIG_DEFAULT_CFQ is not set | ||
| 198 | # CONFIG_DEFAULT_NOOP is not set | ||
| 199 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 200 | |||
| 201 | # | ||
| 202 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 202 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 203 | # | 203 | # |
| 204 | CONFIG_HW_HAS_PCI=y | 204 | CONFIG_HW_HAS_PCI=y |
| @@ -290,7 +290,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 290 | # QoS and/or fair queueing | 290 | # QoS and/or fair queueing |
| 291 | # | 291 | # |
| 292 | # CONFIG_NET_SCHED is not set | 292 | # CONFIG_NET_SCHED is not set |
| 293 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 294 | 293 | ||
| 295 | # | 294 | # |
| 296 | # Network testing | 295 | # Network testing |
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 11c7d74ee1e5..6634ab24715c 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig | |||
| @@ -1,74 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:08 2005 | 4 | # Thu Nov 24 01:06:44 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | # CONFIG_LBD is not set | ||
| 57 | |||
| 58 | # | ||
| 59 | # IO Schedulers | ||
| 60 | # | ||
| 61 | CONFIG_IOSCHED_NOOP=y | ||
| 62 | CONFIG_IOSCHED_AS=y | ||
| 63 | CONFIG_IOSCHED_DEADLINE=y | ||
| 64 | CONFIG_IOSCHED_CFQ=y | ||
| 65 | CONFIG_DEFAULT_AS=y | ||
| 66 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 67 | # CONFIG_DEFAULT_CFQ is not set | ||
| 68 | # CONFIG_DEFAULT_NOOP is not set | ||
| 69 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 70 | |||
| 71 | # | ||
| 72 | # Machine selection | 9 | # Machine selection |
| 73 | # | 10 | # |
| 74 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -205,6 +142,69 @@ CONFIG_PREEMPT_NONE=y | |||
| 205 | # CONFIG_PREEMPT is not set | 142 | # CONFIG_PREEMPT is not set |
| 206 | 143 | ||
| 207 | # | 144 | # |
| 145 | # Code maturity level options | ||
| 146 | # | ||
| 147 | CONFIG_EXPERIMENTAL=y | ||
| 148 | CONFIG_CLEAN_COMPILE=y | ||
| 149 | CONFIG_BROKEN_ON_SMP=y | ||
| 150 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 151 | |||
| 152 | # | ||
| 153 | # General setup | ||
| 154 | # | ||
| 155 | CONFIG_LOCALVERSION="" | ||
| 156 | CONFIG_LOCALVERSION_AUTO=y | ||
| 157 | CONFIG_SWAP=y | ||
| 158 | CONFIG_SYSVIPC=y | ||
| 159 | # CONFIG_POSIX_MQUEUE is not set | ||
| 160 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 161 | CONFIG_SYSCTL=y | ||
| 162 | # CONFIG_AUDIT is not set | ||
| 163 | # CONFIG_HOTPLUG is not set | ||
| 164 | CONFIG_KOBJECT_UEVENT=y | ||
| 165 | # CONFIG_IKCONFIG is not set | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | CONFIG_SHMEM=y | ||
| 177 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 178 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 179 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 180 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 181 | # CONFIG_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | # CONFIG_MODULES is not set | ||
| 188 | |||
| 189 | # | ||
| 190 | # Block layer | ||
| 191 | # | ||
| 192 | # CONFIG_LBD is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # IO Schedulers | ||
| 196 | # | ||
| 197 | CONFIG_IOSCHED_NOOP=y | ||
| 198 | CONFIG_IOSCHED_AS=y | ||
| 199 | CONFIG_IOSCHED_DEADLINE=y | ||
| 200 | CONFIG_IOSCHED_CFQ=y | ||
| 201 | CONFIG_DEFAULT_AS=y | ||
| 202 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 203 | # CONFIG_DEFAULT_CFQ is not set | ||
| 204 | # CONFIG_DEFAULT_NOOP is not set | ||
| 205 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 206 | |||
| 207 | # | ||
| 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 208 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 209 | # | 209 | # |
| 210 | CONFIG_HW_HAS_PCI=y | 210 | CONFIG_HW_HAS_PCI=y |
| @@ -289,7 +289,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # QoS and/or fair queueing | 289 | # QoS and/or fair queueing |
| 290 | # | 290 | # |
| 291 | # CONFIG_NET_SCHED is not set | 291 | # CONFIG_NET_SCHED is not set |
| 292 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 293 | 292 | ||
| 294 | # | 293 | # |
| 295 | # Network testing | 294 | # Network testing |
| @@ -527,6 +526,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 527 | # | 526 | # |
| 528 | # TPM devices | 527 | # TPM devices |
| 529 | # | 528 | # |
| 529 | # CONFIG_TCG_TPM is not set | ||
| 530 | # CONFIG_TELCLOCK is not set | 530 | # CONFIG_TELCLOCK is not set |
| 531 | 531 | ||
| 532 | # | 532 | # |
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index 9ced1a9029d4..4c396e1e2f0a 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig | |||
| @@ -1,73 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:11 2005 | 4 | # Thu Nov 24 01:06:46 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | # CONFIG_MODULES is not set | ||
| 52 | |||
| 53 | # | ||
| 54 | # Block layer | ||
| 55 | # | ||
| 56 | |||
| 57 | # | ||
| 58 | # IO Schedulers | ||
| 59 | # | ||
| 60 | CONFIG_IOSCHED_NOOP=y | ||
| 61 | CONFIG_IOSCHED_AS=y | ||
| 62 | CONFIG_IOSCHED_DEADLINE=y | ||
| 63 | CONFIG_IOSCHED_CFQ=y | ||
| 64 | CONFIG_DEFAULT_AS=y | ||
| 65 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 66 | # CONFIG_DEFAULT_CFQ is not set | ||
| 67 | # CONFIG_DEFAULT_NOOP is not set | ||
| 68 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 69 | |||
| 70 | # | ||
| 71 | # Machine selection | 9 | # Machine selection |
| 72 | # | 10 | # |
| 73 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -202,6 +140,68 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
| 203 | 141 | ||
| 204 | # | 142 | # |
| 143 | # Code maturity level options | ||
| 144 | # | ||
| 145 | CONFIG_EXPERIMENTAL=y | ||
| 146 | CONFIG_CLEAN_COMPILE=y | ||
| 147 | CONFIG_BROKEN_ON_SMP=y | ||
| 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 149 | |||
| 150 | # | ||
| 151 | # General setup | ||
| 152 | # | ||
| 153 | CONFIG_LOCALVERSION="" | ||
| 154 | CONFIG_LOCALVERSION_AUTO=y | ||
| 155 | CONFIG_SWAP=y | ||
| 156 | CONFIG_SYSVIPC=y | ||
| 157 | # CONFIG_POSIX_MQUEUE is not set | ||
| 158 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 159 | CONFIG_SYSCTL=y | ||
| 160 | # CONFIG_AUDIT is not set | ||
| 161 | CONFIG_HOTPLUG=y | ||
| 162 | CONFIG_KOBJECT_UEVENT=y | ||
| 163 | # CONFIG_IKCONFIG is not set | ||
| 164 | CONFIG_INITRAMFS_SOURCE="" | ||
| 165 | CONFIG_EMBEDDED=y | ||
| 166 | CONFIG_KALLSYMS=y | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | CONFIG_SHMEM=y | ||
| 175 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 176 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 177 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 178 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 179 | # CONFIG_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | # CONFIG_MODULES is not set | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | |||
| 191 | # | ||
| 192 | # IO Schedulers | ||
| 193 | # | ||
| 194 | CONFIG_IOSCHED_NOOP=y | ||
| 195 | CONFIG_IOSCHED_AS=y | ||
| 196 | CONFIG_IOSCHED_DEADLINE=y | ||
| 197 | CONFIG_IOSCHED_CFQ=y | ||
| 198 | CONFIG_DEFAULT_AS=y | ||
| 199 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 200 | # CONFIG_DEFAULT_CFQ is not set | ||
| 201 | # CONFIG_DEFAULT_NOOP is not set | ||
| 202 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 203 | |||
| 204 | # | ||
| 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 205 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 206 | # | 206 | # |
| 207 | CONFIG_HW_HAS_PCI=y | 207 | CONFIG_HW_HAS_PCI=y |
| @@ -293,7 +293,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 293 | # QoS and/or fair queueing | 293 | # QoS and/or fair queueing |
| 294 | # | 294 | # |
| 295 | # CONFIG_NET_SCHED is not set | 295 | # CONFIG_NET_SCHED is not set |
| 296 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 297 | 296 | ||
| 298 | # | 297 | # |
| 299 | # Network testing | 298 | # Network testing |
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index dbcaa77add7c..883626afc47d 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:12:31 2005 | 4 | # Thu Nov 24 01:06:48 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | CONFIG_HOTPLUG=y | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | CONFIG_SHMEM=y | ||
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | # CONFIG_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| @@ -322,7 +322,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 322 | # QoS and/or fair queueing | 322 | # QoS and/or fair queueing |
| 323 | # | 323 | # |
| 324 | # CONFIG_NET_SCHED is not set | 324 | # CONFIG_NET_SCHED is not set |
| 325 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 326 | 325 | ||
| 327 | # | 326 | # |
| 328 | # Network testing | 327 | # Network testing |
| @@ -662,6 +661,7 @@ CONFIG_SYNCLINK_CS=m | |||
| 662 | # | 661 | # |
| 663 | # TPM devices | 662 | # TPM devices |
| 664 | # | 663 | # |
| 664 | # CONFIG_TCG_TPM is not set | ||
| 665 | # CONFIG_TELCLOCK is not set | 665 | # CONFIG_TELCLOCK is not set |
| 666 | 666 | ||
| 667 | # | 667 | # |
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index 5b685ceb6fde..f8fbc77f924e 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:14:25 2005 | 4 | # Thu Nov 24 01:06:50 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +134,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 204 | 135 | ||
| 205 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 328 | # QoS and/or fair queueing | 328 | # QoS and/or fair queueing |
| 329 | # | 329 | # |
| 330 | # CONFIG_NET_SCHED is not set | 330 | # CONFIG_NET_SCHED is not set |
| 331 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 332 | 331 | ||
| 333 | # | 332 | # |
| 334 | # Network testing | 333 | # Network testing |
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index f8f32e99f72d..3d694cd68d38 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:15:34 2005 | 4 | # Thu Nov 24 01:06:52 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +134,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 134 | # CONFIG_PREEMPT is not set |
| 204 | 135 | ||
| 205 | # | 136 | # |
| 137 | # Code maturity level options | ||
| 138 | # | ||
| 139 | CONFIG_EXPERIMENTAL=y | ||
| 140 | CONFIG_CLEAN_COMPILE=y | ||
| 141 | CONFIG_BROKEN_ON_SMP=y | ||
| 142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 143 | |||
| 144 | # | ||
| 145 | # General setup | ||
| 146 | # | ||
| 147 | CONFIG_LOCALVERSION="" | ||
| 148 | CONFIG_LOCALVERSION_AUTO=y | ||
| 149 | CONFIG_SWAP=y | ||
| 150 | CONFIG_SYSVIPC=y | ||
| 151 | # CONFIG_POSIX_MQUEUE is not set | ||
| 152 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 153 | CONFIG_SYSCTL=y | ||
| 154 | # CONFIG_AUDIT is not set | ||
| 155 | CONFIG_HOTPLUG=y | ||
| 156 | CONFIG_KOBJECT_UEVENT=y | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | CONFIG_MODULES=y | ||
| 180 | CONFIG_MODULE_UNLOAD=y | ||
| 181 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | CONFIG_MODVERSIONS=y | ||
| 184 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -328,7 +328,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 328 | # QoS and/or fair queueing | 328 | # QoS and/or fair queueing |
| 329 | # | 329 | # |
| 330 | # CONFIG_NET_SCHED is not set | 330 | # CONFIG_NET_SCHED is not set |
| 331 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 332 | 331 | ||
| 333 | # | 332 | # |
| 334 | # Network testing | 333 | # Network testing |
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 5820e5f2295e..fba624a792a9 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:25 2005 | 4 | # Thu Nov 24 01:06:54 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_ALL is not set | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | # CONFIG_MODULE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODVERSIONS is not set | ||
| 57 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -203,6 +133,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 133 | # CONFIG_PREEMPT is not set |
| 204 | 134 | ||
| 205 | # | 135 | # |
| 136 | # Code maturity level options | ||
| 137 | # | ||
| 138 | CONFIG_EXPERIMENTAL=y | ||
| 139 | CONFIG_CLEAN_COMPILE=y | ||
| 140 | CONFIG_BROKEN_ON_SMP=y | ||
| 141 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 142 | |||
| 143 | # | ||
| 144 | # General setup | ||
| 145 | # | ||
| 146 | CONFIG_LOCALVERSION="" | ||
| 147 | CONFIG_LOCALVERSION_AUTO=y | ||
| 148 | CONFIG_SWAP=y | ||
| 149 | CONFIG_SYSVIPC=y | ||
| 150 | # CONFIG_POSIX_MQUEUE is not set | ||
| 151 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 152 | CONFIG_SYSCTL=y | ||
| 153 | # CONFIG_AUDIT is not set | ||
| 154 | # CONFIG_HOTPLUG is not set | ||
| 155 | CONFIG_KOBJECT_UEVENT=y | ||
| 156 | CONFIG_IKCONFIG=y | ||
| 157 | CONFIG_IKCONFIG_PROC=y | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_ALL is not set | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | CONFIG_SHMEM=y | ||
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | # CONFIG_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | # CONFIG_MODULE_UNLOAD is not set | ||
| 182 | CONFIG_OBSOLETE_MODPARM=y | ||
| 183 | # CONFIG_MODVERSIONS is not set | ||
| 184 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 185 | CONFIG_KMOD=y | ||
| 186 | |||
| 187 | # | ||
| 188 | # Block layer | ||
| 189 | # | ||
| 190 | # CONFIG_LBD is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # IO Schedulers | ||
| 194 | # | ||
| 195 | CONFIG_IOSCHED_NOOP=y | ||
| 196 | CONFIG_IOSCHED_AS=y | ||
| 197 | CONFIG_IOSCHED_DEADLINE=y | ||
| 198 | CONFIG_IOSCHED_CFQ=y | ||
| 199 | CONFIG_DEFAULT_AS=y | ||
| 200 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 201 | # CONFIG_DEFAULT_CFQ is not set | ||
| 202 | # CONFIG_DEFAULT_NOOP is not set | ||
| 203 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 204 | |||
| 205 | # | ||
| 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 206 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 207 | # | 207 | # |
| 208 | CONFIG_HW_HAS_PCI=y | 208 | CONFIG_HW_HAS_PCI=y |
| @@ -289,7 +289,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 289 | # QoS and/or fair queueing | 289 | # QoS and/or fair queueing |
| 290 | # | 290 | # |
| 291 | # CONFIG_NET_SCHED is not set | 291 | # CONFIG_NET_SCHED is not set |
| 292 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 293 | 292 | ||
| 294 | # | 293 | # |
| 295 | # Network testing | 294 | # Network testing |
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index a4ebb538e15c..d9a0d2fdba4f 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:02:38 2005 | 4 | # Thu Nov 24 01:06:58 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | # CONFIG_MODULE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | # CONFIG_MODVERSIONS is not set | ||
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | # CONFIG_HOTPLUG is not set | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | CONFIG_IKCONFIG=y | ||
| 159 | CONFIG_IKCONFIG_PROC=y | ||
| 160 | CONFIG_INITRAMFS_SOURCE="" | ||
| 161 | CONFIG_EMBEDDED=y | ||
| 162 | CONFIG_KALLSYMS=y | ||
| 163 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 164 | CONFIG_PRINTK=y | ||
| 165 | CONFIG_BUG=y | ||
| 166 | CONFIG_BASE_FULL=y | ||
| 167 | CONFIG_FUTEX=y | ||
| 168 | CONFIG_EPOLL=y | ||
| 169 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 170 | CONFIG_SHMEM=y | ||
| 171 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 172 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 173 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 174 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 175 | # CONFIG_TINY_SHMEM is not set | ||
| 176 | CONFIG_BASE_SMALL=0 | ||
| 177 | |||
| 178 | # | ||
| 179 | # Loadable module support | ||
| 180 | # | ||
| 181 | CONFIG_MODULES=y | ||
| 182 | # CONFIG_MODULE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | # CONFIG_MODVERSIONS is not set | ||
| 185 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_HW_HAS_PCI=y | 209 | CONFIG_HW_HAS_PCI=y |
| @@ -321,7 +321,6 @@ CONFIG_NETFILTER=y | |||
| 321 | # QoS and/or fair queueing | 321 | # QoS and/or fair queueing |
| 322 | # | 322 | # |
| 323 | # CONFIG_NET_SCHED is not set | 323 | # CONFIG_NET_SCHED is not set |
| 324 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 325 | 324 | ||
| 326 | # | 325 | # |
| 327 | # Network testing | 326 | # Network testing |
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 5d39162077f4..dee44606164c 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig | |||
| @@ -1,73 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:31 2005 | 4 | # Thu Nov 24 01:07:00 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | # CONFIG_EXPERIMENTAL is not set | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | # CONFIG_SWAP is not set | ||
| 22 | # CONFIG_SYSVIPC is not set | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | # CONFIG_SYSCTL is not set | ||
| 25 | # CONFIG_AUDIT is not set | ||
| 26 | # CONFIG_HOTPLUG is not set | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | # CONFIG_IKCONFIG is not set | ||
| 29 | CONFIG_INITRAMFS_SOURCE="" | ||
| 30 | CONFIG_EMBEDDED=y | ||
| 31 | CONFIG_KALLSYMS=y | ||
| 32 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 33 | CONFIG_PRINTK=y | ||
| 34 | # CONFIG_BUG is not set | ||
| 35 | # CONFIG_BASE_FULL is not set | ||
| 36 | # CONFIG_FUTEX is not set | ||
| 37 | # CONFIG_EPOLL is not set | ||
| 38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 39 | # CONFIG_SHMEM is not set | ||
| 40 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 41 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 42 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 43 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 44 | CONFIG_TINY_SHMEM=y | ||
| 45 | CONFIG_BASE_SMALL=1 | ||
| 46 | |||
| 47 | # | ||
| 48 | # Loadable module support | ||
| 49 | # | ||
| 50 | # CONFIG_MODULES is not set | ||
| 51 | |||
| 52 | # | ||
| 53 | # Block layer | ||
| 54 | # | ||
| 55 | # CONFIG_LBD is not set | ||
| 56 | |||
| 57 | # | ||
| 58 | # IO Schedulers | ||
| 59 | # | ||
| 60 | CONFIG_IOSCHED_NOOP=y | ||
| 61 | # CONFIG_IOSCHED_AS is not set | ||
| 62 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 63 | # CONFIG_IOSCHED_CFQ is not set | ||
| 64 | # CONFIG_DEFAULT_AS is not set | ||
| 65 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 66 | # CONFIG_DEFAULT_CFQ is not set | ||
| 67 | CONFIG_DEFAULT_NOOP=y | ||
| 68 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 69 | |||
| 70 | # | ||
| 71 | # Machine selection | 9 | # Machine selection |
| 72 | # | 10 | # |
| 73 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -192,6 +130,68 @@ CONFIG_PREEMPT_NONE=y | |||
| 192 | # CONFIG_PREEMPT is not set | 130 | # CONFIG_PREEMPT is not set |
| 193 | 131 | ||
| 194 | # | 132 | # |
| 133 | # Code maturity level options | ||
| 134 | # | ||
| 135 | # CONFIG_EXPERIMENTAL is not set | ||
| 136 | CONFIG_CLEAN_COMPILE=y | ||
| 137 | CONFIG_BROKEN_ON_SMP=y | ||
| 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 139 | |||
| 140 | # | ||
| 141 | # General setup | ||
| 142 | # | ||
| 143 | CONFIG_LOCALVERSION="" | ||
| 144 | CONFIG_LOCALVERSION_AUTO=y | ||
| 145 | # CONFIG_SWAP is not set | ||
| 146 | # CONFIG_SYSVIPC is not set | ||
| 147 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 148 | # CONFIG_SYSCTL is not set | ||
| 149 | # CONFIG_AUDIT is not set | ||
| 150 | # CONFIG_HOTPLUG is not set | ||
| 151 | CONFIG_KOBJECT_UEVENT=y | ||
| 152 | # CONFIG_IKCONFIG is not set | ||
| 153 | CONFIG_INITRAMFS_SOURCE="" | ||
| 154 | CONFIG_EMBEDDED=y | ||
| 155 | CONFIG_KALLSYMS=y | ||
| 156 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 157 | CONFIG_PRINTK=y | ||
| 158 | # CONFIG_BUG is not set | ||
| 159 | # CONFIG_BASE_FULL is not set | ||
| 160 | # CONFIG_FUTEX is not set | ||
| 161 | # CONFIG_EPOLL is not set | ||
| 162 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 163 | # CONFIG_SHMEM is not set | ||
| 164 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 165 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 166 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 167 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 168 | CONFIG_TINY_SHMEM=y | ||
| 169 | CONFIG_BASE_SMALL=1 | ||
| 170 | |||
| 171 | # | ||
| 172 | # Loadable module support | ||
| 173 | # | ||
| 174 | # CONFIG_MODULES is not set | ||
| 175 | |||
| 176 | # | ||
| 177 | # Block layer | ||
| 178 | # | ||
| 179 | # CONFIG_LBD is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # IO Schedulers | ||
| 183 | # | ||
| 184 | CONFIG_IOSCHED_NOOP=y | ||
| 185 | # CONFIG_IOSCHED_AS is not set | ||
| 186 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 187 | # CONFIG_IOSCHED_CFQ is not set | ||
| 188 | # CONFIG_DEFAULT_AS is not set | ||
| 189 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 190 | # CONFIG_DEFAULT_CFQ is not set | ||
| 191 | CONFIG_DEFAULT_NOOP=y | ||
| 192 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 193 | |||
| 194 | # | ||
| 195 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 195 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 196 | # | 196 | # |
| 197 | CONFIG_ISA=y | 197 | CONFIG_ISA=y |
| @@ -258,7 +258,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 258 | # QoS and/or fair queueing | 258 | # QoS and/or fair queueing |
| 259 | # | 259 | # |
| 260 | # CONFIG_NET_SCHED is not set | 260 | # CONFIG_NET_SCHED is not set |
| 261 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 262 | 261 | ||
| 263 | # | 262 | # |
| 264 | # Network testing | 263 | # Network testing |
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 047e0b4236f8..1cc145023584 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:02:45 2005 | 4 | # Thu Nov 24 01:07:03 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | # CONFIG_KOBJECT_UEVENT is not set | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | # CONFIG_FUTEX is not set | ||
| 39 | # CONFIG_EPOLL is not set | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | # CONFIG_MODULE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | # CONFIG_MODVERSIONS is not set | ||
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -212,6 +143,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 212 | # CONFIG_PREEMPT is not set | 143 | # CONFIG_PREEMPT is not set |
| 213 | 144 | ||
| 214 | # | 145 | # |
| 146 | # Code maturity level options | ||
| 147 | # | ||
| 148 | CONFIG_EXPERIMENTAL=y | ||
| 149 | CONFIG_CLEAN_COMPILE=y | ||
| 150 | CONFIG_BROKEN_ON_SMP=y | ||
| 151 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 152 | |||
| 153 | # | ||
| 154 | # General setup | ||
| 155 | # | ||
| 156 | CONFIG_LOCALVERSION="" | ||
| 157 | CONFIG_LOCALVERSION_AUTO=y | ||
| 158 | CONFIG_SWAP=y | ||
| 159 | CONFIG_SYSVIPC=y | ||
| 160 | # CONFIG_POSIX_MQUEUE is not set | ||
| 161 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 162 | CONFIG_SYSCTL=y | ||
| 163 | # CONFIG_AUDIT is not set | ||
| 164 | CONFIG_HOTPLUG=y | ||
| 165 | # CONFIG_KOBJECT_UEVENT is not set | ||
| 166 | CONFIG_IKCONFIG=y | ||
| 167 | CONFIG_IKCONFIG_PROC=y | ||
| 168 | CONFIG_INITRAMFS_SOURCE="" | ||
| 169 | CONFIG_EMBEDDED=y | ||
| 170 | CONFIG_KALLSYMS=y | ||
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 172 | CONFIG_PRINTK=y | ||
| 173 | CONFIG_BUG=y | ||
| 174 | CONFIG_BASE_FULL=y | ||
| 175 | # CONFIG_FUTEX is not set | ||
| 176 | # CONFIG_EPOLL is not set | ||
| 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 178 | CONFIG_SHMEM=y | ||
| 179 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 180 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 181 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 182 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 183 | # CONFIG_TINY_SHMEM is not set | ||
| 184 | CONFIG_BASE_SMALL=0 | ||
| 185 | |||
| 186 | # | ||
| 187 | # Loadable module support | ||
| 188 | # | ||
| 189 | CONFIG_MODULES=y | ||
| 190 | # CONFIG_MODULE_UNLOAD is not set | ||
| 191 | CONFIG_OBSOLETE_MODPARM=y | ||
| 192 | # CONFIG_MODVERSIONS is not set | ||
| 193 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 194 | CONFIG_KMOD=y | ||
| 195 | |||
| 196 | # | ||
| 197 | # Block layer | ||
| 198 | # | ||
| 199 | # CONFIG_LBD is not set | ||
| 200 | |||
| 201 | # | ||
| 202 | # IO Schedulers | ||
| 203 | # | ||
| 204 | CONFIG_IOSCHED_NOOP=y | ||
| 205 | CONFIG_IOSCHED_AS=y | ||
| 206 | CONFIG_IOSCHED_DEADLINE=y | ||
| 207 | CONFIG_IOSCHED_CFQ=y | ||
| 208 | CONFIG_DEFAULT_AS=y | ||
| 209 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 210 | # CONFIG_DEFAULT_CFQ is not set | ||
| 211 | # CONFIG_DEFAULT_NOOP is not set | ||
| 212 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 213 | |||
| 214 | # | ||
| 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 216 | # | 216 | # |
| 217 | CONFIG_HW_HAS_PCI=y | 217 | CONFIG_HW_HAS_PCI=y |
| @@ -333,7 +333,6 @@ CONFIG_NETFILTER_NETLINK_LOG=m | |||
| 333 | # QoS and/or fair queueing | 333 | # QoS and/or fair queueing |
| 334 | # | 334 | # |
| 335 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 336 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 337 | 336 | ||
| 338 | # | 337 | # |
| 339 | # Network testing | 338 | # Network testing |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 55458062352e..30975b305ae5 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
| @@ -1,82 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 14:02:50 2005 | 4 | # Thu Nov 24 01:07:06 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | CONFIG_POSIX_MQUEUE=y | ||
| 24 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 25 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 26 | CONFIG_SYSCTL=y | ||
| 27 | # CONFIG_AUDIT is not set | ||
| 28 | CONFIG_HOTPLUG=y | ||
| 29 | CONFIG_KOBJECT_UEVENT=y | ||
| 30 | CONFIG_IKCONFIG=y | ||
| 31 | CONFIG_IKCONFIG_PROC=y | ||
| 32 | CONFIG_INITRAMFS_SOURCE="" | ||
| 33 | CONFIG_EMBEDDED=y | ||
| 34 | CONFIG_KALLSYMS=y | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | CONFIG_MODULE_UNLOAD=y | ||
| 55 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 56 | CONFIG_OBSOLETE_MODPARM=y | ||
| 57 | CONFIG_MODVERSIONS=y | ||
| 58 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 59 | CONFIG_KMOD=y | ||
| 60 | |||
| 61 | # | ||
| 62 | # Block layer | ||
| 63 | # | ||
| 64 | # CONFIG_LBD is not set | ||
| 65 | |||
| 66 | # | ||
| 67 | # IO Schedulers | ||
| 68 | # | ||
| 69 | CONFIG_IOSCHED_NOOP=y | ||
| 70 | CONFIG_IOSCHED_AS=y | ||
| 71 | CONFIG_IOSCHED_DEADLINE=y | ||
| 72 | CONFIG_IOSCHED_CFQ=y | ||
| 73 | CONFIG_DEFAULT_AS=y | ||
| 74 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 75 | # CONFIG_DEFAULT_CFQ is not set | ||
| 76 | # CONFIG_DEFAULT_NOOP is not set | ||
| 77 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 78 | |||
| 79 | # | ||
| 80 | # Machine selection | 9 | # Machine selection |
| 81 | # | 10 | # |
| 82 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -214,6 +143,77 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 214 | # CONFIG_PREEMPT is not set | 143 | # CONFIG_PREEMPT is not set |
| 215 | 144 | ||
| 216 | # | 145 | # |
| 146 | # Code maturity level options | ||
| 147 | # | ||
| 148 | CONFIG_EXPERIMENTAL=y | ||
| 149 | CONFIG_CLEAN_COMPILE=y | ||
| 150 | CONFIG_BROKEN_ON_SMP=y | ||
| 151 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 152 | |||
| 153 | # | ||
| 154 | # General setup | ||
| 155 | # | ||
| 156 | CONFIG_LOCALVERSION="" | ||
| 157 | CONFIG_LOCALVERSION_AUTO=y | ||
| 158 | CONFIG_SWAP=y | ||
| 159 | CONFIG_SYSVIPC=y | ||
| 160 | CONFIG_POSIX_MQUEUE=y | ||
| 161 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 162 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 163 | CONFIG_SYSCTL=y | ||
| 164 | # CONFIG_AUDIT is not set | ||
| 165 | CONFIG_HOTPLUG=y | ||
| 166 | CONFIG_KOBJECT_UEVENT=y | ||
| 167 | CONFIG_IKCONFIG=y | ||
| 168 | CONFIG_IKCONFIG_PROC=y | ||
| 169 | CONFIG_INITRAMFS_SOURCE="" | ||
| 170 | CONFIG_EMBEDDED=y | ||
| 171 | CONFIG_KALLSYMS=y | ||
| 172 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 173 | CONFIG_PRINTK=y | ||
| 174 | CONFIG_BUG=y | ||
| 175 | CONFIG_BASE_FULL=y | ||
| 176 | CONFIG_FUTEX=y | ||
| 177 | CONFIG_EPOLL=y | ||
| 178 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 179 | CONFIG_SHMEM=y | ||
| 180 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 181 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 182 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 183 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 184 | # CONFIG_TINY_SHMEM is not set | ||
| 185 | CONFIG_BASE_SMALL=0 | ||
| 186 | |||
| 187 | # | ||
| 188 | # Loadable module support | ||
| 189 | # | ||
| 190 | CONFIG_MODULES=y | ||
| 191 | CONFIG_MODULE_UNLOAD=y | ||
| 192 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 193 | CONFIG_OBSOLETE_MODPARM=y | ||
| 194 | CONFIG_MODVERSIONS=y | ||
| 195 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 196 | CONFIG_KMOD=y | ||
| 197 | |||
| 198 | # | ||
| 199 | # Block layer | ||
| 200 | # | ||
| 201 | # CONFIG_LBD is not set | ||
| 202 | |||
| 203 | # | ||
| 204 | # IO Schedulers | ||
| 205 | # | ||
| 206 | CONFIG_IOSCHED_NOOP=y | ||
| 207 | CONFIG_IOSCHED_AS=y | ||
| 208 | CONFIG_IOSCHED_DEADLINE=y | ||
| 209 | CONFIG_IOSCHED_CFQ=y | ||
| 210 | CONFIG_DEFAULT_AS=y | ||
| 211 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 212 | # CONFIG_DEFAULT_CFQ is not set | ||
| 213 | # CONFIG_DEFAULT_NOOP is not set | ||
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 215 | |||
| 216 | # | ||
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 218 | # |
| 219 | CONFIG_HW_HAS_EISA=y | 219 | CONFIG_HW_HAS_EISA=y |
| @@ -1199,6 +1199,7 @@ CONFIG_USB_USS720=m | |||
| 1199 | CONFIG_USB_SERIAL=m | 1199 | CONFIG_USB_SERIAL=m |
| 1200 | CONFIG_USB_SERIAL_GENERIC=y | 1200 | CONFIG_USB_SERIAL_GENERIC=y |
| 1201 | CONFIG_USB_SERIAL_AIRPRIME=m | 1201 | CONFIG_USB_SERIAL_AIRPRIME=m |
| 1202 | CONFIG_USB_SERIAL_ANYDATA=m | ||
| 1202 | CONFIG_USB_SERIAL_BELKIN=m | 1203 | CONFIG_USB_SERIAL_BELKIN=m |
| 1203 | CONFIG_USB_SERIAL_WHITEHEAT=m | 1204 | CONFIG_USB_SERIAL_WHITEHEAT=m |
| 1204 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m | 1205 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m |
| @@ -1230,7 +1231,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1230 | CONFIG_USB_SERIAL_KLSI=m | 1231 | CONFIG_USB_SERIAL_KLSI=m |
| 1231 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 1232 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
| 1232 | CONFIG_USB_SERIAL_MCT_U232=m | 1233 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1233 | # CONFIG_USB_SERIAL_NOKIA_DKU2 is not set | ||
| 1234 | CONFIG_USB_SERIAL_PL2303=m | 1234 | CONFIG_USB_SERIAL_PL2303=m |
| 1235 | CONFIG_USB_SERIAL_HP4X=m | 1235 | CONFIG_USB_SERIAL_HP4X=m |
| 1236 | CONFIG_USB_SERIAL_SAFE=m | 1236 | CONFIG_USB_SERIAL_SAFE=m |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index dc453a1e4806..63f1be18e9bf 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:43 2005 | 4 | # Thu Nov 24 01:07:09 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_CPUSETS=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | CONFIG_STOP_MACHINE=y | ||
| 60 | |||
| 61 | # | ||
| 62 | # Block layer | ||
| 63 | # | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -226,6 +156,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 226 | CONFIG_PREEMPT_BKL=y | 156 | CONFIG_PREEMPT_BKL=y |
| 227 | 157 | ||
| 228 | # | 158 | # |
| 159 | # Code maturity level options | ||
| 160 | # | ||
| 161 | CONFIG_EXPERIMENTAL=y | ||
| 162 | CONFIG_CLEAN_COMPILE=y | ||
| 163 | CONFIG_LOCK_KERNEL=y | ||
| 164 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 165 | |||
| 166 | # | ||
| 167 | # General setup | ||
| 168 | # | ||
| 169 | CONFIG_LOCALVERSION="" | ||
| 170 | CONFIG_LOCALVERSION_AUTO=y | ||
| 171 | CONFIG_SWAP=y | ||
| 172 | CONFIG_SYSVIPC=y | ||
| 173 | # CONFIG_POSIX_MQUEUE is not set | ||
| 174 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 175 | CONFIG_SYSCTL=y | ||
| 176 | # CONFIG_AUDIT is not set | ||
| 177 | CONFIG_HOTPLUG=y | ||
| 178 | CONFIG_KOBJECT_UEVENT=y | ||
| 179 | # CONFIG_IKCONFIG is not set | ||
| 180 | CONFIG_CPUSETS=y | ||
| 181 | CONFIG_INITRAMFS_SOURCE="" | ||
| 182 | CONFIG_EMBEDDED=y | ||
| 183 | CONFIG_KALLSYMS=y | ||
| 184 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 185 | CONFIG_PRINTK=y | ||
| 186 | CONFIG_BUG=y | ||
| 187 | CONFIG_BASE_FULL=y | ||
| 188 | CONFIG_FUTEX=y | ||
| 189 | CONFIG_EPOLL=y | ||
| 190 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 191 | CONFIG_SHMEM=y | ||
| 192 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 193 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 194 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 195 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 196 | # CONFIG_TINY_SHMEM is not set | ||
| 197 | CONFIG_BASE_SMALL=0 | ||
| 198 | |||
| 199 | # | ||
| 200 | # Loadable module support | ||
| 201 | # | ||
| 202 | CONFIG_MODULES=y | ||
| 203 | CONFIG_MODULE_UNLOAD=y | ||
| 204 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 205 | CONFIG_OBSOLETE_MODPARM=y | ||
| 206 | CONFIG_MODVERSIONS=y | ||
| 207 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 208 | CONFIG_KMOD=y | ||
| 209 | CONFIG_STOP_MACHINE=y | ||
| 210 | |||
| 211 | # | ||
| 212 | # Block layer | ||
| 213 | # | ||
| 214 | |||
| 215 | # | ||
| 216 | # IO Schedulers | ||
| 217 | # | ||
| 218 | CONFIG_IOSCHED_NOOP=y | ||
| 219 | CONFIG_IOSCHED_AS=y | ||
| 220 | CONFIG_IOSCHED_DEADLINE=y | ||
| 221 | CONFIG_IOSCHED_CFQ=y | ||
| 222 | CONFIG_DEFAULT_AS=y | ||
| 223 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 224 | # CONFIG_DEFAULT_CFQ is not set | ||
| 225 | # CONFIG_DEFAULT_NOOP is not set | ||
| 226 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 227 | |||
| 228 | # | ||
| 229 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 229 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 230 | # | 230 | # |
| 231 | CONFIG_HW_HAS_PCI=y | 231 | CONFIG_HW_HAS_PCI=y |
| @@ -318,7 +318,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 318 | # QoS and/or fair queueing | 318 | # QoS and/or fair queueing |
| 319 | # | 319 | # |
| 320 | # CONFIG_NET_SCHED is not set | 320 | # CONFIG_NET_SCHED is not set |
| 321 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 322 | 321 | ||
| 323 | # | 322 | # |
| 324 | # Network testing | 323 | # Network testing |
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index aa27d583162d..41dd70824976 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig | |||
| @@ -1,71 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:45 2005 | 4 | # Thu Nov 24 01:07:10 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | # CONFIG_SWAP is not set | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | CONFIG_SYSCTL=y | ||
| 25 | # CONFIG_HOTPLUG is not set | ||
| 26 | # CONFIG_IKCONFIG is not set | ||
| 27 | CONFIG_INITRAMFS_SOURCE="" | ||
| 28 | CONFIG_EMBEDDED=y | ||
| 29 | CONFIG_KALLSYMS=y | ||
| 30 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 31 | CONFIG_PRINTK=y | ||
| 32 | CONFIG_BUG=y | ||
| 33 | CONFIG_BASE_FULL=y | ||
| 34 | CONFIG_FUTEX=y | ||
| 35 | CONFIG_EPOLL=y | ||
| 36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 37 | CONFIG_SHMEM=y | ||
| 38 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 39 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 40 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 41 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 42 | # CONFIG_TINY_SHMEM is not set | ||
| 43 | CONFIG_BASE_SMALL=0 | ||
| 44 | |||
| 45 | # | ||
| 46 | # Loadable module support | ||
| 47 | # | ||
| 48 | # CONFIG_MODULES is not set | ||
| 49 | |||
| 50 | # | ||
| 51 | # Block layer | ||
| 52 | # | ||
| 53 | # CONFIG_LBD is not set | ||
| 54 | |||
| 55 | # | ||
| 56 | # IO Schedulers | ||
| 57 | # | ||
| 58 | CONFIG_IOSCHED_NOOP=y | ||
| 59 | CONFIG_IOSCHED_AS=y | ||
| 60 | CONFIG_IOSCHED_DEADLINE=y | ||
| 61 | CONFIG_IOSCHED_CFQ=y | ||
| 62 | CONFIG_DEFAULT_AS=y | ||
| 63 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 64 | # CONFIG_DEFAULT_CFQ is not set | ||
| 65 | # CONFIG_DEFAULT_NOOP is not set | ||
| 66 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 67 | |||
| 68 | # | ||
| 69 | # Machine selection | 9 | # Machine selection |
| 70 | # | 10 | # |
| 71 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -197,6 +137,66 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
| 198 | 138 | ||
| 199 | # | 139 | # |
| 140 | # Code maturity level options | ||
| 141 | # | ||
| 142 | CONFIG_EXPERIMENTAL=y | ||
| 143 | CONFIG_CLEAN_COMPILE=y | ||
| 144 | CONFIG_BROKEN_ON_SMP=y | ||
| 145 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 146 | |||
| 147 | # | ||
| 148 | # General setup | ||
| 149 | # | ||
| 150 | CONFIG_LOCALVERSION="" | ||
| 151 | CONFIG_LOCALVERSION_AUTO=y | ||
| 152 | # CONFIG_SWAP is not set | ||
| 153 | CONFIG_SYSVIPC=y | ||
| 154 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 155 | CONFIG_SYSCTL=y | ||
| 156 | # CONFIG_HOTPLUG is not set | ||
| 157 | # CONFIG_IKCONFIG is not set | ||
| 158 | CONFIG_INITRAMFS_SOURCE="" | ||
| 159 | CONFIG_EMBEDDED=y | ||
| 160 | CONFIG_KALLSYMS=y | ||
| 161 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 162 | CONFIG_PRINTK=y | ||
| 163 | CONFIG_BUG=y | ||
| 164 | CONFIG_BASE_FULL=y | ||
| 165 | CONFIG_FUTEX=y | ||
| 166 | CONFIG_EPOLL=y | ||
| 167 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 168 | CONFIG_SHMEM=y | ||
| 169 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 170 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 171 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 172 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 173 | # CONFIG_TINY_SHMEM is not set | ||
| 174 | CONFIG_BASE_SMALL=0 | ||
| 175 | |||
| 176 | # | ||
| 177 | # Loadable module support | ||
| 178 | # | ||
| 179 | # CONFIG_MODULES is not set | ||
| 180 | |||
| 181 | # | ||
| 182 | # Block layer | ||
| 183 | # | ||
| 184 | # CONFIG_LBD is not set | ||
| 185 | |||
| 186 | # | ||
| 187 | # IO Schedulers | ||
| 188 | # | ||
| 189 | CONFIG_IOSCHED_NOOP=y | ||
| 190 | CONFIG_IOSCHED_AS=y | ||
| 191 | CONFIG_IOSCHED_DEADLINE=y | ||
| 192 | CONFIG_IOSCHED_CFQ=y | ||
| 193 | CONFIG_DEFAULT_AS=y | ||
| 194 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 195 | # CONFIG_DEFAULT_CFQ is not set | ||
| 196 | # CONFIG_DEFAULT_NOOP is not set | ||
| 197 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 198 | |||
| 199 | # | ||
| 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 200 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 201 | # | 201 | # |
| 202 | CONFIG_MMU=y | 202 | CONFIG_MMU=y |
| @@ -363,6 +363,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 363 | # | 363 | # |
| 364 | # TPM devices | 364 | # TPM devices |
| 365 | # | 365 | # |
| 366 | # CONFIG_TCG_TPM is not set | ||
| 366 | # CONFIG_TELCLOCK is not set | 367 | # CONFIG_TELCLOCK is not set |
| 367 | 368 | ||
| 368 | # | 369 | # |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index ddc7e45996f2..83969466ecf6 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:49 2005 | 4 | # Thu Nov 24 01:07:12 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -207,6 +138,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 207 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
| 208 | 139 | ||
| 209 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | CONFIG_EXPERIMENTAL=y | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_POSIX_MQUEUE is not set | ||
| 156 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 157 | CONFIG_SYSCTL=y | ||
| 158 | # CONFIG_AUDIT is not set | ||
| 159 | # CONFIG_HOTPLUG is not set | ||
| 160 | CONFIG_KOBJECT_UEVENT=y | ||
| 161 | # CONFIG_IKCONFIG is not set | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | ||
| 163 | CONFIG_EMBEDDED=y | ||
| 164 | CONFIG_KALLSYMS=y | ||
| 165 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 166 | CONFIG_PRINTK=y | ||
| 167 | CONFIG_BUG=y | ||
| 168 | CONFIG_BASE_FULL=y | ||
| 169 | CONFIG_FUTEX=y | ||
| 170 | CONFIG_EPOLL=y | ||
| 171 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 172 | CONFIG_SHMEM=y | ||
| 173 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 174 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 175 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 176 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 177 | # CONFIG_TINY_SHMEM is not set | ||
| 178 | CONFIG_BASE_SMALL=0 | ||
| 179 | |||
| 180 | # | ||
| 181 | # Loadable module support | ||
| 182 | # | ||
| 183 | CONFIG_MODULES=y | ||
| 184 | CONFIG_MODULE_UNLOAD=y | ||
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | ||
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 189 | CONFIG_KMOD=y | ||
| 190 | |||
| 191 | # | ||
| 192 | # Block layer | ||
| 193 | # | ||
| 194 | # CONFIG_LBD is not set | ||
| 195 | |||
| 196 | # | ||
| 197 | # IO Schedulers | ||
| 198 | # | ||
| 199 | CONFIG_IOSCHED_NOOP=y | ||
| 200 | CONFIG_IOSCHED_AS=y | ||
| 201 | CONFIG_IOSCHED_DEADLINE=y | ||
| 202 | CONFIG_IOSCHED_CFQ=y | ||
| 203 | CONFIG_DEFAULT_AS=y | ||
| 204 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 205 | # CONFIG_DEFAULT_CFQ is not set | ||
| 206 | # CONFIG_DEFAULT_NOOP is not set | ||
| 207 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 208 | |||
| 209 | # | ||
| 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 211 | # | 211 | # |
| 212 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| @@ -301,7 +301,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 301 | # QoS and/or fair queueing | 301 | # QoS and/or fair queueing |
| 302 | # | 302 | # |
| 303 | # CONFIG_NET_SCHED is not set | 303 | # CONFIG_NET_SCHED is not set |
| 304 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 305 | 304 | ||
| 306 | # | 305 | # |
| 307 | # Network testing | 306 | # Network testing |
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index e8c82f011e98..ce7b9ed44432 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Wed Nov 9 11:11:47 2005 | 4 | # Thu Nov 24 01:07:15 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -207,6 +138,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 207 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
| 208 | 139 | ||
| 209 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | CONFIG_EXPERIMENTAL=y | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_BROKEN_ON_SMP=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_POSIX_MQUEUE is not set | ||
| 156 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 157 | CONFIG_SYSCTL=y | ||
| 158 | # CONFIG_AUDIT is not set | ||
| 159 | CONFIG_HOTPLUG=y | ||
| 160 | CONFIG_KOBJECT_UEVENT=y | ||
| 161 | # CONFIG_IKCONFIG is not set | ||
| 162 | CONFIG_INITRAMFS_SOURCE="" | ||
| 163 | CONFIG_EMBEDDED=y | ||
| 164 | CONFIG_KALLSYMS=y | ||
| 165 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 166 | CONFIG_PRINTK=y | ||
| 167 | CONFIG_BUG=y | ||
| 168 | CONFIG_BASE_FULL=y | ||
| 169 | CONFIG_FUTEX=y | ||
| 170 | CONFIG_EPOLL=y | ||
| 171 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 172 | CONFIG_SHMEM=y | ||
| 173 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 174 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 175 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 176 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 177 | # CONFIG_TINY_SHMEM is not set | ||
| 178 | CONFIG_BASE_SMALL=0 | ||
| 179 | |||
| 180 | # | ||
| 181 | # Loadable module support | ||
| 182 | # | ||
| 183 | CONFIG_MODULES=y | ||
| 184 | CONFIG_MODULE_UNLOAD=y | ||
| 185 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 186 | CONFIG_OBSOLETE_MODPARM=y | ||
| 187 | CONFIG_MODVERSIONS=y | ||
| 188 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 189 | CONFIG_KMOD=y | ||
| 190 | |||
| 191 | # | ||
| 192 | # Block layer | ||
| 193 | # | ||
| 194 | # CONFIG_LBD is not set | ||
| 195 | |||
| 196 | # | ||
| 197 | # IO Schedulers | ||
| 198 | # | ||
| 199 | CONFIG_IOSCHED_NOOP=y | ||
| 200 | CONFIG_IOSCHED_AS=y | ||
| 201 | CONFIG_IOSCHED_DEADLINE=y | ||
| 202 | CONFIG_IOSCHED_CFQ=y | ||
| 203 | CONFIG_DEFAULT_AS=y | ||
| 204 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 205 | # CONFIG_DEFAULT_CFQ is not set | ||
| 206 | # CONFIG_DEFAULT_NOOP is not set | ||
| 207 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 208 | |||
| 209 | # | ||
| 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 210 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 211 | # | 211 | # |
| 212 | CONFIG_HW_HAS_PCI=y | 212 | CONFIG_HW_HAS_PCI=y |
| @@ -302,7 +302,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 302 | # QoS and/or fair queueing | 302 | # QoS and/or fair queueing |
| 303 | # | 303 | # |
| 304 | # CONFIG_NET_SCHED is not set | 304 | # CONFIG_NET_SCHED is not set |
| 305 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 306 | 305 | ||
| 307 | # | 306 | # |
| 308 | # Network testing | 307 | # Network testing |
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index 125b2997abfe..02b2551023d4 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
| @@ -1,80 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Tue Nov 15 11:17:02 2005 | 4 | # Thu Nov 24 01:07:17 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | CONFIG_HOTPLUG=y | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | # CONFIG_IKCONFIG is not set | ||
| 30 | CONFIG_INITRAMFS_SOURCE="" | ||
| 31 | CONFIG_EMBEDDED=y | ||
| 32 | CONFIG_KALLSYMS=y | ||
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_PRINTK=y | ||
| 35 | CONFIG_BUG=y | ||
| 36 | CONFIG_BASE_FULL=y | ||
| 37 | CONFIG_FUTEX=y | ||
| 38 | CONFIG_EPOLL=y | ||
| 39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 40 | CONFIG_SHMEM=y | ||
| 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 45 | # CONFIG_TINY_SHMEM is not set | ||
| 46 | CONFIG_BASE_SMALL=0 | ||
| 47 | |||
| 48 | # | ||
| 49 | # Loadable module support | ||
| 50 | # | ||
| 51 | CONFIG_MODULES=y | ||
| 52 | CONFIG_MODULE_UNLOAD=y | ||
| 53 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | CONFIG_MODVERSIONS=y | ||
| 56 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | |||
| 59 | # | ||
| 60 | # Block layer | ||
| 61 | # | ||
| 62 | # CONFIG_LBD is not set | ||
| 63 | |||
| 64 | # | ||
| 65 | # IO Schedulers | ||
| 66 | # | ||
| 67 | CONFIG_IOSCHED_NOOP=y | ||
| 68 | CONFIG_IOSCHED_AS=y | ||
| 69 | CONFIG_IOSCHED_DEADLINE=y | ||
| 70 | CONFIG_IOSCHED_CFQ=y | ||
| 71 | CONFIG_DEFAULT_AS=y | ||
| 72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 73 | # CONFIG_DEFAULT_CFQ is not set | ||
| 74 | # CONFIG_DEFAULT_NOOP is not set | ||
| 75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 76 | |||
| 77 | # | ||
| 78 | # Machine selection | 9 | # Machine selection |
| 79 | # | 10 | # |
| 80 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -204,6 +135,75 @@ CONFIG_PREEMPT_NONE=y | |||
| 204 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
| 205 | 136 | ||
| 206 | # | 137 | # |
| 138 | # Code maturity level options | ||
| 139 | # | ||
| 140 | CONFIG_EXPERIMENTAL=y | ||
| 141 | CONFIG_CLEAN_COMPILE=y | ||
| 142 | CONFIG_BROKEN_ON_SMP=y | ||
| 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 144 | |||
| 145 | # | ||
| 146 | # General setup | ||
| 147 | # | ||
| 148 | CONFIG_LOCALVERSION="" | ||
| 149 | CONFIG_LOCALVERSION_AUTO=y | ||
| 150 | CONFIG_SWAP=y | ||
| 151 | CONFIG_SYSVIPC=y | ||
| 152 | # CONFIG_POSIX_MQUEUE is not set | ||
| 153 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 154 | CONFIG_SYSCTL=y | ||
| 155 | # CONFIG_AUDIT is not set | ||
| 156 | CONFIG_HOTPLUG=y | ||
| 157 | CONFIG_KOBJECT_UEVENT=y | ||
| 158 | # CONFIG_IKCONFIG is not set | ||
| 159 | CONFIG_INITRAMFS_SOURCE="" | ||
| 160 | CONFIG_EMBEDDED=y | ||
| 161 | CONFIG_KALLSYMS=y | ||
| 162 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 163 | CONFIG_PRINTK=y | ||
| 164 | CONFIG_BUG=y | ||
| 165 | CONFIG_BASE_FULL=y | ||
| 166 | CONFIG_FUTEX=y | ||
| 167 | CONFIG_EPOLL=y | ||
| 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 169 | CONFIG_SHMEM=y | ||
| 170 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 171 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 172 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 173 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 174 | # CONFIG_TINY_SHMEM is not set | ||
| 175 | CONFIG_BASE_SMALL=0 | ||
| 176 | |||
| 177 | # | ||
| 178 | # Loadable module support | ||
| 179 | # | ||
| 180 | CONFIG_MODULES=y | ||
| 181 | CONFIG_MODULE_UNLOAD=y | ||
| 182 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 183 | CONFIG_OBSOLETE_MODPARM=y | ||
| 184 | CONFIG_MODVERSIONS=y | ||
| 185 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 186 | CONFIG_KMOD=y | ||
| 187 | |||
| 188 | # | ||
| 189 | # Block layer | ||
| 190 | # | ||
| 191 | # CONFIG_LBD is not set | ||
| 192 | |||
| 193 | # | ||
| 194 | # IO Schedulers | ||
| 195 | # | ||
| 196 | CONFIG_IOSCHED_NOOP=y | ||
| 197 | CONFIG_IOSCHED_AS=y | ||
| 198 | CONFIG_IOSCHED_DEADLINE=y | ||
| 199 | CONFIG_IOSCHED_CFQ=y | ||
| 200 | CONFIG_DEFAULT_AS=y | ||
| 201 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 202 | # CONFIG_DEFAULT_CFQ is not set | ||
| 203 | # CONFIG_DEFAULT_NOOP is not set | ||
| 204 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 205 | |||
| 206 | # | ||
| 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 207 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 208 | # | 208 | # |
| 209 | CONFIG_ISA=y | 209 | CONFIG_ISA=y |
| @@ -297,7 +297,6 @@ CONFIG_TCP_CONG_BIC=y | |||
| 297 | # QoS and/or fair queueing | 297 | # QoS and/or fair queueing |
| 298 | # | 298 | # |
| 299 | # CONFIG_NET_SCHED is not set | 299 | # CONFIG_NET_SCHED is not set |
| 300 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 301 | 300 | ||
| 302 | # | 301 | # |
| 303 | # Network testing | 302 | # Network testing |
| @@ -609,6 +608,7 @@ CONFIG_WATCHDOG=y | |||
| 609 | # | 608 | # |
| 610 | # TPM devices | 609 | # TPM devices |
| 611 | # | 610 | # |
| 611 | # CONFIG_TCG_TPM is not set | ||
| 612 | # CONFIG_TELCLOCK is not set | 612 | # CONFIG_TELCLOCK is not set |
| 613 | 613 | ||
| 614 | # | 614 | # |
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index d90790b2ab30..d51d5d16297c 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Mon Nov 7 23:06:59 2005 | 4 | # Thu Nov 24 01:07:19 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | # CONFIG_EXPERIMENTAL is not set | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_LOCK_KERNEL=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 24 | CONFIG_SYSCTL=y | ||
| 25 | # CONFIG_AUDIT is not set | ||
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | ||
| 29 | CONFIG_IKCONFIG_PROC=y | ||
| 30 | # CONFIG_CPUSETS is not set | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_ALL is not set | ||
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 36 | CONFIG_PRINTK=y | ||
| 37 | CONFIG_BUG=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 39 | CONFIG_FUTEX=y | ||
| 40 | CONFIG_EPOLL=y | ||
| 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 42 | CONFIG_SHMEM=y | ||
| 43 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 44 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 45 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 46 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | |||
| 50 | # | ||
| 51 | # Loadable module support | ||
| 52 | # | ||
| 53 | CONFIG_MODULES=y | ||
| 54 | CONFIG_MODULE_UNLOAD=y | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 57 | CONFIG_KMOD=y | ||
| 58 | CONFIG_STOP_MACHINE=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -208,6 +138,76 @@ CONFIG_PREEMPT_NONE=y | |||
| 208 | CONFIG_PREEMPT_BKL=y | 138 | CONFIG_PREEMPT_BKL=y |
| 209 | 139 | ||
| 210 | # | 140 | # |
| 141 | # Code maturity level options | ||
| 142 | # | ||
| 143 | # CONFIG_EXPERIMENTAL is not set | ||
| 144 | CONFIG_CLEAN_COMPILE=y | ||
| 145 | CONFIG_LOCK_KERNEL=y | ||
| 146 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 147 | |||
| 148 | # | ||
| 149 | # General setup | ||
| 150 | # | ||
| 151 | CONFIG_LOCALVERSION="" | ||
| 152 | CONFIG_LOCALVERSION_AUTO=y | ||
| 153 | CONFIG_SWAP=y | ||
| 154 | CONFIG_SYSVIPC=y | ||
| 155 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 156 | CONFIG_SYSCTL=y | ||
| 157 | # CONFIG_AUDIT is not set | ||
| 158 | CONFIG_HOTPLUG=y | ||
| 159 | CONFIG_KOBJECT_UEVENT=y | ||
| 160 | CONFIG_IKCONFIG=y | ||
| 161 | CONFIG_IKCONFIG_PROC=y | ||
| 162 | # CONFIG_CPUSETS is not set | ||
| 163 | CONFIG_INITRAMFS_SOURCE="" | ||
| 164 | CONFIG_EMBEDDED=y | ||
| 165 | CONFIG_KALLSYMS=y | ||
| 166 | # CONFIG_KALLSYMS_ALL is not set | ||
| 167 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 168 | CONFIG_PRINTK=y | ||
| 169 | CONFIG_BUG=y | ||
| 170 | CONFIG_BASE_FULL=y | ||
| 171 | CONFIG_FUTEX=y | ||
| 172 | CONFIG_EPOLL=y | ||
| 173 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 174 | CONFIG_SHMEM=y | ||
| 175 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 176 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 177 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 178 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 179 | # CONFIG_TINY_SHMEM is not set | ||
| 180 | CONFIG_BASE_SMALL=0 | ||
| 181 | |||
| 182 | # | ||
| 183 | # Loadable module support | ||
| 184 | # | ||
| 185 | CONFIG_MODULES=y | ||
| 186 | CONFIG_MODULE_UNLOAD=y | ||
| 187 | CONFIG_OBSOLETE_MODPARM=y | ||
| 188 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 189 | CONFIG_KMOD=y | ||
| 190 | CONFIG_STOP_MACHINE=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Block layer | ||
| 194 | # | ||
| 195 | # CONFIG_LBD is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # IO Schedulers | ||
| 199 | # | ||
| 200 | CONFIG_IOSCHED_NOOP=y | ||
| 201 | CONFIG_IOSCHED_AS=y | ||
| 202 | CONFIG_IOSCHED_DEADLINE=y | ||
| 203 | CONFIG_IOSCHED_CFQ=y | ||
| 204 | CONFIG_DEFAULT_AS=y | ||
| 205 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 206 | # CONFIG_DEFAULT_CFQ is not set | ||
| 207 | # CONFIG_DEFAULT_NOOP is not set | ||
| 208 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 209 | |||
| 210 | # | ||
| 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 211 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 212 | # | 212 | # |
| 213 | CONFIG_HW_HAS_PCI=y | 213 | CONFIG_HW_HAS_PCI=y |
| @@ -284,7 +284,6 @@ CONFIG_IPV6_TUNNEL=m | |||
| 284 | # QoS and/or fair queueing | 284 | # QoS and/or fair queueing |
| 285 | # | 285 | # |
| 286 | # CONFIG_NET_SCHED is not set | 286 | # CONFIG_NET_SCHED is not set |
| 287 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 288 | 287 | ||
| 289 | # | 288 | # |
| 290 | # Network testing | 289 | # Network testing |
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index e9086da02e48..2a1b844da43f 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
| @@ -1,81 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14 | 3 | # Linux kernel version: 2.6.15-rc2 |
| 4 | # Thu Nov 10 12:13:58 2005 | 4 | # Thu Nov 24 01:05:49 2005 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Code maturity level options | ||
| 10 | # | ||
| 11 | CONFIG_EXPERIMENTAL=y | ||
| 12 | CONFIG_CLEAN_COMPILE=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 15 | |||
| 16 | # | ||
| 17 | # General setup | ||
| 18 | # | ||
| 19 | CONFIG_LOCALVERSION="" | ||
| 20 | CONFIG_LOCALVERSION_AUTO=y | ||
| 21 | CONFIG_SWAP=y | ||
| 22 | CONFIG_SYSVIPC=y | ||
| 23 | # CONFIG_POSIX_MQUEUE is not set | ||
| 24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 25 | CONFIG_SYSCTL=y | ||
| 26 | # CONFIG_AUDIT is not set | ||
| 27 | # CONFIG_HOTPLUG is not set | ||
| 28 | CONFIG_KOBJECT_UEVENT=y | ||
| 29 | CONFIG_IKCONFIG=y | ||
| 30 | CONFIG_IKCONFIG_PROC=y | ||
| 31 | CONFIG_INITRAMFS_SOURCE="" | ||
| 32 | CONFIG_EMBEDDED=y | ||
| 33 | CONFIG_KALLSYMS=y | ||
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_BASE_FULL=y | ||
| 38 | CONFIG_FUTEX=y | ||
| 39 | CONFIG_EPOLL=y | ||
| 40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 41 | CONFIG_SHMEM=y | ||
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | ||
| 47 | CONFIG_BASE_SMALL=0 | ||
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | ||
| 53 | CONFIG_MODULE_UNLOAD=y | ||
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | CONFIG_MODVERSIONS=y | ||
| 57 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 58 | CONFIG_KMOD=y | ||
| 59 | |||
| 60 | # | ||
| 61 | # Block layer | ||
| 62 | # | ||
| 63 | # CONFIG_LBD is not set | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 79 | # Machine selection | 9 | # Machine selection |
| 80 | # | 10 | # |
| 81 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MIPS_MTX1 is not set |
| @@ -211,6 +141,76 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
| 211 | # CONFIG_PREEMPT is not set | 141 | # CONFIG_PREEMPT is not set |
| 212 | 142 | ||
| 213 | # | 143 | # |
| 144 | # Code maturity level options | ||
| 145 | # | ||
| 146 | CONFIG_EXPERIMENTAL=y | ||
| 147 | CONFIG_CLEAN_COMPILE=y | ||
| 148 | CONFIG_BROKEN_ON_SMP=y | ||
| 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 150 | |||
| 151 | # | ||
| 152 | # General setup | ||
| 153 | # | ||
| 154 | CONFIG_LOCALVERSION="" | ||
| 155 | CONFIG_LOCALVERSION_AUTO=y | ||
| 156 | CONFIG_SWAP=y | ||
| 157 | CONFIG_SYSVIPC=y | ||
| 158 | # CONFIG_POSIX_MQUEUE is not set | ||
| 159 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 160 | CONFIG_SYSCTL=y | ||
| 161 | # CONFIG_AUDIT is not set | ||
| 162 | # CONFIG_HOTPLUG is not set | ||
| 163 | CONFIG_KOBJECT_UEVENT=y | ||
| 164 | CONFIG_IKCONFIG=y | ||
| 165 | CONFIG_IKCONFIG_PROC=y | ||
| 166 | CONFIG_INITRAMFS_SOURCE="" | ||
| 167 | CONFIG_EMBEDDED=y | ||
| 168 | CONFIG_KALLSYMS=y | ||
| 169 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 170 | CONFIG_PRINTK=y | ||
| 171 | CONFIG_BUG=y | ||
| 172 | CONFIG_BASE_FULL=y | ||
| 173 | CONFIG_FUTEX=y | ||
| 174 | CONFIG_EPOLL=y | ||
| 175 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 176 | CONFIG_SHMEM=y | ||
| 177 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 178 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 179 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 180 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 181 | # CONFIG_TINY_SHMEM is not set | ||
| 182 | CONFIG_BASE_SMALL=0 | ||
| 183 | |||
| 184 | # | ||
| 185 | # Loadable module support | ||
| 186 | # | ||
| 187 | CONFIG_MODULES=y | ||
| 188 | CONFIG_MODULE_UNLOAD=y | ||
| 189 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 190 | CONFIG_OBSOLETE_MODPARM=y | ||
| 191 | CONFIG_MODVERSIONS=y | ||
| 192 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
| 193 | CONFIG_KMOD=y | ||
| 194 | |||
| 195 | # | ||
| 196 | # Block layer | ||
| 197 | # | ||
| 198 | # CONFIG_LBD is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # IO Schedulers | ||
| 202 | # | ||
| 203 | CONFIG_IOSCHED_NOOP=y | ||
| 204 | CONFIG_IOSCHED_AS=y | ||
| 205 | CONFIG_IOSCHED_DEADLINE=y | ||
| 206 | CONFIG_IOSCHED_CFQ=y | ||
| 207 | CONFIG_DEFAULT_AS=y | ||
| 208 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 209 | # CONFIG_DEFAULT_CFQ is not set | ||
| 210 | # CONFIG_DEFAULT_NOOP is not set | ||
| 211 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 212 | |||
| 213 | # | ||
| 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 214 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 215 | # | 215 | # |
| 216 | CONFIG_HW_HAS_EISA=y | 216 | CONFIG_HW_HAS_EISA=y |
| @@ -779,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 779 | # | 779 | # |
| 780 | # TPM devices | 780 | # TPM devices |
| 781 | # | 781 | # |
| 782 | # CONFIG_TCG_TPM is not set | ||
| 782 | # CONFIG_TELCLOCK is not set | 783 | # CONFIG_TELCLOCK is not set |
| 783 | 784 | ||
| 784 | # | 785 | # |
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c index 7cbe14483f13..2810727f1d4e 100644 --- a/arch/mips/jmr3927/rbhma3100/irq.c +++ b/arch/mips/jmr3927/rbhma3100/irq.c | |||
| @@ -113,7 +113,8 @@ static void jmr3927_irq_ack(unsigned int irq) | |||
| 113 | 113 | ||
| 114 | static void jmr3927_irq_end(unsigned int irq) | 114 | static void jmr3927_irq_end(unsigned int irq) |
| 115 | { | 115 | { |
| 116 | jmr3927_irq_enable(irq); | 116 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) |
| 117 | jmr3927_irq_enable(irq); | ||
| 117 | } | 118 | } |
| 118 | 119 | ||
| 119 | static void jmr3927_irq_disable(unsigned int irq_nr) | 120 | static void jmr3927_irq_disable(unsigned int irq_nr) |
| @@ -121,7 +122,7 @@ static void jmr3927_irq_disable(unsigned int irq_nr) | |||
| 121 | struct tb_irq_space* sp; | 122 | struct tb_irq_space* sp; |
| 122 | unsigned long flags; | 123 | unsigned long flags; |
| 123 | 124 | ||
| 124 | spinlock_irqsave(&jmr3927_irq_lock, flags); | 125 | spin_lock_irqsave(&jmr3927_irq_lock, flags); |
| 125 | for (sp = tb_irq_spaces; sp; sp = sp->next) { | 126 | for (sp = tb_irq_spaces; sp; sp = sp->next) { |
| 126 | if (sp->start_irqno <= irq_nr && | 127 | if (sp->start_irqno <= irq_nr && |
| 127 | irq_nr < sp->start_irqno + sp->nr_irqs) { | 128 | irq_nr < sp->start_irqno + sp->nr_irqs) { |
| @@ -131,7 +132,7 @@ static void jmr3927_irq_disable(unsigned int irq_nr) | |||
| 131 | break; | 132 | break; |
| 132 | } | 133 | } |
| 133 | } | 134 | } |
| 134 | spinlock_irqrestore(&jmr3927_irq_lock, flags); | 135 | spin_unlock_irqrestore(&jmr3927_irq_lock, flags); |
| 135 | } | 136 | } |
| 136 | 137 | ||
| 137 | static void jmr3927_irq_enable(unsigned int irq_nr) | 138 | static void jmr3927_irq_enable(unsigned int irq_nr) |
| @@ -139,7 +140,7 @@ static void jmr3927_irq_enable(unsigned int irq_nr) | |||
| 139 | struct tb_irq_space* sp; | 140 | struct tb_irq_space* sp; |
| 140 | unsigned long flags; | 141 | unsigned long flags; |
| 141 | 142 | ||
| 142 | spinlock_irqsave(&jmr3927_irq_lock, flags); | 143 | spin_lock_irqsave(&jmr3927_irq_lock, flags); |
| 143 | for (sp = tb_irq_spaces; sp; sp = sp->next) { | 144 | for (sp = tb_irq_spaces; sp; sp = sp->next) { |
| 144 | if (sp->start_irqno <= irq_nr && | 145 | if (sp->start_irqno <= irq_nr && |
| 145 | irq_nr < sp->start_irqno + sp->nr_irqs) { | 146 | irq_nr < sp->start_irqno + sp->nr_irqs) { |
| @@ -149,7 +150,7 @@ static void jmr3927_irq_enable(unsigned int irq_nr) | |||
| 149 | break; | 150 | break; |
| 150 | } | 151 | } |
| 151 | } | 152 | } |
| 152 | spinlock_irqrestore(&jmr3927_irq_lock, flags); | 153 | spin_unlock_irqrestore(&jmr3927_irq_lock, flags); |
| 153 | } | 154 | } |
| 154 | 155 | ||
| 155 | /* | 156 | /* |
| @@ -205,7 +206,10 @@ static void mask_irq_irc(int irq_nr, int space_id) | |||
| 205 | /* update IRCSR */ | 206 | /* update IRCSR */ |
| 206 | tx3927_ircptr->imr = 0; | 207 | tx3927_ircptr->imr = 0; |
| 207 | tx3927_ircptr->imr = irc_elevel; | 208 | tx3927_ircptr->imr = irc_elevel; |
| 209 | /* flush write buffer */ | ||
| 210 | (void)tx3927_ircptr->ssr; | ||
| 208 | } | 211 | } |
| 212 | |||
| 209 | static void unmask_irq_irc(int irq_nr, int space_id) | 213 | static void unmask_irq_irc(int irq_nr, int space_id) |
| 210 | { | 214 | { |
| 211 | volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; | 215 | volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; |
| @@ -276,7 +280,7 @@ void jmr3927_irc_irqdispatch(struct pt_regs *regs) | |||
| 276 | do_IRQ(irq + JMR3927_IRQ_IRC, regs); | 280 | do_IRQ(irq + JMR3927_IRQ_IRC, regs); |
| 277 | } | 281 | } |
| 278 | 282 | ||
| 279 | static void jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 283 | static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
| 280 | { | 284 | { |
| 281 | unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR); | 285 | unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR); |
| 282 | int i; | 286 | int i; |
| @@ -287,13 +291,14 @@ static void jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 287 | do_IRQ(irq, regs); | 291 | do_IRQ(irq, regs); |
| 288 | } | 292 | } |
| 289 | } | 293 | } |
| 294 | return IRQ_HANDLED; | ||
| 290 | } | 295 | } |
| 291 | 296 | ||
| 292 | static struct irqaction ioc_action = { | 297 | static struct irqaction ioc_action = { |
| 293 | jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, | 298 | jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, |
| 294 | }; | 299 | }; |
| 295 | 300 | ||
| 296 | static void jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 301 | static irqreturn_t jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
| 297 | { | 302 | { |
| 298 | unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR); | 303 | unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR); |
| 299 | int i; | 304 | int i; |
| @@ -304,6 +309,7 @@ static void jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 304 | do_IRQ(irq, regs); | 309 | do_IRQ(irq, regs); |
| 305 | } | 310 | } |
| 306 | } | 311 | } |
| 312 | return IRQ_HANDLED; | ||
| 307 | } | 313 | } |
| 308 | 314 | ||
| 309 | static struct irqaction isac_action = { | 315 | static struct irqaction isac_action = { |
| @@ -311,19 +317,23 @@ static struct irqaction isac_action = { | |||
| 311 | }; | 317 | }; |
| 312 | 318 | ||
| 313 | 319 | ||
| 314 | static void jmr3927_isaerr_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 320 | static irqreturn_t jmr3927_isaerr_interrupt(int irq, void * dev_id, struct pt_regs * regs) |
| 315 | { | 321 | { |
| 316 | printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq); | 322 | printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq); |
| 323 | |||
| 324 | return IRQ_HANDLED; | ||
| 317 | } | 325 | } |
| 318 | static struct irqaction isaerr_action = { | 326 | static struct irqaction isaerr_action = { |
| 319 | jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL, | 327 | jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL, |
| 320 | }; | 328 | }; |
| 321 | 329 | ||
| 322 | static void jmr3927_pcierr_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 330 | static irqreturn_t jmr3927_pcierr_interrupt(int irq, void * dev_id, struct pt_regs * regs) |
| 323 | { | 331 | { |
| 324 | printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq); | 332 | printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq); |
| 325 | printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n", | 333 | printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n", |
| 326 | tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat); | 334 | tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat); |
| 335 | |||
| 336 | return IRQ_HANDLED; | ||
| 327 | } | 337 | } |
| 328 | static struct irqaction pcierr_action = { | 338 | static struct irqaction pcierr_action = { |
| 329 | jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, | 339 | jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, |
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 55ad0a578794..4763957df8fc 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c | |||
| @@ -60,6 +60,8 @@ | |||
| 60 | #include <asm/mipsregs.h> | 60 | #include <asm/mipsregs.h> |
| 61 | #include <asm/traps.h> | 61 | #include <asm/traps.h> |
| 62 | 62 | ||
| 63 | extern void puts(unsigned char *cp); | ||
| 64 | |||
| 63 | /* Tick Timer divider */ | 65 | /* Tick Timer divider */ |
| 64 | #define JMR3927_TIMER_CCD 0 /* 1/2 */ | 66 | #define JMR3927_TIMER_CCD 0 /* 1/2 */ |
| 65 | #define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) | 67 | #define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index a263fb7a3971..5e1b08b00a33 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
| @@ -417,7 +417,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) | |||
| 417 | case PRID_IMP_R10000: | 417 | case PRID_IMP_R10000: |
| 418 | c->cputype = CPU_R10000; | 418 | c->cputype = CPU_R10000; |
| 419 | c->isa_level = MIPS_CPU_ISA_IV; | 419 | c->isa_level = MIPS_CPU_ISA_IV; |
| 420 | c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | | 420 | c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX | |
| 421 | MIPS_CPU_FPU | MIPS_CPU_32FPR | | 421 | MIPS_CPU_FPU | MIPS_CPU_32FPR | |
| 422 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | | 422 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | |
| 423 | MIPS_CPU_LLSC; | 423 | MIPS_CPU_LLSC; |
| @@ -426,7 +426,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) | |||
| 426 | case PRID_IMP_R12000: | 426 | case PRID_IMP_R12000: |
| 427 | c->cputype = CPU_R12000; | 427 | c->cputype = CPU_R12000; |
| 428 | c->isa_level = MIPS_CPU_ISA_IV; | 428 | c->isa_level = MIPS_CPU_ISA_IV; |
| 429 | c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | | 429 | c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX | |
| 430 | MIPS_CPU_FPU | MIPS_CPU_32FPR | | 430 | MIPS_CPU_FPU | MIPS_CPU_32FPR | |
| 431 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | | 431 | MIPS_CPU_COUNTER | MIPS_CPU_WATCH | |
| 432 | MIPS_CPU_LLSC; | 432 | MIPS_CPU_LLSC; |
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index dd118c60bcd0..08273a2a501d 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
| @@ -279,8 +279,6 @@ irix_sigreturn(struct pt_regs *regs) | |||
| 279 | /* | 279 | /* |
| 280 | * Don't let your children do this ... | 280 | * Don't let your children do this ... |
| 281 | */ | 281 | */ |
| 282 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 283 | do_syscall_trace(regs, 1); | ||
| 284 | __asm__ __volatile__( | 282 | __asm__ __volatile__( |
| 285 | "move\t$29,%0\n\t" | 283 | "move\t$29,%0\n\t" |
| 286 | "j\tsyscall_exit" | 284 | "j\tsyscall_exit" |
| @@ -783,8 +781,6 @@ asmlinkage void irix_setcontext(struct pt_regs *regs) | |||
| 783 | /* | 781 | /* |
| 784 | * Don't let your children do this ... | 782 | * Don't let your children do this ... |
| 785 | */ | 783 | */ |
| 786 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 787 | do_syscall_trace(regs, 1); | ||
| 788 | __asm__ __volatile__( | 784 | __asm__ __volatile__( |
| 789 | "move\t$29,%0\n\t" | 785 | "move\t$29,%0\n\t" |
| 790 | "j\tsyscall_exit" | 786 | "j\tsyscall_exit" |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 4dd8e8b4fbc2..a42e0e8caa7b 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -94,11 +94,13 @@ syscall_trace_entry: | |||
| 94 | li a1, 0 | 94 | li a1, 0 |
| 95 | jal do_syscall_trace | 95 | jal do_syscall_trace |
| 96 | 96 | ||
| 97 | move t0, s0 | ||
| 98 | RESTORE_STATIC | ||
| 97 | lw a0, PT_R4(sp) # Restore argument registers | 99 | lw a0, PT_R4(sp) # Restore argument registers |
| 98 | lw a1, PT_R5(sp) | 100 | lw a1, PT_R5(sp) |
| 99 | lw a2, PT_R6(sp) | 101 | lw a2, PT_R6(sp) |
| 100 | lw a3, PT_R7(sp) | 102 | lw a3, PT_R7(sp) |
| 101 | jalr s0 | 103 | jalr t0 |
| 102 | 104 | ||
| 103 | li t0, -EMAXERRNO - 1 # error? | 105 | li t0, -EMAXERRNO - 1 # error? |
| 104 | sltu t0, t0, v0 | 106 | sltu t0, t0, v0 |
| @@ -241,19 +243,7 @@ illegal_syscall: | |||
| 241 | sw zero, PT_R7(sp) # success | 243 | sw zero, PT_R7(sp) # success |
| 242 | sw v0, PT_R2(sp) # result | 244 | sw v0, PT_R2(sp) # result |
| 243 | 245 | ||
| 244 | /* Success, so skip usual error handling garbage. */ | 246 | j o32_syscall_exit # continue like a normal syscall |
| 245 | lw a2, TI_FLAGS($28) # syscall tracing enabled? | ||
| 246 | li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | ||
| 247 | and t0, a2, t0 | ||
| 248 | bnez t0, 1f | ||
| 249 | |||
| 250 | j o32_syscall_exit | ||
| 251 | |||
| 252 | 1: SAVE_STATIC | ||
| 253 | move a0, sp | ||
| 254 | li a1, 1 | ||
| 255 | jal do_syscall_trace | ||
| 256 | j syscall_exit | ||
| 257 | 247 | ||
| 258 | no_mem: li v0, -ENOMEM | 248 | no_mem: li v0, -ENOMEM |
| 259 | jr ra | 249 | jr ra |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 9085838d6ce3..47bfbd416709 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -93,13 +93,15 @@ syscall_trace_entry: | |||
| 93 | li a1, 0 | 93 | li a1, 0 |
| 94 | jal do_syscall_trace | 94 | jal do_syscall_trace |
| 95 | 95 | ||
| 96 | move t0, s0 | ||
| 97 | RESTORE_STATIC | ||
| 96 | ld a0, PT_R4(sp) # Restore argument registers | 98 | ld a0, PT_R4(sp) # Restore argument registers |
| 97 | ld a1, PT_R5(sp) | 99 | ld a1, PT_R5(sp) |
| 98 | ld a2, PT_R6(sp) | 100 | ld a2, PT_R6(sp) |
| 99 | ld a3, PT_R7(sp) | 101 | ld a3, PT_R7(sp) |
| 100 | ld a4, PT_R8(sp) | 102 | ld a4, PT_R8(sp) |
| 101 | ld a5, PT_R9(sp) | 103 | ld a5, PT_R9(sp) |
| 102 | jalr s0 | 104 | jalr t0 |
| 103 | 105 | ||
| 104 | li t0, -EMAXERRNO - 1 # error? | 106 | li t0, -EMAXERRNO - 1 # error? |
| 105 | sltu t0, t0, v0 | 107 | sltu t0, t0, v0 |
| @@ -174,19 +176,7 @@ illegal_syscall: | |||
| 174 | sd zero, PT_R7(sp) # success | 176 | sd zero, PT_R7(sp) # success |
| 175 | sd v0, PT_R2(sp) # result | 177 | sd v0, PT_R2(sp) # result |
| 176 | 178 | ||
| 177 | /* Success, so skip usual error handling garbage. */ | 179 | j n64_syscall_exit # continue like a normal syscall |
| 178 | li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | ||
| 179 | LONG_L a2, TI_FLAGS($28) # syscall tracing enabled? | ||
| 180 | and t0, a2, t0 | ||
| 181 | bnez t0, 1f | ||
| 182 | |||
| 183 | j n64_syscall_exit | ||
| 184 | |||
| 185 | 1: SAVE_STATIC | ||
| 186 | move a0, sp | ||
| 187 | li a1, 1 | ||
| 188 | jal do_syscall_trace | ||
| 189 | j syscall_exit | ||
| 190 | 180 | ||
| 191 | no_mem: li v0, -ENOMEM | 181 | no_mem: li v0, -ENOMEM |
| 192 | jr ra | 182 | jr ra |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 7e66eb823bf6..b465ced1758f 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -90,13 +90,15 @@ n32_syscall_trace_entry: | |||
| 90 | li a1, 0 | 90 | li a1, 0 |
| 91 | jal do_syscall_trace | 91 | jal do_syscall_trace |
| 92 | 92 | ||
| 93 | move t0, s0 | ||
| 94 | RESTORE_STATIC | ||
| 93 | ld a0, PT_R4(sp) # Restore argument registers | 95 | ld a0, PT_R4(sp) # Restore argument registers |
| 94 | ld a1, PT_R5(sp) | 96 | ld a1, PT_R5(sp) |
| 95 | ld a2, PT_R6(sp) | 97 | ld a2, PT_R6(sp) |
| 96 | ld a3, PT_R7(sp) | 98 | ld a3, PT_R7(sp) |
| 97 | ld a4, PT_R8(sp) | 99 | ld a4, PT_R8(sp) |
| 98 | ld a5, PT_R9(sp) | 100 | ld a5, PT_R9(sp) |
| 99 | jalr s0 | 101 | jalr t0 |
| 100 | 102 | ||
| 101 | li t0, -EMAXERRNO - 1 # error? | 103 | li t0, -EMAXERRNO - 1 # error? |
| 102 | sltu t0, t0, v0 | 104 | sltu t0, t0, v0 |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 5a16401e443a..3d338ca7eeeb 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -124,6 +124,8 @@ trace_a_syscall: | |||
| 124 | li a1, 0 | 124 | li a1, 0 |
| 125 | jal do_syscall_trace | 125 | jal do_syscall_trace |
| 126 | 126 | ||
| 127 | move t0, s0 | ||
| 128 | RESTORE_STATIC | ||
| 127 | ld a0, PT_R4(sp) # Restore argument registers | 129 | ld a0, PT_R4(sp) # Restore argument registers |
| 128 | ld a1, PT_R5(sp) | 130 | ld a1, PT_R5(sp) |
| 129 | ld a2, PT_R6(sp) | 131 | ld a2, PT_R6(sp) |
| @@ -132,7 +134,7 @@ trace_a_syscall: | |||
| 132 | ld a5, PT_R9(sp) | 134 | ld a5, PT_R9(sp) |
| 133 | ld a6, PT_R10(sp) | 135 | ld a6, PT_R10(sp) |
| 134 | ld a7, PT_R11(sp) # For indirect syscalls | 136 | ld a7, PT_R11(sp) # For indirect syscalls |
| 135 | jalr s0 | 137 | jalr t0 |
| 136 | 138 | ||
| 137 | li t0, -EMAXERRNO - 1 # error? | 139 | li t0, -EMAXERRNO - 1 # error? |
| 138 | sltu t0, t0, v0 | 140 | sltu t0, t0, v0 |
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 05e09eedabff..7d1800fe7038 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
| @@ -220,8 +220,6 @@ _sys_sigreturn(nabi_no_regargs struct pt_regs regs) | |||
| 220 | /* | 220 | /* |
| 221 | * Don't let your children do this ... | 221 | * Don't let your children do this ... |
| 222 | */ | 222 | */ |
| 223 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 224 | do_syscall_trace(®s, 1); | ||
| 225 | __asm__ __volatile__( | 223 | __asm__ __volatile__( |
| 226 | "move\t$29, %0\n\t" | 224 | "move\t$29, %0\n\t" |
| 227 | "j\tsyscall_exit" | 225 | "j\tsyscall_exit" |
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index e315d3f6aa6e..c856dbc52abb 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
| @@ -497,8 +497,6 @@ _sys32_sigreturn(nabi_no_regargs struct pt_regs regs) | |||
| 497 | /* | 497 | /* |
| 498 | * Don't let your children do this ... | 498 | * Don't let your children do this ... |
| 499 | */ | 499 | */ |
| 500 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 501 | do_syscall_trace(®s, 1); | ||
| 502 | __asm__ __volatile__( | 500 | __asm__ __volatile__( |
| 503 | "move\t$29, %0\n\t" | 501 | "move\t$29, %0\n\t" |
| 504 | "j\tsyscall_exit" | 502 | "j\tsyscall_exit" |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 6f3ff9690686..7058893d5ad2 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -534,13 +534,14 @@ static inline int simulate_rdhwr(struct pt_regs *regs) | |||
| 534 | switch (rd) { | 534 | switch (rd) { |
| 535 | case 29: | 535 | case 29: |
| 536 | regs->regs[rt] = ti->tp_value; | 536 | regs->regs[rt] = ti->tp_value; |
| 537 | break; | 537 | return 0; |
| 538 | default: | 538 | default: |
| 539 | return -EFAULT; | 539 | return -EFAULT; |
| 540 | } | 540 | } |
| 541 | } | 541 | } |
| 542 | 542 | ||
| 543 | return 0; | 543 | /* Not ours. */ |
| 544 | return -EFAULT; | ||
| 544 | } | 545 | } |
| 545 | 546 | ||
| 546 | asmlinkage void do_ov(struct pt_regs *regs) | 547 | asmlinkage void do_ov(struct pt_regs *regs) |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index f75ab748e8cd..3a49036e0ae8 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -68,7 +68,7 @@ unsigned long setup_zero_pages(void) | |||
| 68 | page = virt_to_page(empty_zero_page); | 68 | page = virt_to_page(empty_zero_page); |
| 69 | while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { | 69 | while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { |
| 70 | set_bit(PG_reserved, &page->flags); | 70 | set_bit(PG_reserved, &page->flags); |
| 71 | set_page_count(page, 0); | 71 | reset_page_mapcount(page); |
| 72 | page++; | 72 | page++; |
| 73 | } | 73 | } |
| 74 | 74 | ||
diff --git a/arch/mips/qemu/q-firmware.c b/arch/mips/qemu/q-firmware.c index 5980f02b2df9..fb2a8673a6bf 100644 --- a/arch/mips/qemu/q-firmware.c +++ b/arch/mips/qemu/q-firmware.c | |||
| @@ -1,7 +1,18 @@ | |||
| 1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 2 | #include <linux/string.h> | ||
| 3 | #include <asm/addrspace.h> | ||
| 2 | #include <asm/bootinfo.h> | 4 | #include <asm/bootinfo.h> |
| 3 | 5 | ||
| 4 | void __init prom_init(void) | 6 | void __init prom_init(void) |
| 5 | { | 7 | { |
| 6 | add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM); | 8 | int *cmdline; |
| 9 | |||
| 10 | cmdline = (int *) (CKSEG0 + (0x10 << 20) - 260); | ||
| 11 | if (*cmdline == 0x12345678) { | ||
| 12 | if (*(char *)(cmdline + 1)) | ||
| 13 | strcpy (arcs_cmdline, (char *)(cmdline + 1)); | ||
| 14 | add_memory_region(0x0<<20, cmdline[-1], BOOT_MEM_RAM); | ||
| 15 | } else { | ||
| 16 | add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM); | ||
| 17 | } | ||
| 7 | } | 18 | } |
