diff options
201 files changed, 4273 insertions, 5023 deletions
diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4 index fa0c786a8bf5..cf6b6cb02aa1 100644 --- a/Documentation/i2c/busses/i2c-piix4 +++ b/Documentation/i2c/busses/i2c-piix4 | |||
| @@ -6,7 +6,7 @@ Supported adapters: | |||
| 6 | Datasheet: Publicly available at the Intel website | 6 | Datasheet: Publicly available at the Intel website |
| 7 | * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges | 7 | * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges |
| 8 | Datasheet: Only available via NDA from ServerWorks | 8 | Datasheet: Only available via NDA from ServerWorks |
| 9 | * ATI IXP200, IXP300, IXP400, SB600 and SB700 southbridges | 9 | * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges |
| 10 | Datasheet: Not publicly available | 10 | Datasheet: Not publicly available |
| 11 | * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge | 11 | * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge |
| 12 | Datasheet: Publicly available at the SMSC website http://www.smsc.com | 12 | Datasheet: Publicly available at the SMSC website http://www.smsc.com |
diff --git a/MAINTAINERS b/MAINTAINERS index 48ca8b47150d..9c54a5ef0ba7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -44,9 +44,10 @@ trivial patch so apply some common sense. | |||
| 44 | or does something very odd once a month document it. | 44 | or does something very odd once a month document it. |
| 45 | 45 | ||
| 46 | PLEASE remember that submissions must be made under the terms | 46 | PLEASE remember that submissions must be made under the terms |
| 47 | of the OSDL certificate of contribution | 47 | of the OSDL certificate of contribution and should include a |
| 48 | (http://www.osdl.org/newsroom/press_releases/2004/2004_05_24_dco.html) | 48 | Signed-off-by: line. The current version of this "Developer's |
| 49 | and should include a Signed-off-by: line. | 49 | Certificate of Origin" (DCO) is listed in the file |
| 50 | Documentation/SubmittingPatches. | ||
| 50 | 51 | ||
| 51 | 6. Make sure you have the right to send any changes you make. If you | 52 | 6. Make sure you have the right to send any changes you make. If you |
| 52 | do changes at work you may find your employer owns the patch | 53 | do changes at work you may find your employer owns the patch |
| @@ -2057,12 +2058,18 @@ L: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel | |||
| 2057 | W: http://ipw2200.sourceforge.net | 2058 | W: http://ipw2200.sourceforge.net |
| 2058 | S: Supported | 2059 | S: Supported |
| 2059 | 2060 | ||
| 2060 | IOC3 DRIVER | 2061 | IOC3 ETHERNET DRIVER |
| 2061 | P: Ralf Baechle | 2062 | P: Ralf Baechle |
| 2062 | M: ralf@linux-mips.org | 2063 | M: ralf@linux-mips.org |
| 2063 | L: linux-mips@linux-mips.org | 2064 | L: linux-mips@linux-mips.org |
| 2064 | S: Maintained | 2065 | S: Maintained |
| 2065 | 2066 | ||
| 2067 | IOC3 SERIAL DRIVER | ||
| 2068 | P: Pat Gefre | ||
| 2069 | M: pfg@sgi.com | ||
| 2070 | L: linux-kernel@linux-mips.org | ||
| 2071 | S: Maintained | ||
| 2072 | |||
| 2066 | IP MASQUERADING: | 2073 | IP MASQUERADING: |
| 2067 | P: Juanjo Ciarlante | 2074 | P: Juanjo Ciarlante |
| 2068 | M: jjciarla@raiz.uncu.edu.ar | 2075 | M: jjciarla@raiz.uncu.edu.ar |
| @@ -2594,6 +2601,19 @@ M: shemminger@linux-foundation.org | |||
| 2594 | L: netem@lists.linux-foundation.org | 2601 | L: netem@lists.linux-foundation.org |
| 2595 | S: Maintained | 2602 | S: Maintained |
| 2596 | 2603 | ||
| 2604 | NETERION (S2IO) Xframe 10GbE DRIVER | ||
| 2605 | P: Ramkrishna Vepa | ||
| 2606 | M: ram.vepa@neterion.com | ||
| 2607 | P: Rastapur Santosh | ||
| 2608 | M: santosh.rastapur@neterion.com | ||
| 2609 | P: Sivakumar Subramani | ||
| 2610 | M: sivakumar.subramani@neterion.com | ||
| 2611 | P: Sreenivasa Honnur | ||
| 2612 | M: sreenivasa.honnur@neterion.com | ||
| 2613 | L: netdev@vger.kernel.org | ||
| 2614 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous | ||
| 2615 | S: Supported | ||
| 2616 | |||
| 2597 | NETFILTER/IPTABLES/IPCHAINS | 2617 | NETFILTER/IPTABLES/IPCHAINS |
| 2598 | P: Rusty Russell | 2618 | P: Rusty Russell |
| 2599 | P: Marc Boucher | 2619 | P: Marc Boucher |
| @@ -2734,19 +2754,6 @@ M: adaplas@gmail.com | |||
| 2734 | L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) | 2754 | L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) |
| 2735 | S: Maintained | 2755 | S: Maintained |
| 2736 | 2756 | ||
| 2737 | NETERION (S2IO) Xframe 10GbE DRIVER | ||
| 2738 | P: Ramkrishna Vepa | ||
| 2739 | M: ram.vepa@neterion.com | ||
| 2740 | P: Rastapur Santosh | ||
| 2741 | M: santosh.rastapur@neterion.com | ||
| 2742 | P: Sivakumar Subramani | ||
| 2743 | M: sivakumar.subramani@neterion.com | ||
| 2744 | P: Sreenivasa Honnur | ||
| 2745 | M: sreenivasa.honnur@neterion.com | ||
| 2746 | L: netdev@vger.kernel.org | ||
| 2747 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous | ||
| 2748 | S: Supported | ||
| 2749 | |||
| 2750 | OPENCORES I2C BUS DRIVER | 2757 | OPENCORES I2C BUS DRIVER |
| 2751 | P: Peter Korsgaard | 2758 | P: Peter Korsgaard |
| 2752 | M: jacmet@sunsite.dk | 2759 | M: jacmet@sunsite.dk |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 23 | 3 | SUBLEVEL = 23 |
| 4 | EXTRAVERSION =-rc4 | 4 | EXTRAVERSION =-rc5 |
| 5 | NAME = Pink Farting Weasel | 5 | NAME = Pink Farting Weasel |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d6145298a325..691aae309c8a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -721,7 +721,8 @@ config LEDS | |||
| 721 | 721 | ||
| 722 | config LEDS_TIMER | 722 | config LEDS_TIMER |
| 723 | bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ | 723 | bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ |
| 724 | MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 | 724 | OMAP_OSK_MISTRAL || MACH_OMAP_H2 \ |
| 725 | || MACH_OMAP_PERSEUS2 | ||
| 725 | depends on LEDS | 726 | depends on LEDS |
| 726 | depends on !GENERIC_CLOCKEVENTS | 727 | depends on !GENERIC_CLOCKEVENTS |
| 727 | default y if ARCH_EBSA110 | 728 | default y if ARCH_EBSA110 |
| @@ -738,7 +739,9 @@ config LEDS_TIMER | |||
| 738 | 739 | ||
| 739 | config LEDS_CPU | 740 | config LEDS_CPU |
| 740 | bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ | 741 | bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ |
| 741 | !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 | 742 | !ARCH_OMAP) \ |
| 743 | || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \ | ||
| 744 | || MACH_OMAP_PERSEUS2 | ||
| 742 | depends on LEDS | 745 | depends on LEDS |
| 743 | help | 746 | help |
| 744 | If you say Y here, the red LED will be used to give a good real | 747 | If you say Y here, the red LED will be used to give a good real |
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c index a58b678006df..4cfc9d3af28a 100644 --- a/arch/arm/mach-imx/generic.c +++ b/arch/arm/mach-imx/generic.c | |||
| @@ -101,10 +101,11 @@ EXPORT_SYMBOL(imx_gpio_mode); | |||
| 101 | 101 | ||
| 102 | int imx_gpio_request(unsigned gpio, const char *label) | 102 | int imx_gpio_request(unsigned gpio, const char *label) |
| 103 | { | 103 | { |
| 104 | if(gpio >= (GPIO_PORT_MAX + 1) * 32) | 104 | if(gpio >= (GPIO_PORT_MAX + 1) * 32) { |
| 105 | printk(KERN_ERR "imx_gpio: Attempt to request nonexistent GPIO %d for \"%s\"\n", | 105 | printk(KERN_ERR "imx_gpio: Attempt to request nonexistent GPIO %d for \"%s\"\n", |
| 106 | gpio, label ? label : "?"); | 106 | gpio, label ? label : "?"); |
| 107 | return -EINVAL; | 107 | return -EINVAL; |
| 108 | } | ||
| 108 | 109 | ||
| 109 | if(test_and_set_bit(gpio, imx_gpio_alloc_map)) { | 110 | if(test_and_set_bit(gpio, imx_gpio_alloc_map)) { |
| 110 | printk(KERN_ERR "imx_gpio: GPIO %d already used. Allocation for \"%s\" failed\n", | 111 | printk(KERN_ERR "imx_gpio: GPIO %d already used. Allocation for \"%s\" failed\n", |
| @@ -129,7 +130,7 @@ EXPORT_SYMBOL(imx_gpio_free); | |||
| 129 | 130 | ||
| 130 | int imx_gpio_direction_input(unsigned gpio) | 131 | int imx_gpio_direction_input(unsigned gpio) |
| 131 | { | 132 | { |
| 132 | imx_gpio_mode(gpio| GPIO_IN); | 133 | imx_gpio_mode(gpio | GPIO_IN | GPIO_GIUS | GPIO_DR); |
| 133 | return 0; | 134 | return 0; |
| 134 | } | 135 | } |
| 135 | 136 | ||
| @@ -138,7 +139,7 @@ EXPORT_SYMBOL(imx_gpio_direction_input); | |||
| 138 | int imx_gpio_direction_output(unsigned gpio, int value) | 139 | int imx_gpio_direction_output(unsigned gpio, int value) |
| 139 | { | 140 | { |
| 140 | imx_gpio_set_value(gpio, value); | 141 | imx_gpio_set_value(gpio, value); |
| 141 | imx_gpio_mode(gpio| GPIO_OUT); | 142 | imx_gpio_mode(gpio | GPIO_OUT | GPIO_GIUS | GPIO_DR); |
| 142 | return 0; | 143 | return 0; |
| 143 | } | 144 | } |
| 144 | 145 | ||
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 7b260b7c537b..79d4ef4c54d4 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
| @@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state) | |||
| 294 | return err; | 294 | return err; |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | static void set_trans_mode(void *data) | 297 | static void set_trans_mode(struct work_struct *work) |
| 298 | { | 298 | { |
| 299 | int *mode = data; | 299 | struct omap_irda_config *irda_config = |
| 300 | container_of(work, struct omap_irda_config, gpio_expa.work); | ||
| 301 | int mode = irda_config->mode; | ||
| 300 | unsigned char expa; | 302 | unsigned char expa; |
| 301 | int err = 0; | 303 | int err = 0; |
| 302 | 304 | ||
| @@ -306,7 +308,7 @@ static void set_trans_mode(void *data) | |||
| 306 | 308 | ||
| 307 | expa &= ~0x03; | 309 | expa &= ~0x03; |
| 308 | 310 | ||
| 309 | if (*mode & IR_SIRMODE) { | 311 | if (mode & IR_SIRMODE) { |
| 310 | expa |= 0x01; | 312 | expa |= 0x01; |
| 311 | } else { /* MIR/FIR */ | 313 | } else { /* MIR/FIR */ |
| 312 | expa |= 0x03; | 314 | expa |= 0x03; |
| @@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode) | |||
| 321 | { | 323 | { |
| 322 | struct omap_irda_config *irda_config = dev->platform_data; | 324 | struct omap_irda_config *irda_config = dev->platform_data; |
| 323 | 325 | ||
| 326 | irda_config->mode = mode; | ||
| 324 | cancel_delayed_work(&irda_config->gpio_expa); | 327 | cancel_delayed_work(&irda_config->gpio_expa); |
| 325 | PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode); | 328 | PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode); |
| 326 | #error this is not permitted - mode is an argument variable | ||
| 327 | schedule_delayed_work(&irda_config->gpio_expa, 0); | 329 | schedule_delayed_work(&irda_config->gpio_expa, 0); |
| 328 | 330 | ||
| 329 | return 0; | 331 | return 0; |
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c index 0cbf1b0071f8..86de303ecab2 100644 --- a/arch/arm/mach-omap1/leds-osk.c +++ b/arch/arm/mach-omap1/leds-osk.c | |||
| @@ -133,13 +133,13 @@ void osk_leds_event(led_event_t evt) | |||
| 133 | mistral_setled(); | 133 | mistral_setled(); |
| 134 | break; | 134 | break; |
| 135 | 135 | ||
| 136 | case led_idle_start: | 136 | case led_idle_start: /* idle == off */ |
| 137 | hw_led_state |= IDLE_LED; | 137 | hw_led_state &= ~IDLE_LED; |
| 138 | mistral_setled(); | 138 | mistral_setled(); |
| 139 | break; | 139 | break; |
| 140 | 140 | ||
| 141 | case led_idle_end: | 141 | case led_idle_end: |
| 142 | hw_led_state &= ~IDLE_LED; | 142 | hw_led_state |= IDLE_LED; |
| 143 | mistral_setled(); | 143 | mistral_setled(); |
| 144 | break; | 144 | break; |
| 145 | 145 | ||
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 5bb348e2e315..2e68be607295 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | #include <asm/arch/tc.h> | 57 | #include <asm/arch/tc.h> |
| 58 | #include <asm/arch/pm.h> | 58 | #include <asm/arch/pm.h> |
| 59 | #include <asm/arch/mux.h> | 59 | #include <asm/arch/mux.h> |
| 60 | #include <asm/arch/tps65010.h> | ||
| 61 | #include <asm/arch/dma.h> | 60 | #include <asm/arch/dma.h> |
| 62 | #include <asm/arch/dsp_common.h> | 61 | #include <asm/arch/dsp_common.h> |
| 63 | #include <asm/arch/dmtimer.h> | 62 | #include <asm/arch/dmtimer.h> |
| @@ -250,11 +249,6 @@ void omap_pm_suspend(void) | |||
| 250 | 249 | ||
| 251 | omap_serial_wake_trigger(1); | 250 | omap_serial_wake_trigger(1); |
| 252 | 251 | ||
| 253 | if (machine_is_omap_osk()) { | ||
| 254 | /* Stop LED1 (D9) blink */ | ||
| 255 | tps65010_set_led(LED1, OFF); | ||
| 256 | } | ||
| 257 | |||
| 258 | if (!cpu_is_omap15xx()) | 252 | if (!cpu_is_omap15xx()) |
| 259 | omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG); | 253 | omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG); |
| 260 | 254 | ||
| @@ -447,11 +441,6 @@ void omap_pm_suspend(void) | |||
| 447 | omap_serial_wake_trigger(0); | 441 | omap_serial_wake_trigger(0); |
| 448 | 442 | ||
| 449 | printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev); | 443 | printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev); |
| 450 | |||
| 451 | if (machine_is_omap_osk()) { | ||
| 452 | /* Let LED1 (D9) blink again */ | ||
| 453 | tps65010_set_led(LED1, BLINK); | ||
| 454 | } | ||
| 455 | } | 444 | } |
| 456 | 445 | ||
| 457 | #if defined(DEBUG) && defined(CONFIG_PROC_FS) | 446 | #if defined(DEBUG) && defined(CONFIG_PROC_FS) |
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 588adb5ab47f..d9af4367f8bb 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -1160,8 +1160,8 @@ int __init omap2_clk_init(void) | |||
| 1160 | clk_enable(&sync_32k_ick); | 1160 | clk_enable(&sync_32k_ick); |
| 1161 | clk_enable(&omapctrl_ick); | 1161 | clk_enable(&omapctrl_ick); |
| 1162 | 1162 | ||
| 1163 | /* Force the APLLs active during bootup to avoid disabling and | 1163 | /* Force the APLLs always active. The clocks are idled |
| 1164 | * enabling them unnecessarily. */ | 1164 | * automatically by hardware. */ |
| 1165 | clk_enable(&apll96_ck); | 1165 | clk_enable(&apll96_ck); |
| 1166 | clk_enable(&apll54_ck); | 1166 | clk_enable(&apll54_ck); |
| 1167 | 1167 | ||
| @@ -1174,12 +1174,3 @@ int __init omap2_clk_init(void) | |||
| 1174 | 1174 | ||
| 1175 | return 0; | 1175 | return 0; |
| 1176 | } | 1176 | } |
| 1177 | |||
| 1178 | static int __init omap2_disable_aplls(void) | ||
| 1179 | { | ||
| 1180 | clk_disable(&apll96_ck); | ||
| 1181 | clk_disable(&apll54_ck); | ||
| 1182 | |||
| 1183 | return 0; | ||
| 1184 | } | ||
| 1185 | late_initcall(omap2_disable_aplls); | ||
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index aaa5589e8169..e9c367fc9f61 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -84,7 +84,7 @@ static inline void __init omap_serial_reset(struct plat_serial8250_port *p) | |||
| 84 | serial_write_reg(p, UART_OMAP_MDR1, 0x07); | 84 | serial_write_reg(p, UART_OMAP_MDR1, 0x07); |
| 85 | serial_write_reg(p, UART_OMAP_SCR, 0x08); | 85 | serial_write_reg(p, UART_OMAP_SCR, 0x08); |
| 86 | serial_write_reg(p, UART_OMAP_MDR1, 0x00); | 86 | serial_write_reg(p, UART_OMAP_MDR1, 0x00); |
| 87 | serial_write_reg(p, UART_OMAP_SYSC, 0x01); | 87 | serial_write_reg(p, UART_OMAP_SYSC, (0x02 << 3) | (1 << 2) | (1 << 0)); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | void __init omap_serial_init() | 90 | void __init omap_serial_init() |
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index 4b867b0789d5..ae2ae08032d7 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c | |||
| @@ -365,7 +365,7 @@ void __init pxa_init_irq_gpio(int gpio_nr) | |||
| 365 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 365 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
| 366 | } | 366 | } |
| 367 | 367 | ||
| 368 | for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(gpio_nr); irq++) { | 368 | for (irq = IRQ_GPIO(2); irq < IRQ_GPIO(gpio_nr); irq++) { |
| 369 | set_irq_chip(irq, &pxa_muxed_gpio_chip); | 369 | set_irq_chip(irq, &pxa_muxed_gpio_chip); |
| 370 | set_irq_handler(irq, handle_edge_irq); | 370 | set_irq_handler(irq, handle_edge_irq); |
| 371 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 371 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 7987aa6e95f8..4f0f9c4e938e 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -172,7 +172,7 @@ console_initcall(omap_add_serial_console); | |||
| 172 | #if defined(CONFIG_ARCH_OMAP16XX) | 172 | #if defined(CONFIG_ARCH_OMAP16XX) |
| 173 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 | 173 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 |
| 174 | #elif defined(CONFIG_ARCH_OMAP24XX) | 174 | #elif defined(CONFIG_ARCH_OMAP24XX) |
| 175 | #define TIMER_32K_SYNCHRONIZED 0x48004010 | 175 | #define TIMER_32K_SYNCHRONIZED (OMAP24XX_32KSYNCT_BASE + 0x10) |
| 176 | #endif | 176 | #endif |
| 177 | 177 | ||
| 178 | #ifdef TIMER_32K_SYNCHRONIZED | 178 | #ifdef TIMER_32K_SYNCHRONIZED |
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 36073dfaa4db..3856f5aedfc1 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
| @@ -271,11 +271,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) | |||
| 271 | 271 | ||
| 272 | #if defined(CONFIG_ARCH_OMAP1) | 272 | #if defined(CONFIG_ARCH_OMAP1) |
| 273 | 273 | ||
| 274 | struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer) | ||
| 275 | { | ||
| 276 | BUG(); | ||
| 277 | } | ||
| 278 | |||
| 279 | /** | 274 | /** |
| 280 | * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR | 275 | * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR |
| 281 | * @inputmask: current value of idlect mask | 276 | * @inputmask: current value of idlect mask |
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index b0af014b0e2c..ea76f1979a3d 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c | |||
| @@ -71,7 +71,7 @@ struct sys_timer omap_timer; | |||
| 71 | #if defined(CONFIG_ARCH_OMAP16XX) | 71 | #if defined(CONFIG_ARCH_OMAP16XX) |
| 72 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 | 72 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 |
| 73 | #elif defined(CONFIG_ARCH_OMAP24XX) | 73 | #elif defined(CONFIG_ARCH_OMAP24XX) |
| 74 | #define TIMER_32K_SYNCHRONIZED 0x48004010 | 74 | #define TIMER_32K_SYNCHRONIZED (OMAP24XX_32KSYNCT_BASE + 0x10) |
| 75 | #else | 75 | #else |
| 76 | #error OMAP 32KHz timer does not currently work on 15XX! | 76 | #error OMAP 32KHz timer does not currently work on 15XX! |
| 77 | #endif | 77 | #endif |
| @@ -147,14 +147,15 @@ static inline void omap_32k_timer_ack_irq(void) | |||
| 147 | static void omap_32k_timer_set_mode(enum clock_event_mode mode, | 147 | static void omap_32k_timer_set_mode(enum clock_event_mode mode, |
| 148 | struct clock_event_device *evt) | 148 | struct clock_event_device *evt) |
| 149 | { | 149 | { |
| 150 | omap_32k_timer_stop(); | ||
| 151 | |||
| 150 | switch (mode) { | 152 | switch (mode) { |
| 151 | case CLOCK_EVT_MODE_ONESHOT: | ||
| 152 | case CLOCK_EVT_MODE_PERIODIC: | 153 | case CLOCK_EVT_MODE_PERIODIC: |
| 153 | omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD); | 154 | omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD); |
| 154 | break; | 155 | break; |
| 156 | case CLOCK_EVT_MODE_ONESHOT: | ||
| 155 | case CLOCK_EVT_MODE_UNUSED: | 157 | case CLOCK_EVT_MODE_UNUSED: |
| 156 | case CLOCK_EVT_MODE_SHUTDOWN: | 158 | case CLOCK_EVT_MODE_SHUTDOWN: |
| 157 | omap_32k_timer_stop(); | ||
| 158 | break; | 159 | break; |
| 159 | case CLOCK_EVT_MODE_RESUME: | 160 | case CLOCK_EVT_MODE_RESUME: |
| 160 | break; | 161 | break; |
| @@ -194,8 +195,6 @@ omap_32k_ticks_to_nsecs(unsigned long ticks_32k) | |||
| 194 | return (unsigned long long) ticks_32k * 1000 * 5*5*5*5*5*5 >> 9; | 195 | return (unsigned long long) ticks_32k * 1000 * 5*5*5*5*5*5 >> 9; |
| 195 | } | 196 | } |
| 196 | 197 | ||
| 197 | static unsigned long omap_32k_last_tick = 0; | ||
| 198 | |||
| 199 | /* | 198 | /* |
| 200 | * Returns current time from boot in nsecs. It's OK for this to wrap | 199 | * Returns current time from boot in nsecs. It's OK for this to wrap |
| 201 | * around for now, as it's just a relative time stamp. | 200 | * around for now, as it's just a relative time stamp. |
| @@ -225,7 +224,6 @@ static __init void omap_init_32k_timer(void) | |||
| 225 | { | 224 | { |
| 226 | if (cpu_class_is_omap1()) | 225 | if (cpu_class_is_omap1()) |
| 227 | setup_irq(INT_OS_TIMER, &omap_32k_timer_irq); | 226 | setup_irq(INT_OS_TIMER, &omap_32k_timer_irq); |
| 228 | omap_32k_last_tick = omap_32k_sync_timer_read(); | ||
| 229 | 227 | ||
| 230 | #ifdef CONFIG_ARCH_OMAP2 | 228 | #ifdef CONFIG_ARCH_OMAP2 |
| 231 | /* REVISIT: Check 24xx TIOCP_CFG settings after idle works */ | 229 | /* REVISIT: Check 24xx TIOCP_CFG settings after idle works */ |
diff --git a/arch/i386/boot/video-vesa.c b/arch/i386/boot/video-vesa.c index f1bc71e948cf..192190710710 100644 --- a/arch/i386/boot/video-vesa.c +++ b/arch/i386/boot/video-vesa.c | |||
| @@ -29,7 +29,7 @@ static void vesa_store_mode_params_graphics(void); | |||
| 29 | static int vesa_probe(void) | 29 | static int vesa_probe(void) |
| 30 | { | 30 | { |
| 31 | #if defined(CONFIG_VIDEO_VESA) || defined(CONFIG_FIRMWARE_EDID) | 31 | #if defined(CONFIG_VIDEO_VESA) || defined(CONFIG_FIRMWARE_EDID) |
| 32 | u16 ax; | 32 | u16 ax, cx, di; |
| 33 | u16 mode; | 33 | u16 mode; |
| 34 | addr_t mode_ptr; | 34 | addr_t mode_ptr; |
| 35 | struct mode_info *mi; | 35 | struct mode_info *mi; |
| @@ -39,9 +39,11 @@ static int vesa_probe(void) | |||
| 39 | 39 | ||
| 40 | vginfo.signature = VBE2_MAGIC; | 40 | vginfo.signature = VBE2_MAGIC; |
| 41 | 41 | ||
| 42 | /* Optimistically assume a VESA BIOS is register-clean... */ | ||
| 43 | ax = 0x4f00; | 42 | ax = 0x4f00; |
| 44 | asm("int $0x10" : "+a" (ax), "=m" (vginfo) : "D" (&vginfo)); | 43 | di = (size_t)&vginfo; |
| 44 | asm(INT10 | ||
| 45 | : "+a" (ax), "+D" (di), "=m" (vginfo) | ||
| 46 | : : "ebx", "ecx", "edx", "esi"); | ||
| 45 | 47 | ||
| 46 | if (ax != 0x004f || | 48 | if (ax != 0x004f || |
| 47 | vginfo.signature != VESA_MAGIC || | 49 | vginfo.signature != VESA_MAGIC || |
| @@ -64,9 +66,11 @@ static int vesa_probe(void) | |||
| 64 | memset(&vminfo, 0, sizeof vminfo); /* Just in case... */ | 66 | memset(&vminfo, 0, sizeof vminfo); /* Just in case... */ |
| 65 | 67 | ||
| 66 | ax = 0x4f01; | 68 | ax = 0x4f01; |
| 67 | asm("int $0x10" | 69 | cx = mode; |
| 68 | : "+a" (ax), "=m" (vminfo) | 70 | di = (size_t)&vminfo; |
| 69 | : "c" (mode), "D" (&vminfo)); | 71 | asm(INT10 |
| 72 | : "+a" (ax), "+c" (cx), "+D" (di), "=m" (vminfo) | ||
| 73 | : : "ebx", "edx", "esi"); | ||
| 70 | 74 | ||
| 71 | if (ax != 0x004f) | 75 | if (ax != 0x004f) |
| 72 | continue; | 76 | continue; |
| @@ -102,16 +106,18 @@ static int vesa_probe(void) | |||
| 102 | 106 | ||
| 103 | static int vesa_set_mode(struct mode_info *mode) | 107 | static int vesa_set_mode(struct mode_info *mode) |
| 104 | { | 108 | { |
| 105 | u16 ax; | 109 | u16 ax, bx, cx, di; |
| 106 | int is_graphic; | 110 | int is_graphic; |
| 107 | u16 vesa_mode = mode->mode - VIDEO_FIRST_VESA; | 111 | u16 vesa_mode = mode->mode - VIDEO_FIRST_VESA; |
| 108 | 112 | ||
| 109 | memset(&vminfo, 0, sizeof vminfo); /* Just in case... */ | 113 | memset(&vminfo, 0, sizeof vminfo); /* Just in case... */ |
| 110 | 114 | ||
| 111 | ax = 0x4f01; | 115 | ax = 0x4f01; |
| 112 | asm("int $0x10" | 116 | cx = vesa_mode; |
| 113 | : "+a" (ax), "=m" (vminfo) | 117 | di = (size_t)&vminfo; |
| 114 | : "c" (vesa_mode), "D" (&vminfo)); | 118 | asm(INT10 |
| 119 | : "+a" (ax), "+c" (cx), "+D" (di), "=m" (vminfo) | ||
| 120 | : : "ebx", "edx", "esi"); | ||
| 115 | 121 | ||
| 116 | if (ax != 0x004f) | 122 | if (ax != 0x004f) |
| 117 | return -1; | 123 | return -1; |
| @@ -129,9 +135,11 @@ static int vesa_set_mode(struct mode_info *mode) | |||
| 129 | 135 | ||
| 130 | 136 | ||
| 131 | ax = 0x4f02; | 137 | ax = 0x4f02; |
| 132 | asm volatile("int $0x10" | 138 | bx = vesa_mode; |
| 133 | : "+a" (ax) | 139 | di = 0; |
| 134 | : "b" (vesa_mode), "D" (0)); | 140 | asm volatile(INT10 |
| 141 | : "+a" (ax), "+b" (bx), "+D" (di) | ||
| 142 | : : "ecx", "edx", "esi"); | ||
| 135 | 143 | ||
| 136 | if (ax != 0x004f) | 144 | if (ax != 0x004f) |
| 137 | return -1; | 145 | return -1; |
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index cfffe3dd9e83..47b0bef335bd 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
| @@ -100,36 +100,45 @@ asmlinkage void machine_check(void); | |||
| 100 | int kstack_depth_to_print = 24; | 100 | int kstack_depth_to_print = 24; |
| 101 | static unsigned int code_bytes = 64; | 101 | static unsigned int code_bytes = 64; |
| 102 | 102 | ||
| 103 | static inline int valid_stack_ptr(struct thread_info *tinfo, void *p) | 103 | static inline int valid_stack_ptr(struct thread_info *tinfo, void *p, unsigned size) |
| 104 | { | 104 | { |
| 105 | return p > (void *)tinfo && | 105 | return p > (void *)tinfo && |
| 106 | p < (void *)tinfo + THREAD_SIZE - 3; | 106 | p <= (void *)tinfo + THREAD_SIZE - size; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | /* The form of the top of the frame on the stack */ | ||
| 110 | struct stack_frame { | ||
| 111 | struct stack_frame *next_frame; | ||
| 112 | unsigned long return_address; | ||
| 113 | }; | ||
| 114 | |||
| 109 | static inline unsigned long print_context_stack(struct thread_info *tinfo, | 115 | static inline unsigned long print_context_stack(struct thread_info *tinfo, |
| 110 | unsigned long *stack, unsigned long ebp, | 116 | unsigned long *stack, unsigned long ebp, |
| 111 | struct stacktrace_ops *ops, void *data) | 117 | struct stacktrace_ops *ops, void *data) |
| 112 | { | 118 | { |
| 113 | unsigned long addr; | ||
| 114 | |||
| 115 | #ifdef CONFIG_FRAME_POINTER | 119 | #ifdef CONFIG_FRAME_POINTER |
| 116 | while (valid_stack_ptr(tinfo, (void *)ebp)) { | 120 | struct stack_frame *frame = (struct stack_frame *)ebp; |
| 117 | unsigned long new_ebp; | 121 | while (valid_stack_ptr(tinfo, frame, sizeof(*frame))) { |
| 118 | addr = *(unsigned long *)(ebp + 4); | 122 | struct stack_frame *next; |
| 123 | unsigned long addr; | ||
| 124 | |||
| 125 | addr = frame->return_address; | ||
| 119 | ops->address(data, addr); | 126 | ops->address(data, addr); |
| 120 | /* | 127 | /* |
| 121 | * break out of recursive entries (such as | 128 | * break out of recursive entries (such as |
| 122 | * end_of_stack_stop_unwind_function). Also, | 129 | * end_of_stack_stop_unwind_function). Also, |
| 123 | * we can never allow a frame pointer to | 130 | * we can never allow a frame pointer to |
| 124 | * move downwards! | 131 | * move downwards! |
| 125 | */ | 132 | */ |
| 126 | new_ebp = *(unsigned long *)ebp; | 133 | next = frame->next_frame; |
| 127 | if (new_ebp <= ebp) | 134 | if (next <= frame) |
| 128 | break; | 135 | break; |
| 129 | ebp = new_ebp; | 136 | frame = next; |
| 130 | } | 137 | } |
| 131 | #else | 138 | #else |
| 132 | while (valid_stack_ptr(tinfo, stack)) { | 139 | while (valid_stack_ptr(tinfo, stack, sizeof(*stack))) { |
| 140 | unsigned long addr; | ||
| 141 | |||
| 133 | addr = *stack++; | 142 | addr = *stack++; |
| 134 | if (__kernel_text_address(addr)) | 143 | if (__kernel_text_address(addr)) |
| 135 | ops->address(data, addr); | 144 | ops->address(data, addr); |
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c index efdf95ac8031..6c06d9c0488e 100644 --- a/arch/i386/mm/hugetlbpage.c +++ b/arch/i386/mm/hugetlbpage.c | |||
| @@ -367,7 +367,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
| 367 | return -ENOMEM; | 367 | return -ENOMEM; |
| 368 | 368 | ||
| 369 | if (flags & MAP_FIXED) { | 369 | if (flags & MAP_FIXED) { |
| 370 | if (prepare_hugepage_range(addr, len, pgoff)) | 370 | if (prepare_hugepage_range(addr, len)) |
| 371 | return -EINVAL; | 371 | return -EINVAL; |
| 372 | return addr; | 372 | return addr; |
| 373 | } | 373 | } |
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c index d22861c5b04c..a9ff685aea25 100644 --- a/arch/ia64/mm/hugetlbpage.c +++ b/arch/ia64/mm/hugetlbpage.c | |||
| @@ -75,10 +75,8 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep) | |||
| 75 | * Don't actually need to do any preparation, but need to make sure | 75 | * Don't actually need to do any preparation, but need to make sure |
| 76 | * the address is in the right region. | 76 | * the address is in the right region. |
| 77 | */ | 77 | */ |
| 78 | int prepare_hugepage_range(unsigned long addr, unsigned long len, pgoff_t pgoff) | 78 | int prepare_hugepage_range(unsigned long addr, unsigned long len) |
| 79 | { | 79 | { |
| 80 | if (pgoff & (~HPAGE_MASK >> PAGE_SHIFT)) | ||
| 81 | return -EINVAL; | ||
| 82 | if (len & ~HPAGE_MASK) | 80 | if (len & ~HPAGE_MASK) |
| 83 | return -EINVAL; | 81 | return -EINVAL; |
| 84 | if (addr & ~HPAGE_MASK) | 82 | if (addr & ~HPAGE_MASK) |
| @@ -151,7 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u | |||
| 151 | 149 | ||
| 152 | /* Handle MAP_FIXED */ | 150 | /* Handle MAP_FIXED */ |
| 153 | if (flags & MAP_FIXED) { | 151 | if (flags & MAP_FIXED) { |
| 154 | if (prepare_hugepage_range(addr, len, pgoff)) | 152 | if (prepare_hugepage_range(addr, len)) |
| 155 | return -EINVAL; | 153 | return -EINVAL; |
| 156 | return addr; | 154 | return addr; |
| 157 | } | 155 | } |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c index 84ebff711e6e..f236b1ff8923 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c | |||
| @@ -1108,7 +1108,7 @@ static void __init txx9_spi_init(unsigned long base, int irq) | |||
| 1108 | .flags = IORESOURCE_IRQ, | 1108 | .flags = IORESOURCE_IRQ, |
| 1109 | }, | 1109 | }, |
| 1110 | }; | 1110 | }; |
| 1111 | platform_device_register_simple("txx9spi", 0, | 1111 | platform_device_register_simple("spi_txx9", 0, |
| 1112 | res, ARRAY_SIZE(res)); | 1112 | res, ARRAY_SIZE(res)); |
| 1113 | } | 1113 | } |
| 1114 | 1114 | ||
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig index 0dc9874b46e3..b4ac498c3cce 100644 --- a/arch/powerpc/configs/celleb_defconfig +++ b/arch/powerpc/configs/celleb_defconfig | |||
| @@ -1,9 +1,23 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 12:33:17 2007 | 4 | # Thu Aug 30 16:32:07 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_POWER4_ONLY is not set | ||
| 12 | CONFIG_POWER3=y | ||
| 13 | CONFIG_POWER4=y | ||
| 14 | CONFIG_PPC_FPU=y | ||
| 15 | CONFIG_ALTIVEC=y | ||
| 16 | CONFIG_PPC_STD_MMU=y | ||
| 17 | CONFIG_PPC_MM_SLICES=y | ||
| 18 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 19 | CONFIG_SMP=y | ||
| 20 | CONFIG_NR_CPUS=4 | ||
| 7 | CONFIG_64BIT=y | 21 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 22 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| @@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 35 | CONFIG_COMPAT=y |
| @@ -22,50 +37,32 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 25 | # CONFIG_PPC_UDBG_16550 is not set | 41 | # CONFIG_PPC_UDBG_16550 is not set |
| 26 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 27 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | |||
| 31 | # | ||
| 32 | # Processor support | ||
| 33 | # | ||
| 34 | # CONFIG_POWER4_ONLY is not set | ||
| 35 | CONFIG_POWER3=y | ||
| 36 | CONFIG_POWER4=y | ||
| 37 | CONFIG_PPC_FPU=y | ||
| 38 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 39 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 40 | CONFIG_PPC_OF_PLATFORM_PCI=y | 48 | CONFIG_PPC_OF_PLATFORM_PCI=y |
| 41 | CONFIG_ALTIVEC=y | ||
| 42 | CONFIG_PPC_STD_MMU=y | ||
| 43 | CONFIG_PPC_MM_SLICES=y | ||
| 44 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 45 | CONFIG_SMP=y | ||
| 46 | CONFIG_NR_CPUS=4 | ||
| 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Code maturity level options | 52 | # General setup |
| 51 | # | 53 | # |
| 52 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 53 | CONFIG_LOCK_KERNEL=y | 55 | CONFIG_LOCK_KERNEL=y |
| 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 55 | |||
| 56 | # | ||
| 57 | # General setup | ||
| 58 | # | ||
| 59 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 60 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 61 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 62 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 63 | # CONFIG_IPC_NS is not set | ||
| 64 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 65 | # CONFIG_POSIX_MQUEUE is not set | 62 | # CONFIG_POSIX_MQUEUE is not set |
| 66 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 67 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 68 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 69 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 70 | CONFIG_IKCONFIG=y | 67 | CONFIG_IKCONFIG=y |
| 71 | CONFIG_IKCONFIG_PROC=y | 68 | CONFIG_IKCONFIG_PROC=y |
| @@ -101,10 +98,6 @@ CONFIG_SLAB=y | |||
| 101 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
| 102 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
| 103 | CONFIG_BASE_SMALL=0 | 100 | CONFIG_BASE_SMALL=0 |
| 104 | |||
| 105 | # | ||
| 106 | # Loadable module support | ||
| 107 | # | ||
| 108 | CONFIG_MODULES=y | 101 | CONFIG_MODULES=y |
| 109 | CONFIG_MODULE_UNLOAD=y | 102 | CONFIG_MODULE_UNLOAD=y |
| 110 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 103 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -112,12 +105,9 @@ CONFIG_MODVERSIONS=y | |||
| 112 | CONFIG_MODULE_SRCVERSION_ALL=y | 105 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 113 | CONFIG_KMOD=y | 106 | CONFIG_KMOD=y |
| 114 | CONFIG_STOP_MACHINE=y | 107 | CONFIG_STOP_MACHINE=y |
| 115 | |||
| 116 | # | ||
| 117 | # Block layer | ||
| 118 | # | ||
| 119 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
| 120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 109 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 110 | CONFIG_BLK_DEV_BSG=y | ||
| 121 | 111 | ||
| 122 | # | 112 | # |
| 123 | # IO Schedulers | 113 | # IO Schedulers |
| @@ -137,7 +127,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 137 | # | 127 | # |
| 138 | CONFIG_PPC_MULTIPLATFORM=y | 128 | CONFIG_PPC_MULTIPLATFORM=y |
| 139 | # CONFIG_EMBEDDED6xx is not set | 129 | # CONFIG_EMBEDDED6xx is not set |
| 140 | # CONFIG_APUS is not set | 130 | # CONFIG_PPC_82xx is not set |
| 131 | # CONFIG_PPC_83xx is not set | ||
| 132 | # CONFIG_PPC_86xx is not set | ||
| 141 | # CONFIG_PPC_PSERIES is not set | 133 | # CONFIG_PPC_PSERIES is not set |
| 142 | # CONFIG_PPC_ISERIES is not set | 134 | # CONFIG_PPC_ISERIES is not set |
| 143 | # CONFIG_PPC_MPC52xx is not set | 135 | # CONFIG_PPC_MPC52xx is not set |
| @@ -171,6 +163,7 @@ CONFIG_PPC_UDBG_BEAT=y | |||
| 171 | # CONFIG_GENERIC_IOMAP is not set | 163 | # CONFIG_GENERIC_IOMAP is not set |
| 172 | # CONFIG_CPU_FREQ is not set | 164 | # CONFIG_CPU_FREQ is not set |
| 173 | # CONFIG_CPM2 is not set | 165 | # CONFIG_CPM2 is not set |
| 166 | # CONFIG_FSL_ULI1575 is not set | ||
| 174 | 167 | ||
| 175 | # | 168 | # |
| 176 | # Kernel options | 169 | # Kernel options |
| @@ -212,6 +205,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 212 | CONFIG_MIGRATION=y | 205 | CONFIG_MIGRATION=y |
| 213 | CONFIG_RESOURCES_64BIT=y | 206 | CONFIG_RESOURCES_64BIT=y |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 207 | CONFIG_ZONE_DMA_FLAG=1 |
| 208 | CONFIG_BOUNCE=y | ||
| 215 | CONFIG_ARCH_MEMORY_PROBE=y | 209 | CONFIG_ARCH_MEMORY_PROBE=y |
| 216 | CONFIG_NODES_SPAN_OTHER_NODES=y | 210 | CONFIG_NODES_SPAN_OTHER_NODES=y |
| 217 | CONFIG_PPC_HAS_HASH_64K=y | 211 | CONFIG_PPC_HAS_HASH_64K=y |
| @@ -232,6 +226,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 232 | # CONFIG_PPC_INDIRECT_PCI is not set | 226 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 233 | CONFIG_PCI=y | 227 | CONFIG_PCI=y |
| 234 | CONFIG_PCI_DOMAINS=y | 228 | CONFIG_PCI_DOMAINS=y |
| 229 | CONFIG_PCI_SYSCALL=y | ||
| 235 | # CONFIG_PCIEPORTBUS is not set | 230 | # CONFIG_PCIEPORTBUS is not set |
| 236 | CONFIG_ARCH_SUPPORTS_MSI=y | 231 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 237 | # CONFIG_PCI_MSI is not set | 232 | # CONFIG_PCI_MSI is not set |
| @@ -363,6 +358,7 @@ CONFIG_IP_NF_QUEUE=m | |||
| 363 | # CONFIG_MAC80211 is not set | 358 | # CONFIG_MAC80211 is not set |
| 364 | # CONFIG_IEEE80211 is not set | 359 | # CONFIG_IEEE80211 is not set |
| 365 | # CONFIG_RFKILL is not set | 360 | # CONFIG_RFKILL is not set |
| 361 | # CONFIG_NET_9P is not set | ||
| 366 | 362 | ||
| 367 | # | 363 | # |
| 368 | # Device Drivers | 364 | # Device Drivers |
| @@ -377,28 +373,12 @@ CONFIG_FW_LOADER=y | |||
| 377 | # CONFIG_DEBUG_DRIVER is not set | 373 | # CONFIG_DEBUG_DRIVER is not set |
| 378 | # CONFIG_DEBUG_DEVRES is not set | 374 | # CONFIG_DEBUG_DEVRES is not set |
| 379 | # CONFIG_SYS_HYPERVISOR is not set | 375 | # CONFIG_SYS_HYPERVISOR is not set |
| 380 | |||
| 381 | # | ||
| 382 | # Connector - unified userspace <-> kernelspace linker | ||
| 383 | # | ||
| 384 | # CONFIG_CONNECTOR is not set | 376 | # CONFIG_CONNECTOR is not set |
| 385 | # CONFIG_MTD is not set | 377 | # CONFIG_MTD is not set |
| 386 | 378 | CONFIG_OF_DEVICE=y | |
| 387 | # | ||
| 388 | # Parallel port support | ||
| 389 | # | ||
| 390 | # CONFIG_PARPORT is not set | 379 | # CONFIG_PARPORT is not set |
| 391 | 380 | CONFIG_BLK_DEV=y | |
| 392 | # | ||
| 393 | # Plug and Play support | ||
| 394 | # | ||
| 395 | # CONFIG_PNPACPI is not set | ||
| 396 | |||
| 397 | # | ||
| 398 | # Block devices | ||
| 399 | # | ||
| 400 | # CONFIG_BLK_DEV_FD is not set | 381 | # CONFIG_BLK_DEV_FD is not set |
| 401 | # CONFIG_BLK_CPQ_DA is not set | ||
| 402 | # CONFIG_BLK_CPQ_CISS_DA is not set | 382 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 403 | # CONFIG_BLK_DEV_DAC960 is not set | 383 | # CONFIG_BLK_DEV_DAC960 is not set |
| 404 | # CONFIG_BLK_DEV_UMEM is not set | 384 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -414,14 +394,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 414 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 394 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 415 | # CONFIG_CDROM_PKTCDVD is not set | 395 | # CONFIG_CDROM_PKTCDVD is not set |
| 416 | # CONFIG_ATA_OVER_ETH is not set | 396 | # CONFIG_ATA_OVER_ETH is not set |
| 417 | 397 | CONFIG_MISC_DEVICES=y | |
| 418 | # | ||
| 419 | # Misc devices | ||
| 420 | # | ||
| 421 | # CONFIG_PHANTOM is not set | 398 | # CONFIG_PHANTOM is not set |
| 399 | # CONFIG_EEPROM_93CX6 is not set | ||
| 422 | # CONFIG_SGI_IOC4 is not set | 400 | # CONFIG_SGI_IOC4 is not set |
| 423 | # CONFIG_TIFM_CORE is not set | 401 | # CONFIG_TIFM_CORE is not set |
| 424 | # CONFIG_BLINK is not set | ||
| 425 | CONFIG_IDE=y | 402 | CONFIG_IDE=y |
| 426 | CONFIG_BLK_DEV_IDE=y | 403 | CONFIG_BLK_DEV_IDE=y |
| 427 | 404 | ||
| @@ -487,6 +464,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 487 | # | 464 | # |
| 488 | # CONFIG_RAID_ATTRS is not set | 465 | # CONFIG_RAID_ATTRS is not set |
| 489 | CONFIG_SCSI=m | 466 | CONFIG_SCSI=m |
| 467 | CONFIG_SCSI_DMA=y | ||
| 490 | # CONFIG_SCSI_TGT is not set | 468 | # CONFIG_SCSI_TGT is not set |
| 491 | # CONFIG_SCSI_NETLINK is not set | 469 | # CONFIG_SCSI_NETLINK is not set |
| 492 | # CONFIG_SCSI_PROC_FS is not set | 470 | # CONFIG_SCSI_PROC_FS is not set |
| @@ -519,10 +497,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 519 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 497 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 520 | # CONFIG_SCSI_SAS_ATTRS is not set | 498 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 521 | # CONFIG_SCSI_SAS_LIBSAS is not set | 499 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 522 | 500 | CONFIG_SCSI_LOWLEVEL=y | |
| 523 | # | ||
| 524 | # SCSI low-level drivers | ||
| 525 | # | ||
| 526 | # CONFIG_ISCSI_TCP is not set | 501 | # CONFIG_ISCSI_TCP is not set |
| 527 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 502 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 528 | # CONFIG_SCSI_3W_9XXX is not set | 503 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -537,7 +512,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 537 | # CONFIG_MEGARAID_LEGACY is not set | 512 | # CONFIG_MEGARAID_LEGACY is not set |
| 538 | # CONFIG_MEGARAID_SAS is not set | 513 | # CONFIG_MEGARAID_SAS is not set |
| 539 | # CONFIG_SCSI_HPTIOP is not set | 514 | # CONFIG_SCSI_HPTIOP is not set |
| 540 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 541 | # CONFIG_SCSI_DMX3191D is not set | 515 | # CONFIG_SCSI_DMX3191D is not set |
| 542 | # CONFIG_SCSI_EATA is not set | 516 | # CONFIG_SCSI_EATA is not set |
| 543 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 517 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -556,10 +530,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 556 | # CONFIG_SCSI_DEBUG is not set | 530 | # CONFIG_SCSI_DEBUG is not set |
| 557 | # CONFIG_SCSI_SRP is not set | 531 | # CONFIG_SCSI_SRP is not set |
| 558 | # CONFIG_ATA is not set | 532 | # CONFIG_ATA is not set |
| 559 | |||
| 560 | # | ||
| 561 | # Multi-device support (RAID and LVM) | ||
| 562 | # | ||
| 563 | CONFIG_MD=y | 533 | CONFIG_MD=y |
| 564 | CONFIG_BLK_DEV_MD=m | 534 | CONFIG_BLK_DEV_MD=m |
| 565 | CONFIG_MD_LINEAR=m | 535 | CONFIG_MD_LINEAR=m |
| @@ -577,6 +547,7 @@ CONFIG_DM_MIRROR=m | |||
| 577 | CONFIG_DM_ZERO=m | 547 | CONFIG_DM_ZERO=m |
| 578 | CONFIG_DM_MULTIPATH=m | 548 | CONFIG_DM_MULTIPATH=m |
| 579 | # CONFIG_DM_MULTIPATH_EMC is not set | 549 | # CONFIG_DM_MULTIPATH_EMC is not set |
| 550 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 580 | # CONFIG_DM_DELAY is not set | 551 | # CONFIG_DM_DELAY is not set |
| 581 | 552 | ||
| 582 | # | 553 | # |
| @@ -592,37 +563,23 @@ CONFIG_DM_MULTIPATH=m | |||
| 592 | # | 563 | # |
| 593 | # CONFIG_FIREWIRE is not set | 564 | # CONFIG_FIREWIRE is not set |
| 594 | # CONFIG_IEEE1394 is not set | 565 | # CONFIG_IEEE1394 is not set |
| 595 | |||
| 596 | # | ||
| 597 | # I2O device support | ||
| 598 | # | ||
| 599 | # CONFIG_I2O is not set | 566 | # CONFIG_I2O is not set |
| 600 | # CONFIG_MACINTOSH_DRIVERS is not set | 567 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 601 | |||
| 602 | # | ||
| 603 | # Network device support | ||
| 604 | # | ||
| 605 | CONFIG_NETDEVICES=y | 568 | CONFIG_NETDEVICES=y |
| 569 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 606 | # CONFIG_DUMMY is not set | 570 | # CONFIG_DUMMY is not set |
| 607 | # CONFIG_BONDING is not set | 571 | # CONFIG_BONDING is not set |
| 572 | # CONFIG_MACVLAN is not set | ||
| 608 | # CONFIG_EQUALIZER is not set | 573 | # CONFIG_EQUALIZER is not set |
| 609 | # CONFIG_TUN is not set | 574 | # CONFIG_TUN is not set |
| 610 | # CONFIG_ARCNET is not set | 575 | # CONFIG_ARCNET is not set |
| 611 | # CONFIG_PHYLIB is not set | 576 | # CONFIG_PHYLIB is not set |
| 612 | |||
| 613 | # | ||
| 614 | # Ethernet (10 or 100Mbit) | ||
| 615 | # | ||
| 616 | CONFIG_NET_ETHERNET=y | 577 | CONFIG_NET_ETHERNET=y |
| 617 | CONFIG_MII=y | 578 | CONFIG_MII=y |
| 618 | # CONFIG_HAPPYMEAL is not set | 579 | # CONFIG_HAPPYMEAL is not set |
| 619 | # CONFIG_SUNGEM is not set | 580 | # CONFIG_SUNGEM is not set |
| 620 | # CONFIG_CASSINI is not set | 581 | # CONFIG_CASSINI is not set |
| 621 | # CONFIG_NET_VENDOR_3COM is not set | 582 | # CONFIG_NET_VENDOR_3COM is not set |
| 622 | |||
| 623 | # | ||
| 624 | # Tulip family network device support | ||
| 625 | # | ||
| 626 | # CONFIG_NET_TULIP is not set | 583 | # CONFIG_NET_TULIP is not set |
| 627 | # CONFIG_HP100 is not set | 584 | # CONFIG_HP100 is not set |
| 628 | # CONFIG_NET_PCI is not set | 585 | # CONFIG_NET_PCI is not set |
| @@ -637,7 +594,6 @@ CONFIG_NETDEV_1000=y | |||
| 637 | # CONFIG_SIS190 is not set | 594 | # CONFIG_SIS190 is not set |
| 638 | # CONFIG_SKGE is not set | 595 | # CONFIG_SKGE is not set |
| 639 | # CONFIG_SKY2 is not set | 596 | # CONFIG_SKY2 is not set |
| 640 | # CONFIG_SK98LIN is not set | ||
| 641 | # CONFIG_VIA_VELOCITY is not set | 597 | # CONFIG_VIA_VELOCITY is not set |
| 642 | # CONFIG_TIGON3 is not set | 598 | # CONFIG_TIGON3 is not set |
| 643 | # CONFIG_BNX2 is not set | 599 | # CONFIG_BNX2 is not set |
| @@ -680,15 +636,7 @@ CONFIG_NETDEV_10000=y | |||
| 680 | # CONFIG_NETCONSOLE is not set | 636 | # CONFIG_NETCONSOLE is not set |
| 681 | # CONFIG_NETPOLL is not set | 637 | # CONFIG_NETPOLL is not set |
| 682 | # CONFIG_NET_POLL_CONTROLLER is not set | 638 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 683 | |||
| 684 | # | ||
| 685 | # ISDN subsystem | ||
| 686 | # | ||
| 687 | # CONFIG_ISDN is not set | 639 | # CONFIG_ISDN is not set |
| 688 | |||
| 689 | # | ||
| 690 | # Telephony Support | ||
| 691 | # | ||
| 692 | # CONFIG_PHONE is not set | 640 | # CONFIG_PHONE is not set |
| 693 | 641 | ||
| 694 | # | 642 | # |
| @@ -775,10 +723,6 @@ CONFIG_UNIX98_PTYS=y | |||
| 775 | # CONFIG_LEGACY_PTYS is not set | 723 | # CONFIG_LEGACY_PTYS is not set |
| 776 | CONFIG_HVC_DRIVER=y | 724 | CONFIG_HVC_DRIVER=y |
| 777 | CONFIG_HVC_BEAT=y | 725 | CONFIG_HVC_BEAT=y |
| 778 | |||
| 779 | # | ||
| 780 | # IPMI | ||
| 781 | # | ||
| 782 | # CONFIG_IPMI_HANDLER is not set | 726 | # CONFIG_IPMI_HANDLER is not set |
| 783 | CONFIG_WATCHDOG=y | 727 | CONFIG_WATCHDOG=y |
| 784 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 728 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -807,10 +751,6 @@ CONFIG_GEN_RTC=y | |||
| 807 | # CONFIG_DRM is not set | 751 | # CONFIG_DRM is not set |
| 808 | # CONFIG_RAW_DRIVER is not set | 752 | # CONFIG_RAW_DRIVER is not set |
| 809 | # CONFIG_HANGCHECK_TIMER is not set | 753 | # CONFIG_HANGCHECK_TIMER is not set |
| 810 | |||
| 811 | # | ||
| 812 | # TPM devices | ||
| 813 | # | ||
| 814 | # CONFIG_TCG_TPM is not set | 754 | # CONFIG_TCG_TPM is not set |
| 815 | CONFIG_DEVPORT=y | 755 | CONFIG_DEVPORT=y |
| 816 | CONFIG_I2C=y | 756 | CONFIG_I2C=y |
| @@ -844,6 +784,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 844 | # CONFIG_I2C_SIS5595 is not set | 784 | # CONFIG_I2C_SIS5595 is not set |
| 845 | # CONFIG_I2C_SIS630 is not set | 785 | # CONFIG_I2C_SIS630 is not set |
| 846 | # CONFIG_I2C_SIS96X is not set | 786 | # CONFIG_I2C_SIS96X is not set |
| 787 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 847 | # CONFIG_I2C_STUB is not set | 788 | # CONFIG_I2C_STUB is not set |
| 848 | # CONFIG_I2C_TINY_USB is not set | 789 | # CONFIG_I2C_TINY_USB is not set |
| 849 | # CONFIG_I2C_VIA is not set | 790 | # CONFIG_I2C_VIA is not set |
| @@ -855,11 +796,13 @@ CONFIG_I2C_ALGOBIT=y | |||
| 855 | # | 796 | # |
| 856 | # CONFIG_SENSORS_DS1337 is not set | 797 | # CONFIG_SENSORS_DS1337 is not set |
| 857 | # CONFIG_SENSORS_DS1374 is not set | 798 | # CONFIG_SENSORS_DS1374 is not set |
| 799 | # CONFIG_DS1682 is not set | ||
| 858 | # CONFIG_SENSORS_EEPROM is not set | 800 | # CONFIG_SENSORS_EEPROM is not set |
| 859 | # CONFIG_SENSORS_PCF8574 is not set | 801 | # CONFIG_SENSORS_PCF8574 is not set |
| 860 | # CONFIG_SENSORS_PCA9539 is not set | 802 | # CONFIG_SENSORS_PCA9539 is not set |
| 861 | # CONFIG_SENSORS_PCF8591 is not set | 803 | # CONFIG_SENSORS_PCF8591 is not set |
| 862 | # CONFIG_SENSORS_MAX6875 is not set | 804 | # CONFIG_SENSORS_MAX6875 is not set |
| 805 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 863 | # CONFIG_I2C_DEBUG_CORE is not set | 806 | # CONFIG_I2C_DEBUG_CORE is not set |
| 864 | # CONFIG_I2C_DEBUG_ALGO is not set | 807 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 865 | # CONFIG_I2C_DEBUG_BUS is not set | 808 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -870,11 +813,8 @@ CONFIG_I2C_ALGOBIT=y | |||
| 870 | # | 813 | # |
| 871 | # CONFIG_SPI is not set | 814 | # CONFIG_SPI is not set |
| 872 | # CONFIG_SPI_MASTER is not set | 815 | # CONFIG_SPI_MASTER is not set |
| 873 | |||
| 874 | # | ||
| 875 | # Dallas's 1-wire bus | ||
| 876 | # | ||
| 877 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 817 | # CONFIG_POWER_SUPPLY is not set | ||
| 878 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| 879 | 819 | ||
| 880 | # | 820 | # |
| @@ -899,6 +839,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 899 | # | 839 | # |
| 900 | # CONFIG_DISPLAY_SUPPORT is not set | 840 | # CONFIG_DISPLAY_SUPPORT is not set |
| 901 | # CONFIG_VGASTATE is not set | 841 | # CONFIG_VGASTATE is not set |
| 842 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 902 | # CONFIG_FB is not set | 843 | # CONFIG_FB is not set |
| 903 | # CONFIG_FB_IBM_GXT4500 is not set | 844 | # CONFIG_FB_IBM_GXT4500 is not set |
| 904 | 845 | ||
| @@ -912,10 +853,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 912 | # Sound | 853 | # Sound |
| 913 | # | 854 | # |
| 914 | # CONFIG_SOUND is not set | 855 | # CONFIG_SOUND is not set |
| 915 | 856 | CONFIG_HID_SUPPORT=y | |
| 916 | # | ||
| 917 | # HID Devices | ||
| 918 | # | ||
| 919 | CONFIG_HID=y | 857 | CONFIG_HID=y |
| 920 | # CONFIG_HID_DEBUG is not set | 858 | # CONFIG_HID_DEBUG is not set |
| 921 | 859 | ||
| @@ -926,10 +864,7 @@ CONFIG_USB_HID=y | |||
| 926 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 864 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 927 | # CONFIG_HID_FF is not set | 865 | # CONFIG_HID_FF is not set |
| 928 | CONFIG_USB_HIDDEV=y | 866 | CONFIG_USB_HIDDEV=y |
| 929 | 867 | CONFIG_USB_SUPPORT=y | |
| 930 | # | ||
| 931 | # USB support | ||
| 932 | # | ||
| 933 | CONFIG_USB_ARCH_HAS_HCD=y | 868 | CONFIG_USB_ARCH_HAS_HCD=y |
| 934 | CONFIG_USB_ARCH_HAS_OHCI=y | 869 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 935 | CONFIG_USB_ARCH_HAS_EHCI=y | 870 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -960,6 +895,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 960 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 895 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 961 | # CONFIG_USB_UHCI_HCD is not set | 896 | # CONFIG_USB_UHCI_HCD is not set |
| 962 | # CONFIG_USB_SL811_HCD is not set | 897 | # CONFIG_USB_SL811_HCD is not set |
| 898 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 963 | 899 | ||
| 964 | # | 900 | # |
| 965 | # USB Device Class drivers | 901 | # USB Device Class drivers |
| @@ -1037,32 +973,9 @@ CONFIG_USB_MON=y | |||
| 1037 | # | 973 | # |
| 1038 | # CONFIG_USB_GADGET is not set | 974 | # CONFIG_USB_GADGET is not set |
| 1039 | # CONFIG_MMC is not set | 975 | # CONFIG_MMC is not set |
| 1040 | |||
| 1041 | # | ||
| 1042 | # LED devices | ||
| 1043 | # | ||
| 1044 | # CONFIG_NEW_LEDS is not set | 976 | # CONFIG_NEW_LEDS is not set |
| 1045 | |||
| 1046 | # | ||
| 1047 | # LED drivers | ||
| 1048 | # | ||
| 1049 | |||
| 1050 | # | ||
| 1051 | # LED Triggers | ||
| 1052 | # | ||
| 1053 | |||
| 1054 | # | ||
| 1055 | # InfiniBand support | ||
| 1056 | # | ||
| 1057 | # CONFIG_INFINIBAND is not set | 977 | # CONFIG_INFINIBAND is not set |
| 1058 | 978 | # CONFIG_EDAC is not set | |
| 1059 | # | ||
| 1060 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1061 | # | ||
| 1062 | |||
| 1063 | # | ||
| 1064 | # Real Time Clock | ||
| 1065 | # | ||
| 1066 | # CONFIG_RTC_CLASS is not set | 979 | # CONFIG_RTC_CLASS is not set |
| 1067 | 980 | ||
| 1068 | # | 981 | # |
| @@ -1079,6 +992,11 @@ CONFIG_USB_MON=y | |||
| 1079 | # | 992 | # |
| 1080 | 993 | ||
| 1081 | # | 994 | # |
| 995 | # Userspace I/O | ||
| 996 | # | ||
| 997 | # CONFIG_UIO is not set | ||
| 998 | |||
| 999 | # | ||
| 1082 | # File systems | 1000 | # File systems |
| 1083 | # | 1001 | # |
| 1084 | CONFIG_EXT2_FS=y | 1002 | CONFIG_EXT2_FS=y |
| @@ -1189,7 +1107,6 @@ CONFIG_SUNRPC=m | |||
| 1189 | # CONFIG_NCP_FS is not set | 1107 | # CONFIG_NCP_FS is not set |
| 1190 | # CONFIG_CODA_FS is not set | 1108 | # CONFIG_CODA_FS is not set |
| 1191 | # CONFIG_AFS_FS is not set | 1109 | # CONFIG_AFS_FS is not set |
| 1192 | # CONFIG_9P_FS is not set | ||
| 1193 | 1110 | ||
| 1194 | # | 1111 | # |
| 1195 | # Partition Types | 1112 | # Partition Types |
| @@ -1271,6 +1188,7 @@ CONFIG_BITREVERSE=y | |||
| 1271 | # CONFIG_CRC16 is not set | 1188 | # CONFIG_CRC16 is not set |
| 1272 | # CONFIG_CRC_ITU_T is not set | 1189 | # CONFIG_CRC_ITU_T is not set |
| 1273 | CONFIG_CRC32=y | 1190 | CONFIG_CRC32=y |
| 1191 | # CONFIG_CRC7 is not set | ||
| 1274 | CONFIG_LIBCRC32C=m | 1192 | CONFIG_LIBCRC32C=m |
| 1275 | CONFIG_ZLIB_INFLATE=m | 1193 | CONFIG_ZLIB_INFLATE=m |
| 1276 | CONFIG_ZLIB_DEFLATE=m | 1194 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1297,6 +1215,7 @@ CONFIG_DEBUG_FS=y | |||
| 1297 | CONFIG_DEBUG_KERNEL=y | 1215 | CONFIG_DEBUG_KERNEL=y |
| 1298 | # CONFIG_DEBUG_SHIRQ is not set | 1216 | # CONFIG_DEBUG_SHIRQ is not set |
| 1299 | CONFIG_DETECT_SOFTLOCKUP=y | 1217 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1218 | CONFIG_SCHED_DEBUG=y | ||
| 1300 | # CONFIG_SCHEDSTATS is not set | 1219 | # CONFIG_SCHEDSTATS is not set |
| 1301 | # CONFIG_TIMER_STATS is not set | 1220 | # CONFIG_TIMER_STATS is not set |
| 1302 | # CONFIG_DEBUG_SLAB is not set | 1221 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1339,10 +1258,6 @@ CONFIG_PPC_EARLY_DEBUG_BEAT=y | |||
| 1339 | # | 1258 | # |
| 1340 | # CONFIG_KEYS is not set | 1259 | # CONFIG_KEYS is not set |
| 1341 | # CONFIG_SECURITY is not set | 1260 | # CONFIG_SECURITY is not set |
| 1342 | |||
| 1343 | # | ||
| 1344 | # Cryptographic options | ||
| 1345 | # | ||
| 1346 | CONFIG_CRYPTO=y | 1261 | CONFIG_CRYPTO=y |
| 1347 | CONFIG_CRYPTO_ALGAPI=y | 1262 | CONFIG_CRYPTO_ALGAPI=y |
| 1348 | CONFIG_CRYPTO_BLKCIPHER=m | 1263 | CONFIG_CRYPTO_BLKCIPHER=m |
| @@ -1382,7 +1297,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1382 | CONFIG_CRYPTO_CRC32C=m | 1297 | CONFIG_CRYPTO_CRC32C=m |
| 1383 | # CONFIG_CRYPTO_CAMELLIA is not set | 1298 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1384 | CONFIG_CRYPTO_TEST=m | 1299 | CONFIG_CRYPTO_TEST=m |
| 1385 | 1300 | # CONFIG_CRYPTO_HW is not set | |
| 1386 | # | ||
| 1387 | # Hardware crypto devices | ||
| 1388 | # | ||
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index 7a747c438536..c3977e334b3b 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig | |||
| @@ -1,9 +1,26 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 12:36:45 2007 | 4 | # Thu Aug 30 16:33:50 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | CONFIG_SMP=y | ||
| 23 | CONFIG_NR_CPUS=4 | ||
| 7 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| @@ -14,62 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 31 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 32 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 33 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 34 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 35 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 36 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 37 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 24 | CONFIG_GENERIC_TBSYNC=y | 43 | CONFIG_GENERIC_TBSYNC=y |
| 25 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 45 | CONFIG_GENERIC_BUG=y |
| 27 | # CONFIG_DEFAULT_UIMAGE is not set | 46 | # CONFIG_DEFAULT_UIMAGE is not set |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | CONFIG_CLASSIC32=y | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | # CONFIG_ALTIVEC is not set | ||
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | CONFIG_SMP=y | ||
| 50 | CONFIG_NR_CPUS=4 | ||
| 51 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 52 | 50 | ||
| 53 | # | 51 | # |
| 54 | # Code maturity level options | 52 | # General setup |
| 55 | # | 53 | # |
| 56 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 57 | CONFIG_LOCK_KERNEL=y | 55 | CONFIG_LOCK_KERNEL=y |
| 58 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 59 | |||
| 60 | # | ||
| 61 | # General setup | ||
| 62 | # | ||
| 63 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 64 | # CONFIG_LOCALVERSION_AUTO is not set | 58 | # CONFIG_LOCALVERSION_AUTO is not set |
| 65 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 66 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 67 | # CONFIG_IPC_NS is not set | ||
| 68 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 69 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 70 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 71 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 72 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 73 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 74 | CONFIG_IKCONFIG=y | 67 | CONFIG_IKCONFIG=y |
| 75 | CONFIG_IKCONFIG_PROC=y | 68 | CONFIG_IKCONFIG_PROC=y |
| @@ -105,10 +98,6 @@ CONFIG_SLAB=y | |||
| 105 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
| 106 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
| 107 | CONFIG_BASE_SMALL=0 | 100 | CONFIG_BASE_SMALL=0 |
| 108 | |||
| 109 | # | ||
| 110 | # Loadable module support | ||
| 111 | # | ||
| 112 | CONFIG_MODULES=y | 101 | CONFIG_MODULES=y |
| 113 | CONFIG_MODULE_UNLOAD=y | 102 | CONFIG_MODULE_UNLOAD=y |
| 114 | CONFIG_MODULE_FORCE_UNLOAD=y | 103 | CONFIG_MODULE_FORCE_UNLOAD=y |
| @@ -116,14 +105,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
| 116 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 105 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 117 | CONFIG_KMOD=y | 106 | CONFIG_KMOD=y |
| 118 | CONFIG_STOP_MACHINE=y | 107 | CONFIG_STOP_MACHINE=y |
| 119 | |||
| 120 | # | ||
| 121 | # Block layer | ||
| 122 | # | ||
| 123 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
| 124 | CONFIG_LBD=y | 109 | CONFIG_LBD=y |
| 125 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 126 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
| 112 | # CONFIG_BLK_DEV_BSG is not set | ||
| 127 | 113 | ||
| 128 | # | 114 | # |
| 129 | # IO Schedulers | 115 | # IO Schedulers |
| @@ -143,7 +129,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 143 | # | 129 | # |
| 144 | CONFIG_PPC_MULTIPLATFORM=y | 130 | CONFIG_PPC_MULTIPLATFORM=y |
| 145 | # CONFIG_EMBEDDED6xx is not set | 131 | # CONFIG_EMBEDDED6xx is not set |
| 146 | # CONFIG_APUS is not set | 132 | # CONFIG_PPC_82xx is not set |
| 133 | # CONFIG_PPC_83xx is not set | ||
| 134 | # CONFIG_PPC_86xx is not set | ||
| 135 | CONFIG_CLASSIC32=y | ||
| 147 | CONFIG_PPC_CHRP=y | 136 | CONFIG_PPC_CHRP=y |
| 148 | # CONFIG_PPC_MPC52xx is not set | 137 | # CONFIG_PPC_MPC52xx is not set |
| 149 | # CONFIG_PPC_MPC5200 is not set | 138 | # CONFIG_PPC_MPC5200 is not set |
| @@ -169,6 +158,7 @@ CONFIG_PPC_MPC106=y | |||
| 169 | # CONFIG_CPU_FREQ is not set | 158 | # CONFIG_CPU_FREQ is not set |
| 170 | # CONFIG_TAU is not set | 159 | # CONFIG_TAU is not set |
| 171 | # CONFIG_CPM2 is not set | 160 | # CONFIG_CPM2 is not set |
| 161 | # CONFIG_FSL_ULI1575 is not set | ||
| 172 | 162 | ||
| 173 | # | 163 | # |
| 174 | # Kernel options | 164 | # Kernel options |
| @@ -200,6 +190,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 200 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 190 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 201 | # CONFIG_RESOURCES_64BIT is not set | 191 | # CONFIG_RESOURCES_64BIT is not set |
| 202 | CONFIG_ZONE_DMA_FLAG=1 | 192 | CONFIG_ZONE_DMA_FLAG=1 |
| 193 | CONFIG_BOUNCE=y | ||
| 194 | CONFIG_VIRT_TO_BUS=y | ||
| 203 | CONFIG_PROC_DEVICETREE=y | 195 | CONFIG_PROC_DEVICETREE=y |
| 204 | # CONFIG_CMDLINE_BOOL is not set | 196 | # CONFIG_CMDLINE_BOOL is not set |
| 205 | # CONFIG_PM is not set | 197 | # CONFIG_PM is not set |
| @@ -214,9 +206,9 @@ CONFIG_ISA=y | |||
| 214 | CONFIG_ZONE_DMA=y | 206 | CONFIG_ZONE_DMA=y |
| 215 | CONFIG_GENERIC_ISA_DMA=y | 207 | CONFIG_GENERIC_ISA_DMA=y |
| 216 | CONFIG_PPC_INDIRECT_PCI=y | 208 | CONFIG_PPC_INDIRECT_PCI=y |
| 217 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 218 | CONFIG_PCI=y | 209 | CONFIG_PCI=y |
| 219 | CONFIG_PCI_DOMAINS=y | 210 | CONFIG_PCI_DOMAINS=y |
| 211 | CONFIG_PCI_SYSCALL=y | ||
| 220 | # CONFIG_PCIEPORTBUS is not set | 212 | # CONFIG_PCIEPORTBUS is not set |
| 221 | CONFIG_ARCH_SUPPORTS_MSI=y | 213 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 222 | # CONFIG_PCI_MSI is not set | 214 | # CONFIG_PCI_MSI is not set |
| @@ -296,6 +288,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 296 | # CONFIG_NF_CONNTRACK_MARK is not set | 288 | # CONFIG_NF_CONNTRACK_MARK is not set |
| 297 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 289 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 298 | # CONFIG_NF_CT_PROTO_SCTP is not set | 290 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 291 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 299 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 292 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| 300 | CONFIG_NF_CONNTRACK_FTP=m | 293 | CONFIG_NF_CONNTRACK_FTP=m |
| 301 | # CONFIG_NF_CONNTRACK_H323 is not set | 294 | # CONFIG_NF_CONNTRACK_H323 is not set |
| @@ -313,6 +306,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 313 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 306 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
| 314 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set | 307 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set |
| 315 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set | 308 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set |
| 309 | # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set | ||
| 316 | # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set | 310 | # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set |
| 317 | # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set | 311 | # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set |
| 318 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 312 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| @@ -332,6 +326,7 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 332 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 326 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 333 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | 327 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set |
| 334 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | 328 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set |
| 329 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
| 335 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 330 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set |
| 336 | 331 | ||
| 337 | # | 332 | # |
| @@ -407,6 +402,7 @@ CONFIG_NF_NAT_SIP=m | |||
| 407 | # CONFIG_MAC80211 is not set | 402 | # CONFIG_MAC80211 is not set |
| 408 | # CONFIG_IEEE80211 is not set | 403 | # CONFIG_IEEE80211 is not set |
| 409 | # CONFIG_RFKILL is not set | 404 | # CONFIG_RFKILL is not set |
| 405 | # CONFIG_NET_9P is not set | ||
| 410 | 406 | ||
| 411 | # | 407 | # |
| 412 | # Device Drivers | 408 | # Device Drivers |
| @@ -421,27 +417,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 421 | # CONFIG_DEBUG_DRIVER is not set | 417 | # CONFIG_DEBUG_DRIVER is not set |
| 422 | # CONFIG_DEBUG_DEVRES is not set | 418 | # CONFIG_DEBUG_DEVRES is not set |
| 423 | # CONFIG_SYS_HYPERVISOR is not set | 419 | # CONFIG_SYS_HYPERVISOR is not set |
| 424 | |||
| 425 | # | ||
| 426 | # Connector - unified userspace <-> kernelspace linker | ||
| 427 | # | ||
| 428 | # CONFIG_CONNECTOR is not set | 420 | # CONFIG_CONNECTOR is not set |
| 429 | # CONFIG_MTD is not set | 421 | # CONFIG_MTD is not set |
| 430 | 422 | CONFIG_OF_DEVICE=y | |
| 431 | # | ||
| 432 | # Parallel port support | ||
| 433 | # | ||
| 434 | # CONFIG_PARPORT is not set | 423 | # CONFIG_PARPORT is not set |
| 435 | |||
| 436 | # | ||
| 437 | # Plug and Play support | ||
| 438 | # | ||
| 439 | # CONFIG_PNP is not set | 424 | # CONFIG_PNP is not set |
| 440 | # CONFIG_PNPACPI is not set | 425 | CONFIG_BLK_DEV=y |
| 441 | |||
| 442 | # | ||
| 443 | # Block devices | ||
| 444 | # | ||
| 445 | CONFIG_BLK_DEV_FD=y | 426 | CONFIG_BLK_DEV_FD=y |
| 446 | # CONFIG_BLK_DEV_XD is not set | 427 | # CONFIG_BLK_DEV_XD is not set |
| 447 | # CONFIG_BLK_CPQ_DA is not set | 428 | # CONFIG_BLK_CPQ_DA is not set |
| @@ -460,14 +441,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 460 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 441 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 461 | # CONFIG_CDROM_PKTCDVD is not set | 442 | # CONFIG_CDROM_PKTCDVD is not set |
| 462 | # CONFIG_ATA_OVER_ETH is not set | 443 | # CONFIG_ATA_OVER_ETH is not set |
| 463 | 444 | CONFIG_MISC_DEVICES=y | |
| 464 | # | ||
| 465 | # Misc devices | ||
| 466 | # | ||
| 467 | # CONFIG_PHANTOM is not set | 445 | # CONFIG_PHANTOM is not set |
| 446 | # CONFIG_EEPROM_93CX6 is not set | ||
| 468 | # CONFIG_SGI_IOC4 is not set | 447 | # CONFIG_SGI_IOC4 is not set |
| 469 | # CONFIG_TIFM_CORE is not set | 448 | # CONFIG_TIFM_CORE is not set |
| 470 | # CONFIG_BLINK is not set | ||
| 471 | CONFIG_IDE=y | 449 | CONFIG_IDE=y |
| 472 | CONFIG_BLK_DEV_IDE=y | 450 | CONFIG_BLK_DEV_IDE=y |
| 473 | 451 | ||
| @@ -533,6 +511,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 533 | # | 511 | # |
| 534 | # CONFIG_RAID_ATTRS is not set | 512 | # CONFIG_RAID_ATTRS is not set |
| 535 | CONFIG_SCSI=y | 513 | CONFIG_SCSI=y |
| 514 | CONFIG_SCSI_DMA=y | ||
| 536 | # CONFIG_SCSI_TGT is not set | 515 | # CONFIG_SCSI_TGT is not set |
| 537 | # CONFIG_SCSI_NETLINK is not set | 516 | # CONFIG_SCSI_NETLINK is not set |
| 538 | CONFIG_SCSI_PROC_FS=y | 517 | CONFIG_SCSI_PROC_FS=y |
| @@ -563,12 +542,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 563 | CONFIG_SCSI_SPI_ATTRS=y | 542 | CONFIG_SCSI_SPI_ATTRS=y |
| 564 | # CONFIG_SCSI_FC_ATTRS is not set | 543 | # CONFIG_SCSI_FC_ATTRS is not set |
| 565 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 544 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 566 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 567 | # CONFIG_SCSI_SAS_LIBSAS is not set | 545 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 568 | 546 | CONFIG_SCSI_LOWLEVEL=y | |
| 569 | # | ||
| 570 | # SCSI low-level drivers | ||
| 571 | # | ||
| 572 | # CONFIG_ISCSI_TCP is not set | 547 | # CONFIG_ISCSI_TCP is not set |
| 573 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 548 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 574 | # CONFIG_SCSI_3W_9XXX is not set | 549 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -622,15 +597,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
| 622 | # CONFIG_SCSI_DEBUG is not set | 597 | # CONFIG_SCSI_DEBUG is not set |
| 623 | # CONFIG_SCSI_SRP is not set | 598 | # CONFIG_SCSI_SRP is not set |
| 624 | # CONFIG_ATA is not set | 599 | # CONFIG_ATA is not set |
| 625 | |||
| 626 | # | ||
| 627 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
| 628 | # | ||
| 629 | # CONFIG_CD_NO_IDESCSI is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # Multi-device support (RAID and LVM) | ||
| 633 | # | ||
| 634 | # CONFIG_MD is not set | 600 | # CONFIG_MD is not set |
| 635 | 601 | ||
| 636 | # | 602 | # |
| @@ -646,27 +612,17 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
| 646 | # | 612 | # |
| 647 | # CONFIG_FIREWIRE is not set | 613 | # CONFIG_FIREWIRE is not set |
| 648 | # CONFIG_IEEE1394 is not set | 614 | # CONFIG_IEEE1394 is not set |
| 649 | |||
| 650 | # | ||
| 651 | # I2O device support | ||
| 652 | # | ||
| 653 | # CONFIG_I2O is not set | 615 | # CONFIG_I2O is not set |
| 654 | # CONFIG_MACINTOSH_DRIVERS is not set | 616 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 655 | |||
| 656 | # | ||
| 657 | # Network device support | ||
| 658 | # | ||
| 659 | CONFIG_NETDEVICES=y | 617 | CONFIG_NETDEVICES=y |
| 618 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 660 | # CONFIG_DUMMY is not set | 619 | # CONFIG_DUMMY is not set |
| 661 | # CONFIG_BONDING is not set | 620 | # CONFIG_BONDING is not set |
| 621 | # CONFIG_MACVLAN is not set | ||
| 662 | # CONFIG_EQUALIZER is not set | 622 | # CONFIG_EQUALIZER is not set |
| 663 | # CONFIG_TUN is not set | 623 | # CONFIG_TUN is not set |
| 664 | # CONFIG_ARCNET is not set | 624 | # CONFIG_ARCNET is not set |
| 665 | # CONFIG_PHYLIB is not set | 625 | # CONFIG_PHYLIB is not set |
| 666 | |||
| 667 | # | ||
| 668 | # Ethernet (10 or 100Mbit) | ||
| 669 | # | ||
| 670 | CONFIG_NET_ETHERNET=y | 626 | CONFIG_NET_ETHERNET=y |
| 671 | CONFIG_MII=y | 627 | CONFIG_MII=y |
| 672 | # CONFIG_HAPPYMEAL is not set | 628 | # CONFIG_HAPPYMEAL is not set |
| @@ -676,10 +632,6 @@ CONFIG_MII=y | |||
| 676 | # CONFIG_LANCE is not set | 632 | # CONFIG_LANCE is not set |
| 677 | # CONFIG_NET_VENDOR_SMC is not set | 633 | # CONFIG_NET_VENDOR_SMC is not set |
| 678 | # CONFIG_NET_VENDOR_RACAL is not set | 634 | # CONFIG_NET_VENDOR_RACAL is not set |
| 679 | |||
| 680 | # | ||
| 681 | # Tulip family network device support | ||
| 682 | # | ||
| 683 | CONFIG_NET_TULIP=y | 635 | CONFIG_NET_TULIP=y |
| 684 | # CONFIG_DE2104X is not set | 636 | # CONFIG_DE2104X is not set |
| 685 | # CONFIG_TULIP is not set | 637 | # CONFIG_TULIP is not set |
| @@ -732,7 +684,6 @@ CONFIG_NETDEV_1000=y | |||
| 732 | # CONFIG_SIS190 is not set | 684 | # CONFIG_SIS190 is not set |
| 733 | # CONFIG_SKGE is not set | 685 | # CONFIG_SKGE is not set |
| 734 | # CONFIG_SKY2 is not set | 686 | # CONFIG_SKY2 is not set |
| 735 | # CONFIG_SK98LIN is not set | ||
| 736 | # CONFIG_VIA_VELOCITY is not set | 687 | # CONFIG_VIA_VELOCITY is not set |
| 737 | # CONFIG_TIGON3 is not set | 688 | # CONFIG_TIGON3 is not set |
| 738 | # CONFIG_BNX2 is not set | 689 | # CONFIG_BNX2 is not set |
| @@ -776,6 +727,7 @@ CONFIG_PPP_DEFLATE=m | |||
| 776 | CONFIG_PPP_BSDCOMP=m | 727 | CONFIG_PPP_BSDCOMP=m |
| 777 | CONFIG_PPP_MPPE=m | 728 | CONFIG_PPP_MPPE=m |
| 778 | CONFIG_PPPOE=m | 729 | CONFIG_PPPOE=m |
| 730 | # CONFIG_PPPOL2TP is not set | ||
| 779 | # CONFIG_SLIP is not set | 731 | # CONFIG_SLIP is not set |
| 780 | CONFIG_SLHC=m | 732 | CONFIG_SLHC=m |
| 781 | # CONFIG_NET_FC is not set | 733 | # CONFIG_NET_FC is not set |
| @@ -783,15 +735,7 @@ CONFIG_SLHC=m | |||
| 783 | # CONFIG_NETCONSOLE is not set | 735 | # CONFIG_NETCONSOLE is not set |
| 784 | # CONFIG_NETPOLL is not set | 736 | # CONFIG_NETPOLL is not set |
| 785 | # CONFIG_NET_POLL_CONTROLLER is not set | 737 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 786 | |||
| 787 | # | ||
| 788 | # ISDN subsystem | ||
| 789 | # | ||
| 790 | # CONFIG_ISDN is not set | 738 | # CONFIG_ISDN is not set |
| 791 | |||
| 792 | # | ||
| 793 | # Telephony Support | ||
| 794 | # | ||
| 795 | # CONFIG_PHONE is not set | 739 | # CONFIG_PHONE is not set |
| 796 | 740 | ||
| 797 | # | 741 | # |
| @@ -892,10 +836,6 @@ CONFIG_LEGACY_PTYS=y | |||
| 892 | CONFIG_LEGACY_PTY_COUNT=256 | 836 | CONFIG_LEGACY_PTY_COUNT=256 |
| 893 | CONFIG_BRIQ_PANEL=m | 837 | CONFIG_BRIQ_PANEL=m |
| 894 | # CONFIG_HVC_RTAS is not set | 838 | # CONFIG_HVC_RTAS is not set |
| 895 | |||
| 896 | # | ||
| 897 | # IPMI | ||
| 898 | # | ||
| 899 | # CONFIG_IPMI_HANDLER is not set | 839 | # CONFIG_IPMI_HANDLER is not set |
| 900 | # CONFIG_WATCHDOG is not set | 840 | # CONFIG_WATCHDOG is not set |
| 901 | # CONFIG_HW_RANDOM is not set | 841 | # CONFIG_HW_RANDOM is not set |
| @@ -908,10 +848,6 @@ CONFIG_GEN_RTC=y | |||
| 908 | # CONFIG_AGP is not set | 848 | # CONFIG_AGP is not set |
| 909 | # CONFIG_DRM is not set | 849 | # CONFIG_DRM is not set |
| 910 | # CONFIG_RAW_DRIVER is not set | 850 | # CONFIG_RAW_DRIVER is not set |
| 911 | |||
| 912 | # | ||
| 913 | # TPM devices | ||
| 914 | # | ||
| 915 | # CONFIG_TCG_TPM is not set | 851 | # CONFIG_TCG_TPM is not set |
| 916 | CONFIG_DEVPORT=y | 852 | CONFIG_DEVPORT=y |
| 917 | CONFIG_I2C=y | 853 | CONFIG_I2C=y |
| @@ -947,6 +883,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 947 | # CONFIG_I2C_SIS5595 is not set | 883 | # CONFIG_I2C_SIS5595 is not set |
| 948 | # CONFIG_I2C_SIS630 is not set | 884 | # CONFIG_I2C_SIS630 is not set |
| 949 | # CONFIG_I2C_SIS96X is not set | 885 | # CONFIG_I2C_SIS96X is not set |
| 886 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 950 | # CONFIG_I2C_STUB is not set | 887 | # CONFIG_I2C_STUB is not set |
| 951 | # CONFIG_I2C_TINY_USB is not set | 888 | # CONFIG_I2C_TINY_USB is not set |
| 952 | # CONFIG_I2C_VIA is not set | 889 | # CONFIG_I2C_VIA is not set |
| @@ -959,12 +896,14 @@ CONFIG_I2C_ALGOBIT=y | |||
| 959 | # | 896 | # |
| 960 | # CONFIG_SENSORS_DS1337 is not set | 897 | # CONFIG_SENSORS_DS1337 is not set |
| 961 | # CONFIG_SENSORS_DS1374 is not set | 898 | # CONFIG_SENSORS_DS1374 is not set |
| 899 | # CONFIG_DS1682 is not set | ||
| 962 | # CONFIG_SENSORS_EEPROM is not set | 900 | # CONFIG_SENSORS_EEPROM is not set |
| 963 | # CONFIG_SENSORS_PCF8574 is not set | 901 | # CONFIG_SENSORS_PCF8574 is not set |
| 964 | # CONFIG_SENSORS_PCA9539 is not set | 902 | # CONFIG_SENSORS_PCA9539 is not set |
| 965 | # CONFIG_SENSORS_PCF8591 is not set | 903 | # CONFIG_SENSORS_PCF8591 is not set |
| 966 | # CONFIG_SENSORS_M41T00 is not set | 904 | # CONFIG_SENSORS_M41T00 is not set |
| 967 | # CONFIG_SENSORS_MAX6875 is not set | 905 | # CONFIG_SENSORS_MAX6875 is not set |
| 906 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 968 | # CONFIG_I2C_DEBUG_CORE is not set | 907 | # CONFIG_I2C_DEBUG_CORE is not set |
| 969 | # CONFIG_I2C_DEBUG_ALGO is not set | 908 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 970 | # CONFIG_I2C_DEBUG_BUS is not set | 909 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -975,11 +914,8 @@ CONFIG_I2C_ALGOBIT=y | |||
| 975 | # | 914 | # |
| 976 | # CONFIG_SPI is not set | 915 | # CONFIG_SPI is not set |
| 977 | # CONFIG_SPI_MASTER is not set | 916 | # CONFIG_SPI_MASTER is not set |
| 978 | |||
| 979 | # | ||
| 980 | # Dallas's 1-wire bus | ||
| 981 | # | ||
| 982 | # CONFIG_W1 is not set | 917 | # CONFIG_W1 is not set |
| 918 | # CONFIG_POWER_SUPPLY is not set | ||
| 983 | # CONFIG_HWMON is not set | 919 | # CONFIG_HWMON is not set |
| 984 | 920 | ||
| 985 | # | 921 | # |
| @@ -998,8 +934,8 @@ CONFIG_I2C_ALGOBIT=y | |||
| 998 | # Graphics support | 934 | # Graphics support |
| 999 | # | 935 | # |
| 1000 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 936 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1001 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1002 | CONFIG_LCD_CLASS_DEVICE=m | 937 | CONFIG_LCD_CLASS_DEVICE=m |
| 938 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1003 | 939 | ||
| 1004 | # | 940 | # |
| 1005 | # Display device support | 941 | # Display device support |
| @@ -1010,6 +946,7 @@ CONFIG_DISPLAY_SUPPORT=m | |||
| 1010 | # Display hardware drivers | 946 | # Display hardware drivers |
| 1011 | # | 947 | # |
| 1012 | # CONFIG_VGASTATE is not set | 948 | # CONFIG_VGASTATE is not set |
| 949 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1013 | CONFIG_FB=y | 950 | CONFIG_FB=y |
| 1014 | CONFIG_FIRMWARE_EDID=y | 951 | CONFIG_FIRMWARE_EDID=y |
| 1015 | CONFIG_FB_DDC=y | 952 | CONFIG_FB_DDC=y |
| @@ -1080,6 +1017,7 @@ CONFIG_VGA_CONSOLE=y | |||
| 1080 | # CONFIG_MDA_CONSOLE is not set | 1017 | # CONFIG_MDA_CONSOLE is not set |
| 1081 | CONFIG_DUMMY_CONSOLE=y | 1018 | CONFIG_DUMMY_CONSOLE=y |
| 1082 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1019 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1020 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1083 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1021 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1084 | # CONFIG_FONTS is not set | 1022 | # CONFIG_FONTS is not set |
| 1085 | CONFIG_FONT_8x8=y | 1023 | CONFIG_FONT_8x8=y |
| @@ -1093,10 +1031,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 1093 | # Sound | 1031 | # Sound |
| 1094 | # | 1032 | # |
| 1095 | # CONFIG_SOUND is not set | 1033 | # CONFIG_SOUND is not set |
| 1096 | 1034 | CONFIG_HID_SUPPORT=y | |
| 1097 | # | ||
| 1098 | # HID Devices | ||
| 1099 | # | ||
| 1100 | CONFIG_HID=y | 1035 | CONFIG_HID=y |
| 1101 | # CONFIG_HID_DEBUG is not set | 1036 | # CONFIG_HID_DEBUG is not set |
| 1102 | 1037 | ||
| @@ -1107,10 +1042,7 @@ CONFIG_USB_HID=y | |||
| 1107 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1042 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1108 | # CONFIG_HID_FF is not set | 1043 | # CONFIG_HID_FF is not set |
| 1109 | # CONFIG_USB_HIDDEV is not set | 1044 | # CONFIG_USB_HIDDEV is not set |
| 1110 | 1045 | CONFIG_USB_SUPPORT=y | |
| 1111 | # | ||
| 1112 | # USB support | ||
| 1113 | # | ||
| 1114 | CONFIG_USB_ARCH_HAS_HCD=y | 1046 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1115 | CONFIG_USB_ARCH_HAS_OHCI=y | 1047 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1116 | CONFIG_USB_ARCH_HAS_EHCI=y | 1048 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1132,7 +1064,6 @@ CONFIG_USB_EHCI_HCD=m | |||
| 1132 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 1064 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 1133 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1065 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1134 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1066 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1135 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1136 | # CONFIG_USB_ISP116X_HCD is not set | 1067 | # CONFIG_USB_ISP116X_HCD is not set |
| 1137 | CONFIG_USB_OHCI_HCD=y | 1068 | CONFIG_USB_OHCI_HCD=y |
| 1138 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1069 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| @@ -1141,6 +1072,7 @@ CONFIG_USB_OHCI_HCD=y | |||
| 1141 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1072 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1142 | CONFIG_USB_UHCI_HCD=y | 1073 | CONFIG_USB_UHCI_HCD=y |
| 1143 | # CONFIG_USB_SL811_HCD is not set | 1074 | # CONFIG_USB_SL811_HCD is not set |
| 1075 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1144 | 1076 | ||
| 1145 | # | 1077 | # |
| 1146 | # USB Device Class drivers | 1078 | # USB Device Class drivers |
| @@ -1219,32 +1151,9 @@ CONFIG_USB_MON=y | |||
| 1219 | # | 1151 | # |
| 1220 | # CONFIG_USB_GADGET is not set | 1152 | # CONFIG_USB_GADGET is not set |
| 1221 | # CONFIG_MMC is not set | 1153 | # CONFIG_MMC is not set |
| 1222 | |||
| 1223 | # | ||
| 1224 | # LED devices | ||
| 1225 | # | ||
| 1226 | # CONFIG_NEW_LEDS is not set | 1154 | # CONFIG_NEW_LEDS is not set |
| 1227 | |||
| 1228 | # | ||
| 1229 | # LED drivers | ||
| 1230 | # | ||
| 1231 | |||
| 1232 | # | ||
| 1233 | # LED Triggers | ||
| 1234 | # | ||
| 1235 | |||
| 1236 | # | ||
| 1237 | # InfiniBand support | ||
| 1238 | # | ||
| 1239 | # CONFIG_INFINIBAND is not set | 1155 | # CONFIG_INFINIBAND is not set |
| 1240 | 1156 | # CONFIG_EDAC is not set | |
| 1241 | # | ||
| 1242 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1243 | # | ||
| 1244 | |||
| 1245 | # | ||
| 1246 | # Real Time Clock | ||
| 1247 | # | ||
| 1248 | # CONFIG_RTC_CLASS is not set | 1157 | # CONFIG_RTC_CLASS is not set |
| 1249 | 1158 | ||
| 1250 | # | 1159 | # |
| @@ -1261,6 +1170,11 @@ CONFIG_USB_MON=y | |||
| 1261 | # | 1170 | # |
| 1262 | 1171 | ||
| 1263 | # | 1172 | # |
| 1173 | # Userspace I/O | ||
| 1174 | # | ||
| 1175 | # CONFIG_UIO is not set | ||
| 1176 | |||
| 1177 | # | ||
| 1264 | # File systems | 1178 | # File systems |
| 1265 | # | 1179 | # |
| 1266 | CONFIG_EXT2_FS=y | 1180 | CONFIG_EXT2_FS=y |
| @@ -1348,7 +1262,6 @@ CONFIG_RAMFS=y | |||
| 1348 | # CONFIG_NCP_FS is not set | 1262 | # CONFIG_NCP_FS is not set |
| 1349 | # CONFIG_CODA_FS is not set | 1263 | # CONFIG_CODA_FS is not set |
| 1350 | # CONFIG_AFS_FS is not set | 1264 | # CONFIG_AFS_FS is not set |
| 1351 | # CONFIG_9P_FS is not set | ||
| 1352 | 1265 | ||
| 1353 | # | 1266 | # |
| 1354 | # Partition Types | 1267 | # Partition Types |
| @@ -1430,6 +1343,7 @@ CONFIG_CRC_CCITT=m | |||
| 1430 | # CONFIG_CRC16 is not set | 1343 | # CONFIG_CRC16 is not set |
| 1431 | # CONFIG_CRC_ITU_T is not set | 1344 | # CONFIG_CRC_ITU_T is not set |
| 1432 | CONFIG_CRC32=y | 1345 | CONFIG_CRC32=y |
| 1346 | # CONFIG_CRC7 is not set | ||
| 1433 | # CONFIG_LIBCRC32C is not set | 1347 | # CONFIG_LIBCRC32C is not set |
| 1434 | CONFIG_ZLIB_INFLATE=m | 1348 | CONFIG_ZLIB_INFLATE=m |
| 1435 | CONFIG_ZLIB_DEFLATE=m | 1349 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1456,6 +1370,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1456 | CONFIG_DEBUG_KERNEL=y | 1370 | CONFIG_DEBUG_KERNEL=y |
| 1457 | # CONFIG_DEBUG_SHIRQ is not set | 1371 | # CONFIG_DEBUG_SHIRQ is not set |
| 1458 | CONFIG_DETECT_SOFTLOCKUP=y | 1372 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1373 | CONFIG_SCHED_DEBUG=y | ||
| 1459 | # CONFIG_SCHEDSTATS is not set | 1374 | # CONFIG_SCHEDSTATS is not set |
| 1460 | # CONFIG_TIMER_STATS is not set | 1375 | # CONFIG_TIMER_STATS is not set |
| 1461 | # CONFIG_DEBUG_SLAB is not set | 1376 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1490,10 +1405,6 @@ CONFIG_XMON_DISASSEMBLY=y | |||
| 1490 | # | 1405 | # |
| 1491 | # CONFIG_KEYS is not set | 1406 | # CONFIG_KEYS is not set |
| 1492 | # CONFIG_SECURITY is not set | 1407 | # CONFIG_SECURITY is not set |
| 1493 | |||
| 1494 | # | ||
| 1495 | # Cryptographic options | ||
| 1496 | # | ||
| 1497 | CONFIG_CRYPTO=y | 1408 | CONFIG_CRYPTO=y |
| 1498 | CONFIG_CRYPTO_ALGAPI=m | 1409 | CONFIG_CRYPTO_ALGAPI=m |
| 1499 | CONFIG_CRYPTO_BLKCIPHER=m | 1410 | CONFIG_CRYPTO_BLKCIPHER=m |
| @@ -1531,7 +1442,4 @@ CONFIG_CRYPTO_ARC4=m | |||
| 1531 | # CONFIG_CRYPTO_CRC32C is not set | 1442 | # CONFIG_CRYPTO_CRC32C is not set |
| 1532 | # CONFIG_CRYPTO_CAMELLIA is not set | 1443 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1533 | # CONFIG_CRYPTO_TEST is not set | 1444 | # CONFIG_CRYPTO_TEST is not set |
| 1534 | 1445 | # CONFIG_CRYPTO_HW is not set | |
| 1535 | # | ||
| 1536 | # Hardware crypto devices | ||
| 1537 | # | ||
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig index 5762cddfc148..ebb8167608b8 100644 --- a/arch/powerpc/configs/ebony_defconfig +++ b/arch/powerpc/configs/ebony_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 12:38:33 2007 | 4 | # Thu Aug 30 16:34:11 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | CONFIG_44x=y | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_4xx=y | ||
| 18 | CONFIG_BOOKE=y | ||
| 19 | CONFIG_PTE_64BIT=y | ||
| 20 | CONFIG_PHYS_64BIT=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,39 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 41 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | CONFIG_44x=y | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_PPC_DCR_NATIVE=y | 46 | CONFIG_PPC_DCR_NATIVE=y |
| 42 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 43 | CONFIG_PPC_DCR=y | 48 | CONFIG_PPC_DCR=y |
| 44 | CONFIG_4xx=y | ||
| 45 | CONFIG_BOOKE=y | ||
| 46 | CONFIG_PTE_64BIT=y | ||
| 47 | CONFIG_PHYS_64BIT=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 50 | ||
| 52 | # | 51 | # |
| 53 | # Code maturity level options | 52 | # General setup |
| 54 | # | 53 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 67 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 68 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -102,24 +96,17 @@ CONFIG_SLAB=y | |||
| 102 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
| 105 | |||
| 106 | # | ||
| 107 | # Loadable module support | ||
| 108 | # | ||
| 109 | CONFIG_MODULES=y | 99 | CONFIG_MODULES=y |
| 110 | CONFIG_MODULE_UNLOAD=y | 100 | CONFIG_MODULE_UNLOAD=y |
| 111 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 101 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 112 | # CONFIG_MODVERSIONS is not set | 102 | # CONFIG_MODVERSIONS is not set |
| 113 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 103 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 114 | CONFIG_KMOD=y | 104 | CONFIG_KMOD=y |
| 115 | |||
| 116 | # | ||
| 117 | # Block layer | ||
| 118 | # | ||
| 119 | CONFIG_BLOCK=y | 105 | CONFIG_BLOCK=y |
| 120 | CONFIG_LBD=y | 106 | CONFIG_LBD=y |
| 121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 122 | # CONFIG_LSF is not set | 108 | # CONFIG_LSF is not set |
| 109 | # CONFIG_BLK_DEV_BSG is not set | ||
| 123 | 110 | ||
| 124 | # | 111 | # |
| 125 | # IO Schedulers | 112 | # IO Schedulers |
| @@ -155,6 +142,7 @@ CONFIG_440GP=y | |||
| 155 | # CONFIG_GENERIC_IOMAP is not set | 142 | # CONFIG_GENERIC_IOMAP is not set |
| 156 | # CONFIG_CPU_FREQ is not set | 143 | # CONFIG_CPU_FREQ is not set |
| 157 | # CONFIG_CPM2 is not set | 144 | # CONFIG_CPM2 is not set |
| 145 | # CONFIG_FSL_ULI1575 is not set | ||
| 158 | 146 | ||
| 159 | # | 147 | # |
| 160 | # Kernel options | 148 | # Kernel options |
| @@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 184 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 185 | CONFIG_RESOURCES_64BIT=y | 173 | CONFIG_RESOURCES_64BIT=y |
| 186 | CONFIG_ZONE_DMA_FLAG=1 | 174 | CONFIG_ZONE_DMA_FLAG=1 |
| 175 | CONFIG_BOUNCE=y | ||
| 176 | CONFIG_VIRT_TO_BUS=y | ||
| 187 | CONFIG_PROC_DEVICETREE=y | 177 | CONFIG_PROC_DEVICETREE=y |
| 188 | # CONFIG_CMDLINE_BOOL is not set | 178 | # CONFIG_CMDLINE_BOOL is not set |
| 189 | CONFIG_SECCOMP=y | 179 | CONFIG_SECCOMP=y |
| @@ -196,9 +186,9 @@ CONFIG_ISA_DMA_API=y | |||
| 196 | # | 186 | # |
| 197 | CONFIG_ZONE_DMA=y | 187 | CONFIG_ZONE_DMA=y |
| 198 | CONFIG_PPC_INDIRECT_PCI=y | 188 | CONFIG_PPC_INDIRECT_PCI=y |
| 199 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 200 | CONFIG_PCI=y | 189 | CONFIG_PCI=y |
| 201 | CONFIG_PCI_DOMAINS=y | 190 | CONFIG_PCI_DOMAINS=y |
| 191 | CONFIG_PCI_SYSCALL=y | ||
| 202 | # CONFIG_PCIEPORTBUS is not set | 192 | # CONFIG_PCIEPORTBUS is not set |
| 203 | CONFIG_ARCH_SUPPORTS_MSI=y | 193 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 204 | # CONFIG_PCI_MSI is not set | 194 | # CONFIG_PCI_MSI is not set |
| @@ -306,6 +296,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 306 | # CONFIG_MAC80211 is not set | 296 | # CONFIG_MAC80211 is not set |
| 307 | # CONFIG_IEEE80211 is not set | 297 | # CONFIG_IEEE80211 is not set |
| 308 | # CONFIG_RFKILL is not set | 298 | # CONFIG_RFKILL is not set |
| 299 | # CONFIG_NET_9P is not set | ||
| 309 | 300 | ||
| 310 | # | 301 | # |
| 311 | # Device Drivers | 302 | # Device Drivers |
| @@ -320,27 +311,12 @@ CONFIG_FW_LOADER=y | |||
| 320 | # CONFIG_DEBUG_DRIVER is not set | 311 | # CONFIG_DEBUG_DRIVER is not set |
| 321 | # CONFIG_DEBUG_DEVRES is not set | 312 | # CONFIG_DEBUG_DEVRES is not set |
| 322 | # CONFIG_SYS_HYPERVISOR is not set | 313 | # CONFIG_SYS_HYPERVISOR is not set |
| 323 | |||
| 324 | # | ||
| 325 | # Connector - unified userspace <-> kernelspace linker | ||
| 326 | # | ||
| 327 | CONFIG_CONNECTOR=y | 314 | CONFIG_CONNECTOR=y |
| 328 | CONFIG_PROC_EVENTS=y | 315 | CONFIG_PROC_EVENTS=y |
| 329 | # CONFIG_MTD is not set | 316 | # CONFIG_MTD is not set |
| 330 | 317 | CONFIG_OF_DEVICE=y | |
| 331 | # | ||
| 332 | # Parallel port support | ||
| 333 | # | ||
| 334 | # CONFIG_PARPORT is not set | 318 | # CONFIG_PARPORT is not set |
| 335 | 319 | CONFIG_BLK_DEV=y | |
| 336 | # | ||
| 337 | # Plug and Play support | ||
| 338 | # | ||
| 339 | # CONFIG_PNPACPI is not set | ||
| 340 | |||
| 341 | # | ||
| 342 | # Block devices | ||
| 343 | # | ||
| 344 | # CONFIG_BLK_DEV_FD is not set | 320 | # CONFIG_BLK_DEV_FD is not set |
| 345 | # CONFIG_BLK_CPQ_DA is not set | 321 | # CONFIG_BLK_CPQ_DA is not set |
| 346 | # CONFIG_BLK_CPQ_CISS_DA is not set | 322 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -356,14 +332,12 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
| 356 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 332 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 357 | # CONFIG_CDROM_PKTCDVD is not set | 333 | # CONFIG_CDROM_PKTCDVD is not set |
| 358 | # CONFIG_ATA_OVER_ETH is not set | 334 | # CONFIG_ATA_OVER_ETH is not set |
| 359 | 335 | # CONFIG_XILINX_SYSACE is not set | |
| 360 | # | 336 | CONFIG_MISC_DEVICES=y |
| 361 | # Misc devices | ||
| 362 | # | ||
| 363 | # CONFIG_PHANTOM is not set | 337 | # CONFIG_PHANTOM is not set |
| 338 | # CONFIG_EEPROM_93CX6 is not set | ||
| 364 | # CONFIG_SGI_IOC4 is not set | 339 | # CONFIG_SGI_IOC4 is not set |
| 365 | # CONFIG_TIFM_CORE is not set | 340 | # CONFIG_TIFM_CORE is not set |
| 366 | # CONFIG_BLINK is not set | ||
| 367 | # CONFIG_IDE is not set | 341 | # CONFIG_IDE is not set |
| 368 | 342 | ||
| 369 | # | 343 | # |
| @@ -371,12 +345,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 371 | # | 345 | # |
| 372 | # CONFIG_RAID_ATTRS is not set | 346 | # CONFIG_RAID_ATTRS is not set |
| 373 | # CONFIG_SCSI is not set | 347 | # CONFIG_SCSI is not set |
| 348 | # CONFIG_SCSI_DMA is not set | ||
| 374 | # CONFIG_SCSI_NETLINK is not set | 349 | # CONFIG_SCSI_NETLINK is not set |
| 375 | # CONFIG_ATA is not set | 350 | # CONFIG_ATA is not set |
| 376 | |||
| 377 | # | ||
| 378 | # Multi-device support (RAID and LVM) | ||
| 379 | # | ||
| 380 | # CONFIG_MD is not set | 351 | # CONFIG_MD is not set |
| 381 | 352 | ||
| 382 | # | 353 | # |
| @@ -389,35 +360,17 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 389 | # | 360 | # |
| 390 | # CONFIG_FIREWIRE is not set | 361 | # CONFIG_FIREWIRE is not set |
| 391 | # CONFIG_IEEE1394 is not set | 362 | # CONFIG_IEEE1394 is not set |
| 392 | |||
| 393 | # | ||
| 394 | # I2O device support | ||
| 395 | # | ||
| 396 | # CONFIG_I2O is not set | 363 | # CONFIG_I2O is not set |
| 397 | # CONFIG_MACINTOSH_DRIVERS is not set | 364 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 398 | |||
| 399 | # | ||
| 400 | # Network device support | ||
| 401 | # | ||
| 402 | CONFIG_NETDEVICES=y | 365 | CONFIG_NETDEVICES=y |
| 366 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 403 | # CONFIG_DUMMY is not set | 367 | # CONFIG_DUMMY is not set |
| 404 | # CONFIG_BONDING is not set | 368 | # CONFIG_BONDING is not set |
| 369 | # CONFIG_MACVLAN is not set | ||
| 405 | # CONFIG_EQUALIZER is not set | 370 | # CONFIG_EQUALIZER is not set |
| 406 | # CONFIG_TUN is not set | 371 | # CONFIG_TUN is not set |
| 407 | # CONFIG_ARCNET is not set | 372 | # CONFIG_ARCNET is not set |
| 408 | |||
| 409 | # | ||
| 410 | # Ethernet (10 or 100Mbit) | ||
| 411 | # | ||
| 412 | # CONFIG_NET_ETHERNET is not set | 373 | # CONFIG_NET_ETHERNET is not set |
| 413 | CONFIG_IBM_EMAC=y | ||
| 414 | CONFIG_IBM_EMAC_RXB=128 | ||
| 415 | CONFIG_IBM_EMAC_TXB=64 | ||
| 416 | CONFIG_IBM_EMAC_POLL_WEIGHT=32 | ||
| 417 | CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256 | ||
| 418 | CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 | ||
| 419 | # CONFIG_IBM_EMAC_DEBUG is not set | ||
| 420 | CONFIG_IBM_EMAC_ZMII=y | ||
| 421 | CONFIG_NETDEV_1000=y | 374 | CONFIG_NETDEV_1000=y |
| 422 | # CONFIG_ACENIC is not set | 375 | # CONFIG_ACENIC is not set |
| 423 | # CONFIG_DL2K is not set | 376 | # CONFIG_DL2K is not set |
| @@ -429,7 +382,6 @@ CONFIG_NETDEV_1000=y | |||
| 429 | # CONFIG_SIS190 is not set | 382 | # CONFIG_SIS190 is not set |
| 430 | # CONFIG_SKGE is not set | 383 | # CONFIG_SKGE is not set |
| 431 | # CONFIG_SKY2 is not set | 384 | # CONFIG_SKY2 is not set |
| 432 | # CONFIG_SK98LIN is not set | ||
| 433 | # CONFIG_VIA_VELOCITY is not set | 385 | # CONFIG_VIA_VELOCITY is not set |
| 434 | # CONFIG_TIGON3 is not set | 386 | # CONFIG_TIGON3 is not set |
| 435 | # CONFIG_BNX2 is not set | 387 | # CONFIG_BNX2 is not set |
| @@ -459,15 +411,7 @@ CONFIG_NETDEV_10000=y | |||
| 459 | # CONFIG_NETCONSOLE is not set | 411 | # CONFIG_NETCONSOLE is not set |
| 460 | # CONFIG_NETPOLL is not set | 412 | # CONFIG_NETPOLL is not set |
| 461 | # CONFIG_NET_POLL_CONTROLLER is not set | 413 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 462 | |||
| 463 | # | ||
| 464 | # ISDN subsystem | ||
| 465 | # | ||
| 466 | # CONFIG_ISDN is not set | 414 | # CONFIG_ISDN is not set |
| 467 | |||
| 468 | # | ||
| 469 | # Telephony Support | ||
| 470 | # | ||
| 471 | # CONFIG_PHONE is not set | 415 | # CONFIG_PHONE is not set |
| 472 | 416 | ||
| 473 | # | 417 | # |
| @@ -512,10 +456,6 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
| 512 | CONFIG_UNIX98_PTYS=y | 456 | CONFIG_UNIX98_PTYS=y |
| 513 | CONFIG_LEGACY_PTYS=y | 457 | CONFIG_LEGACY_PTYS=y |
| 514 | CONFIG_LEGACY_PTY_COUNT=256 | 458 | CONFIG_LEGACY_PTY_COUNT=256 |
| 515 | |||
| 516 | # | ||
| 517 | # IPMI | ||
| 518 | # | ||
| 519 | # CONFIG_IPMI_HANDLER is not set | 459 | # CONFIG_IPMI_HANDLER is not set |
| 520 | # CONFIG_WATCHDOG is not set | 460 | # CONFIG_WATCHDOG is not set |
| 521 | # CONFIG_HW_RANDOM is not set | 461 | # CONFIG_HW_RANDOM is not set |
| @@ -526,10 +466,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 526 | # CONFIG_AGP is not set | 466 | # CONFIG_AGP is not set |
| 527 | # CONFIG_DRM is not set | 467 | # CONFIG_DRM is not set |
| 528 | # CONFIG_RAW_DRIVER is not set | 468 | # CONFIG_RAW_DRIVER is not set |
| 529 | |||
| 530 | # | ||
| 531 | # TPM devices | ||
| 532 | # | ||
| 533 | # CONFIG_TCG_TPM is not set | 469 | # CONFIG_TCG_TPM is not set |
| 534 | CONFIG_DEVPORT=y | 470 | CONFIG_DEVPORT=y |
| 535 | # CONFIG_I2C is not set | 471 | # CONFIG_I2C is not set |
| @@ -539,11 +475,8 @@ CONFIG_DEVPORT=y | |||
| 539 | # | 475 | # |
| 540 | # CONFIG_SPI is not set | 476 | # CONFIG_SPI is not set |
| 541 | # CONFIG_SPI_MASTER is not set | 477 | # CONFIG_SPI_MASTER is not set |
| 542 | |||
| 543 | # | ||
| 544 | # Dallas's 1-wire bus | ||
| 545 | # | ||
| 546 | # CONFIG_W1 is not set | 478 | # CONFIG_W1 is not set |
| 479 | # CONFIG_POWER_SUPPLY is not set | ||
| 547 | # CONFIG_HWMON is not set | 480 | # CONFIG_HWMON is not set |
| 548 | 481 | ||
| 549 | # | 482 | # |
| @@ -568,6 +501,7 @@ CONFIG_DEVPORT=y | |||
| 568 | # | 501 | # |
| 569 | # CONFIG_DISPLAY_SUPPORT is not set | 502 | # CONFIG_DISPLAY_SUPPORT is not set |
| 570 | # CONFIG_VGASTATE is not set | 503 | # CONFIG_VGASTATE is not set |
| 504 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 571 | # CONFIG_FB is not set | 505 | # CONFIG_FB is not set |
| 572 | # CONFIG_FB_IBM_GXT4500 is not set | 506 | # CONFIG_FB_IBM_GXT4500 is not set |
| 573 | 507 | ||
| @@ -575,10 +509,7 @@ CONFIG_DEVPORT=y | |||
| 575 | # Sound | 509 | # Sound |
| 576 | # | 510 | # |
| 577 | # CONFIG_SOUND is not set | 511 | # CONFIG_SOUND is not set |
| 578 | 512 | CONFIG_USB_SUPPORT=y | |
| 579 | # | ||
| 580 | # USB support | ||
| 581 | # | ||
| 582 | CONFIG_USB_ARCH_HAS_HCD=y | 513 | CONFIG_USB_ARCH_HAS_HCD=y |
| 583 | CONFIG_USB_ARCH_HAS_OHCI=y | 514 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 584 | CONFIG_USB_ARCH_HAS_EHCI=y | 515 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -593,32 +524,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 593 | # | 524 | # |
| 594 | # CONFIG_USB_GADGET is not set | 525 | # CONFIG_USB_GADGET is not set |
| 595 | # CONFIG_MMC is not set | 526 | # CONFIG_MMC is not set |
| 596 | |||
| 597 | # | ||
| 598 | # LED devices | ||
| 599 | # | ||
| 600 | # CONFIG_NEW_LEDS is not set | 527 | # CONFIG_NEW_LEDS is not set |
| 601 | |||
| 602 | # | ||
| 603 | # LED drivers | ||
| 604 | # | ||
| 605 | |||
| 606 | # | ||
| 607 | # LED Triggers | ||
| 608 | # | ||
| 609 | |||
| 610 | # | ||
| 611 | # InfiniBand support | ||
| 612 | # | ||
| 613 | # CONFIG_INFINIBAND is not set | 528 | # CONFIG_INFINIBAND is not set |
| 614 | 529 | # CONFIG_EDAC is not set | |
| 615 | # | ||
| 616 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 617 | # | ||
| 618 | |||
| 619 | # | ||
| 620 | # Real Time Clock | ||
| 621 | # | ||
| 622 | # CONFIG_RTC_CLASS is not set | 530 | # CONFIG_RTC_CLASS is not set |
| 623 | 531 | ||
| 624 | # | 532 | # |
| @@ -635,6 +543,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 635 | # | 543 | # |
| 636 | 544 | ||
| 637 | # | 545 | # |
| 546 | # Userspace I/O | ||
| 547 | # | ||
| 548 | # CONFIG_UIO is not set | ||
| 549 | |||
| 550 | # | ||
| 638 | # File systems | 551 | # File systems |
| 639 | # | 552 | # |
| 640 | CONFIG_EXT2_FS=y | 553 | CONFIG_EXT2_FS=y |
| @@ -723,7 +636,6 @@ CONFIG_SUNRPC=y | |||
| 723 | # CONFIG_NCP_FS is not set | 636 | # CONFIG_NCP_FS is not set |
| 724 | # CONFIG_CODA_FS is not set | 637 | # CONFIG_CODA_FS is not set |
| 725 | # CONFIG_AFS_FS is not set | 638 | # CONFIG_AFS_FS is not set |
| 726 | # CONFIG_9P_FS is not set | ||
| 727 | 639 | ||
| 728 | # | 640 | # |
| 729 | # Partition Types | 641 | # Partition Types |
| @@ -750,6 +662,7 @@ CONFIG_BITREVERSE=y | |||
| 750 | # CONFIG_CRC16 is not set | 662 | # CONFIG_CRC16 is not set |
| 751 | # CONFIG_CRC_ITU_T is not set | 663 | # CONFIG_CRC_ITU_T is not set |
| 752 | CONFIG_CRC32=y | 664 | CONFIG_CRC32=y |
| 665 | # CONFIG_CRC7 is not set | ||
| 753 | # CONFIG_LIBCRC32C is not set | 666 | # CONFIG_LIBCRC32C is not set |
| 754 | CONFIG_ZLIB_INFLATE=y | 667 | CONFIG_ZLIB_INFLATE=y |
| 755 | CONFIG_PLIST=y | 668 | CONFIG_PLIST=y |
| @@ -774,6 +687,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 774 | CONFIG_DEBUG_KERNEL=y | 687 | CONFIG_DEBUG_KERNEL=y |
| 775 | # CONFIG_DEBUG_SHIRQ is not set | 688 | # CONFIG_DEBUG_SHIRQ is not set |
| 776 | CONFIG_DETECT_SOFTLOCKUP=y | 689 | CONFIG_DETECT_SOFTLOCKUP=y |
| 690 | CONFIG_SCHED_DEBUG=y | ||
| 777 | # CONFIG_SCHEDSTATS is not set | 691 | # CONFIG_SCHEDSTATS is not set |
| 778 | # CONFIG_TIMER_STATS is not set | 692 | # CONFIG_TIMER_STATS is not set |
| 779 | # CONFIG_DEBUG_SLAB is not set | 693 | # CONFIG_DEBUG_SLAB is not set |
| @@ -796,7 +710,6 @@ CONFIG_FORCED_INLINING=y | |||
| 796 | # CONFIG_DEBUG_PAGEALLOC is not set | 710 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 797 | # CONFIG_DEBUGGER is not set | 711 | # CONFIG_DEBUGGER is not set |
| 798 | # CONFIG_BDI_SWITCH is not set | 712 | # CONFIG_BDI_SWITCH is not set |
| 799 | # CONFIG_BOOTX_TEXT is not set | ||
| 800 | # CONFIG_PPC_EARLY_DEBUG is not set | 713 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 801 | 714 | ||
| 802 | # | 715 | # |
| @@ -804,10 +717,6 @@ CONFIG_FORCED_INLINING=y | |||
| 804 | # | 717 | # |
| 805 | # CONFIG_KEYS is not set | 718 | # CONFIG_KEYS is not set |
| 806 | # CONFIG_SECURITY is not set | 719 | # CONFIG_SECURITY is not set |
| 807 | |||
| 808 | # | ||
| 809 | # Cryptographic options | ||
| 810 | # | ||
| 811 | CONFIG_CRYPTO=y | 720 | CONFIG_CRYPTO=y |
| 812 | CONFIG_CRYPTO_ALGAPI=y | 721 | CONFIG_CRYPTO_ALGAPI=y |
| 813 | CONFIG_CRYPTO_BLKCIPHER=y | 722 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -845,7 +754,4 @@ CONFIG_CRYPTO_DES=y | |||
| 845 | # CONFIG_CRYPTO_CRC32C is not set | 754 | # CONFIG_CRYPTO_CRC32C is not set |
| 846 | # CONFIG_CRYPTO_CAMELLIA is not set | 755 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 847 | # CONFIG_CRYPTO_TEST is not set | 756 | # CONFIG_CRYPTO_TEST is not set |
| 848 | 757 | # CONFIG_CRYPTO_HW is not set | |
| 849 | # | ||
| 850 | # Hardware crypto devices | ||
| 851 | # | ||
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index a217f4ebcf71..a655d87b3f8b 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
| @@ -1,9 +1,22 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 12:38:34 2007 | 4 | # Thu Aug 30 16:34:59 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_POWER4_ONLY=y | ||
| 12 | CONFIG_POWER4=y | ||
| 13 | CONFIG_PPC_FPU=y | ||
| 14 | CONFIG_ALTIVEC=y | ||
| 15 | CONFIG_PPC_STD_MMU=y | ||
| 16 | CONFIG_PPC_MM_SLICES=y | ||
| 17 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 18 | CONFIG_SMP=y | ||
| 19 | CONFIG_NR_CPUS=4 | ||
| 7 | CONFIG_64BIT=y | 20 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 21 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 22 | CONFIG_MMU=y |
| @@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 28 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 29 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 30 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 31 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 32 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 33 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 34 | CONFIG_COMPAT=y |
| @@ -22,50 +36,33 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 25 | # CONFIG_PPC_UDBG_16550 is not set | 40 | # CONFIG_PPC_UDBG_16550 is not set |
| 26 | CONFIG_GENERIC_TBSYNC=y | 41 | CONFIG_GENERIC_TBSYNC=y |
| 27 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 44 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | CONFIG_PPC64_SWSUSP=y | 45 | CONFIG_PPC64_SWSUSP=y |
| 31 | |||
| 32 | # | ||
| 33 | # Processor support | ||
| 34 | # | ||
| 35 | CONFIG_POWER4_ONLY=y | ||
| 36 | CONFIG_POWER4=y | ||
| 37 | CONFIG_PPC_FPU=y | ||
| 38 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 39 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 40 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | 48 | # CONFIG_PPC_OF_PLATFORM_PCI is not set |
| 41 | CONFIG_ALTIVEC=y | ||
| 42 | CONFIG_PPC_STD_MMU=y | ||
| 43 | CONFIG_PPC_MM_SLICES=y | ||
| 44 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 45 | CONFIG_SMP=y | ||
| 46 | CONFIG_NR_CPUS=4 | ||
| 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Code maturity level options | 52 | # General setup |
| 51 | # | 53 | # |
| 52 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 53 | CONFIG_LOCK_KERNEL=y | 55 | CONFIG_LOCK_KERNEL=y |
| 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 55 | |||
| 56 | # | ||
| 57 | # General setup | ||
| 58 | # | ||
| 59 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 60 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 61 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 62 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 63 | # CONFIG_IPC_NS is not set | ||
| 64 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 65 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 66 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 67 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 68 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 69 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 70 | CONFIG_IKCONFIG=y | 67 | CONFIG_IKCONFIG=y |
| 71 | CONFIG_IKCONFIG_PROC=y | 68 | CONFIG_IKCONFIG_PROC=y |
| @@ -101,10 +98,6 @@ CONFIG_SLAB=y | |||
| 101 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
| 102 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
| 103 | CONFIG_BASE_SMALL=0 | 100 | CONFIG_BASE_SMALL=0 |
| 104 | |||
| 105 | # | ||
| 106 | # Loadable module support | ||
| 107 | # | ||
| 108 | CONFIG_MODULES=y | 101 | CONFIG_MODULES=y |
| 109 | CONFIG_MODULE_UNLOAD=y | 102 | CONFIG_MODULE_UNLOAD=y |
| 110 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 103 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -112,12 +105,9 @@ CONFIG_MODVERSIONS=y | |||
| 112 | CONFIG_MODULE_SRCVERSION_ALL=y | 105 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 113 | CONFIG_KMOD=y | 106 | CONFIG_KMOD=y |
| 114 | CONFIG_STOP_MACHINE=y | 107 | CONFIG_STOP_MACHINE=y |
| 115 | |||
| 116 | # | ||
| 117 | # Block layer | ||
| 118 | # | ||
| 119 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
| 120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 109 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 110 | CONFIG_BLK_DEV_BSG=y | ||
| 121 | 111 | ||
| 122 | # | 112 | # |
| 123 | # IO Schedulers | 113 | # IO Schedulers |
| @@ -137,7 +127,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 137 | # | 127 | # |
| 138 | CONFIG_PPC_MULTIPLATFORM=y | 128 | CONFIG_PPC_MULTIPLATFORM=y |
| 139 | # CONFIG_EMBEDDED6xx is not set | 129 | # CONFIG_EMBEDDED6xx is not set |
| 140 | # CONFIG_APUS is not set | 130 | # CONFIG_PPC_82xx is not set |
| 131 | # CONFIG_PPC_83xx is not set | ||
| 132 | # CONFIG_PPC_86xx is not set | ||
| 141 | # CONFIG_PPC_PSERIES is not set | 133 | # CONFIG_PPC_PSERIES is not set |
| 142 | # CONFIG_PPC_ISERIES is not set | 134 | # CONFIG_PPC_ISERIES is not set |
| 143 | # CONFIG_PPC_MPC52xx is not set | 135 | # CONFIG_PPC_MPC52xx is not set |
| @@ -182,6 +174,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y | |||
| 182 | # | 174 | # |
| 183 | CONFIG_CPU_FREQ_PMAC64=y | 175 | CONFIG_CPU_FREQ_PMAC64=y |
| 184 | # CONFIG_CPM2 is not set | 176 | # CONFIG_CPM2 is not set |
| 177 | # CONFIG_FSL_ULI1575 is not set | ||
| 185 | 178 | ||
| 186 | # | 179 | # |
| 187 | # Kernel options | 180 | # Kernel options |
| @@ -219,12 +212,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 220 | CONFIG_RESOURCES_64BIT=y | 213 | CONFIG_RESOURCES_64BIT=y |
| 221 | CONFIG_ZONE_DMA_FLAG=1 | 214 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | ||
| 222 | # CONFIG_PPC_HAS_HASH_64K is not set | 216 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 223 | # CONFIG_PPC_64K_PAGES is not set | 217 | # CONFIG_PPC_64K_PAGES is not set |
| 224 | # CONFIG_SCHED_SMT is not set | 218 | # CONFIG_SCHED_SMT is not set |
| 225 | CONFIG_PROC_DEVICETREE=y | 219 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 220 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 221 | # CONFIG_PM is not set |
| 222 | CONFIG_SUSPEND_SMP_POSSIBLE=y | ||
| 228 | CONFIG_SECCOMP=y | 223 | CONFIG_SECCOMP=y |
| 229 | # CONFIG_WANT_DEVICE_TREE is not set | 224 | # CONFIG_WANT_DEVICE_TREE is not set |
| 230 | CONFIG_ISA_DMA_API=y | 225 | CONFIG_ISA_DMA_API=y |
| @@ -237,6 +232,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 237 | # CONFIG_PPC_INDIRECT_PCI is not set | 232 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 238 | CONFIG_PCI=y | 233 | CONFIG_PCI=y |
| 239 | CONFIG_PCI_DOMAINS=y | 234 | CONFIG_PCI_DOMAINS=y |
| 235 | CONFIG_PCI_SYSCALL=y | ||
| 240 | # CONFIG_PCIEPORTBUS is not set | 236 | # CONFIG_PCIEPORTBUS is not set |
| 241 | CONFIG_ARCH_SUPPORTS_MSI=y | 237 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 242 | CONFIG_PCI_MSI=y | 238 | CONFIG_PCI_MSI=y |
| @@ -308,6 +304,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 308 | CONFIG_NF_CONNTRACK_MARK=y | 304 | CONFIG_NF_CONNTRACK_MARK=y |
| 309 | CONFIG_NF_CONNTRACK_EVENTS=y | 305 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 310 | # CONFIG_NF_CT_PROTO_SCTP is not set | 306 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 307 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 311 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 308 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| 312 | CONFIG_NF_CONNTRACK_FTP=m | 309 | CONFIG_NF_CONNTRACK_FTP=m |
| 313 | # CONFIG_NF_CONNTRACK_H323 is not set | 310 | # CONFIG_NF_CONNTRACK_H323 is not set |
| @@ -365,6 +362,7 @@ CONFIG_LLC=y | |||
| 365 | # CONFIG_MAC80211 is not set | 362 | # CONFIG_MAC80211 is not set |
| 366 | # CONFIG_IEEE80211 is not set | 363 | # CONFIG_IEEE80211 is not set |
| 367 | # CONFIG_RFKILL is not set | 364 | # CONFIG_RFKILL is not set |
| 365 | # CONFIG_NET_9P is not set | ||
| 368 | 366 | ||
| 369 | # | 367 | # |
| 370 | # Device Drivers | 368 | # Device Drivers |
| @@ -379,28 +377,12 @@ CONFIG_FW_LOADER=y | |||
| 379 | # CONFIG_DEBUG_DRIVER is not set | 377 | # CONFIG_DEBUG_DRIVER is not set |
| 380 | # CONFIG_DEBUG_DEVRES is not set | 378 | # CONFIG_DEBUG_DEVRES is not set |
| 381 | # CONFIG_SYS_HYPERVISOR is not set | 379 | # CONFIG_SYS_HYPERVISOR is not set |
| 382 | |||
| 383 | # | ||
| 384 | # Connector - unified userspace <-> kernelspace linker | ||
| 385 | # | ||
| 386 | # CONFIG_CONNECTOR is not set | 380 | # CONFIG_CONNECTOR is not set |
| 387 | # CONFIG_MTD is not set | 381 | # CONFIG_MTD is not set |
| 388 | 382 | CONFIG_OF_DEVICE=y | |
| 389 | # | ||
| 390 | # Parallel port support | ||
| 391 | # | ||
| 392 | # CONFIG_PARPORT is not set | 383 | # CONFIG_PARPORT is not set |
| 393 | 384 | CONFIG_BLK_DEV=y | |
| 394 | # | ||
| 395 | # Plug and Play support | ||
| 396 | # | ||
| 397 | # CONFIG_PNPACPI is not set | ||
| 398 | |||
| 399 | # | ||
| 400 | # Block devices | ||
| 401 | # | ||
| 402 | # CONFIG_BLK_DEV_FD is not set | 385 | # CONFIG_BLK_DEV_FD is not set |
| 403 | # CONFIG_BLK_CPQ_DA is not set | ||
| 404 | # CONFIG_BLK_CPQ_CISS_DA is not set | 386 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 405 | # CONFIG_BLK_DEV_DAC960 is not set | 387 | # CONFIG_BLK_DEV_DAC960 is not set |
| 406 | # CONFIG_BLK_DEV_UMEM is not set | 388 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -418,14 +400,11 @@ CONFIG_CDROM_PKTCDVD=m | |||
| 418 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 400 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 419 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 401 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 420 | # CONFIG_ATA_OVER_ETH is not set | 402 | # CONFIG_ATA_OVER_ETH is not set |
| 421 | 403 | CONFIG_MISC_DEVICES=y | |
| 422 | # | ||
| 423 | # Misc devices | ||
| 424 | # | ||
| 425 | # CONFIG_PHANTOM is not set | 404 | # CONFIG_PHANTOM is not set |
| 405 | # CONFIG_EEPROM_93CX6 is not set | ||
| 426 | # CONFIG_SGI_IOC4 is not set | 406 | # CONFIG_SGI_IOC4 is not set |
| 427 | # CONFIG_TIFM_CORE is not set | 407 | # CONFIG_TIFM_CORE is not set |
| 428 | # CONFIG_BLINK is not set | ||
| 429 | CONFIG_IDE=y | 408 | CONFIG_IDE=y |
| 430 | CONFIG_BLK_DEV_IDE=y | 409 | CONFIG_BLK_DEV_IDE=y |
| 431 | 410 | ||
| @@ -493,6 +472,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 493 | # | 472 | # |
| 494 | # CONFIG_RAID_ATTRS is not set | 473 | # CONFIG_RAID_ATTRS is not set |
| 495 | CONFIG_SCSI=y | 474 | CONFIG_SCSI=y |
| 475 | CONFIG_SCSI_DMA=y | ||
| 496 | # CONFIG_SCSI_TGT is not set | 476 | # CONFIG_SCSI_TGT is not set |
| 497 | # CONFIG_SCSI_NETLINK is not set | 477 | # CONFIG_SCSI_NETLINK is not set |
| 498 | CONFIG_SCSI_PROC_FS=y | 478 | CONFIG_SCSI_PROC_FS=y |
| @@ -525,10 +505,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 525 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 505 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 526 | # CONFIG_SCSI_SAS_ATTRS is not set | 506 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 527 | # CONFIG_SCSI_SAS_LIBSAS is not set | 507 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 528 | 508 | CONFIG_SCSI_LOWLEVEL=y | |
| 529 | # | ||
| 530 | # SCSI low-level drivers | ||
| 531 | # | ||
| 532 | # CONFIG_ISCSI_TCP is not set | 509 | # CONFIG_ISCSI_TCP is not set |
| 533 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 510 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 534 | # CONFIG_SCSI_3W_9XXX is not set | 511 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -543,7 +520,6 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 543 | # CONFIG_MEGARAID_LEGACY is not set | 520 | # CONFIG_MEGARAID_LEGACY is not set |
| 544 | # CONFIG_MEGARAID_SAS is not set | 521 | # CONFIG_MEGARAID_SAS is not set |
| 545 | # CONFIG_SCSI_HPTIOP is not set | 522 | # CONFIG_SCSI_HPTIOP is not set |
| 546 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 547 | # CONFIG_SCSI_DMX3191D is not set | 523 | # CONFIG_SCSI_DMX3191D is not set |
| 548 | # CONFIG_SCSI_EATA is not set | 524 | # CONFIG_SCSI_EATA is not set |
| 549 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 525 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -616,10 +592,6 @@ CONFIG_SATA_SVW=y | |||
| 616 | # CONFIG_PATA_SIS is not set | 592 | # CONFIG_PATA_SIS is not set |
| 617 | # CONFIG_PATA_VIA is not set | 593 | # CONFIG_PATA_VIA is not set |
| 618 | # CONFIG_PATA_WINBOND is not set | 594 | # CONFIG_PATA_WINBOND is not set |
| 619 | |||
| 620 | # | ||
| 621 | # Multi-device support (RAID and LVM) | ||
| 622 | # | ||
| 623 | CONFIG_MD=y | 595 | CONFIG_MD=y |
| 624 | CONFIG_BLK_DEV_MD=y | 596 | CONFIG_BLK_DEV_MD=y |
| 625 | CONFIG_MD_LINEAR=y | 597 | CONFIG_MD_LINEAR=y |
| @@ -672,10 +644,6 @@ CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | |||
| 672 | CONFIG_IEEE1394_ETH1394=m | 644 | CONFIG_IEEE1394_ETH1394=m |
| 673 | CONFIG_IEEE1394_DV1394=m | 645 | CONFIG_IEEE1394_DV1394=m |
| 674 | CONFIG_IEEE1394_RAWIO=y | 646 | CONFIG_IEEE1394_RAWIO=y |
| 675 | |||
| 676 | # | ||
| 677 | # I2O device support | ||
| 678 | # | ||
| 679 | # CONFIG_I2O is not set | 647 | # CONFIG_I2O is not set |
| 680 | CONFIG_MACINTOSH_DRIVERS=y | 648 | CONFIG_MACINTOSH_DRIVERS=y |
| 681 | CONFIG_ADB_PMU=y | 649 | CONFIG_ADB_PMU=y |
| @@ -688,31 +656,21 @@ CONFIG_WINDFARM_PM81=y | |||
| 688 | CONFIG_WINDFARM_PM91=y | 656 | CONFIG_WINDFARM_PM91=y |
| 689 | CONFIG_WINDFARM_PM112=y | 657 | CONFIG_WINDFARM_PM112=y |
| 690 | # CONFIG_PMAC_RACKMETER is not set | 658 | # CONFIG_PMAC_RACKMETER is not set |
| 691 | |||
| 692 | # | ||
| 693 | # Network device support | ||
| 694 | # | ||
| 695 | CONFIG_NETDEVICES=y | 659 | CONFIG_NETDEVICES=y |
| 660 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 696 | CONFIG_DUMMY=m | 661 | CONFIG_DUMMY=m |
| 697 | CONFIG_BONDING=m | 662 | CONFIG_BONDING=m |
| 663 | # CONFIG_MACVLAN is not set | ||
| 698 | # CONFIG_EQUALIZER is not set | 664 | # CONFIG_EQUALIZER is not set |
| 699 | CONFIG_TUN=m | 665 | CONFIG_TUN=m |
| 700 | # CONFIG_ARCNET is not set | 666 | # CONFIG_ARCNET is not set |
| 701 | # CONFIG_PHYLIB is not set | 667 | # CONFIG_PHYLIB is not set |
| 702 | |||
| 703 | # | ||
| 704 | # Ethernet (10 or 100Mbit) | ||
| 705 | # | ||
| 706 | CONFIG_NET_ETHERNET=y | 668 | CONFIG_NET_ETHERNET=y |
| 707 | CONFIG_MII=y | 669 | CONFIG_MII=y |
| 708 | # CONFIG_HAPPYMEAL is not set | 670 | # CONFIG_HAPPYMEAL is not set |
| 709 | CONFIG_SUNGEM=y | 671 | CONFIG_SUNGEM=y |
| 710 | # CONFIG_CASSINI is not set | 672 | # CONFIG_CASSINI is not set |
| 711 | # CONFIG_NET_VENDOR_3COM is not set | 673 | # CONFIG_NET_VENDOR_3COM is not set |
| 712 | |||
| 713 | # | ||
| 714 | # Tulip family network device support | ||
| 715 | # | ||
| 716 | # CONFIG_NET_TULIP is not set | 674 | # CONFIG_NET_TULIP is not set |
| 717 | # CONFIG_HP100 is not set | 675 | # CONFIG_HP100 is not set |
| 718 | # CONFIG_NET_PCI is not set | 676 | # CONFIG_NET_PCI is not set |
| @@ -730,7 +688,6 @@ CONFIG_E1000=y | |||
| 730 | # CONFIG_SIS190 is not set | 688 | # CONFIG_SIS190 is not set |
| 731 | # CONFIG_SKGE is not set | 689 | # CONFIG_SKGE is not set |
| 732 | # CONFIG_SKY2 is not set | 690 | # CONFIG_SKY2 is not set |
| 733 | # CONFIG_SK98LIN is not set | ||
| 734 | # CONFIG_VIA_VELOCITY is not set | 691 | # CONFIG_VIA_VELOCITY is not set |
| 735 | CONFIG_TIGON3=y | 692 | CONFIG_TIGON3=y |
| 736 | # CONFIG_BNX2 is not set | 693 | # CONFIG_BNX2 is not set |
| @@ -787,6 +744,7 @@ CONFIG_PPP_DEFLATE=m | |||
| 787 | CONFIG_PPP_BSDCOMP=m | 744 | CONFIG_PPP_BSDCOMP=m |
| 788 | # CONFIG_PPP_MPPE is not set | 745 | # CONFIG_PPP_MPPE is not set |
| 789 | CONFIG_PPPOE=m | 746 | CONFIG_PPPOE=m |
| 747 | # CONFIG_PPPOL2TP is not set | ||
| 790 | # CONFIG_SLIP is not set | 748 | # CONFIG_SLIP is not set |
| 791 | CONFIG_SLHC=m | 749 | CONFIG_SLHC=m |
| 792 | # CONFIG_NET_FC is not set | 750 | # CONFIG_NET_FC is not set |
| @@ -794,15 +752,7 @@ CONFIG_SLHC=m | |||
| 794 | # CONFIG_NETCONSOLE is not set | 752 | # CONFIG_NETCONSOLE is not set |
| 795 | # CONFIG_NETPOLL is not set | 753 | # CONFIG_NETPOLL is not set |
| 796 | # CONFIG_NET_POLL_CONTROLLER is not set | 754 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 797 | |||
| 798 | # | ||
| 799 | # ISDN subsystem | ||
| 800 | # | ||
| 801 | # CONFIG_ISDN is not set | 755 | # CONFIG_ISDN is not set |
| 802 | |||
| 803 | # | ||
| 804 | # Telephony Support | ||
| 805 | # | ||
| 806 | # CONFIG_PHONE is not set | 756 | # CONFIG_PHONE is not set |
| 807 | 757 | ||
| 808 | # | 758 | # |
| @@ -876,10 +826,6 @@ CONFIG_HW_CONSOLE=y | |||
| 876 | CONFIG_UNIX98_PTYS=y | 826 | CONFIG_UNIX98_PTYS=y |
| 877 | CONFIG_LEGACY_PTYS=y | 827 | CONFIG_LEGACY_PTYS=y |
| 878 | CONFIG_LEGACY_PTY_COUNT=256 | 828 | CONFIG_LEGACY_PTY_COUNT=256 |
| 879 | |||
| 880 | # | ||
| 881 | # IPMI | ||
| 882 | # | ||
| 883 | # CONFIG_IPMI_HANDLER is not set | 829 | # CONFIG_IPMI_HANDLER is not set |
| 884 | # CONFIG_WATCHDOG is not set | 830 | # CONFIG_WATCHDOG is not set |
| 885 | # CONFIG_HW_RANDOM is not set | 831 | # CONFIG_HW_RANDOM is not set |
| @@ -893,10 +839,6 @@ CONFIG_AGP_UNINORTH=m | |||
| 893 | CONFIG_RAW_DRIVER=y | 839 | CONFIG_RAW_DRIVER=y |
| 894 | CONFIG_MAX_RAW_DEVS=256 | 840 | CONFIG_MAX_RAW_DEVS=256 |
| 895 | # CONFIG_HANGCHECK_TIMER is not set | 841 | # CONFIG_HANGCHECK_TIMER is not set |
| 896 | |||
| 897 | # | ||
| 898 | # TPM devices | ||
| 899 | # | ||
| 900 | # CONFIG_TCG_TPM is not set | 842 | # CONFIG_TCG_TPM is not set |
| 901 | CONFIG_DEVPORT=y | 843 | CONFIG_DEVPORT=y |
| 902 | CONFIG_I2C=y | 844 | CONFIG_I2C=y |
| @@ -931,6 +873,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 931 | # CONFIG_I2C_SIS5595 is not set | 873 | # CONFIG_I2C_SIS5595 is not set |
| 932 | # CONFIG_I2C_SIS630 is not set | 874 | # CONFIG_I2C_SIS630 is not set |
| 933 | # CONFIG_I2C_SIS96X is not set | 875 | # CONFIG_I2C_SIS96X is not set |
| 876 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 934 | # CONFIG_I2C_STUB is not set | 877 | # CONFIG_I2C_STUB is not set |
| 935 | # CONFIG_I2C_TINY_USB is not set | 878 | # CONFIG_I2C_TINY_USB is not set |
| 936 | # CONFIG_I2C_VIA is not set | 879 | # CONFIG_I2C_VIA is not set |
| @@ -942,11 +885,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 942 | # | 885 | # |
| 943 | # CONFIG_SENSORS_DS1337 is not set | 886 | # CONFIG_SENSORS_DS1337 is not set |
| 944 | # CONFIG_SENSORS_DS1374 is not set | 887 | # CONFIG_SENSORS_DS1374 is not set |
| 888 | # CONFIG_DS1682 is not set | ||
| 945 | # CONFIG_SENSORS_EEPROM is not set | 889 | # CONFIG_SENSORS_EEPROM is not set |
| 946 | # CONFIG_SENSORS_PCF8574 is not set | 890 | # CONFIG_SENSORS_PCF8574 is not set |
| 947 | # CONFIG_SENSORS_PCA9539 is not set | 891 | # CONFIG_SENSORS_PCA9539 is not set |
| 948 | # CONFIG_SENSORS_PCF8591 is not set | 892 | # CONFIG_SENSORS_PCF8591 is not set |
| 949 | # CONFIG_SENSORS_MAX6875 is not set | 893 | # CONFIG_SENSORS_MAX6875 is not set |
| 894 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 950 | # CONFIG_I2C_DEBUG_CORE is not set | 895 | # CONFIG_I2C_DEBUG_CORE is not set |
| 951 | # CONFIG_I2C_DEBUG_ALGO is not set | 896 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 952 | # CONFIG_I2C_DEBUG_BUS is not set | 897 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -957,11 +902,8 @@ CONFIG_I2C_POWERMAC=y | |||
| 957 | # | 902 | # |
| 958 | # CONFIG_SPI is not set | 903 | # CONFIG_SPI is not set |
| 959 | # CONFIG_SPI_MASTER is not set | 904 | # CONFIG_SPI_MASTER is not set |
| 960 | |||
| 961 | # | ||
| 962 | # Dallas's 1-wire bus | ||
| 963 | # | ||
| 964 | # CONFIG_W1 is not set | 905 | # CONFIG_W1 is not set |
| 906 | # CONFIG_POWER_SUPPLY is not set | ||
| 965 | # CONFIG_HWMON is not set | 907 | # CONFIG_HWMON is not set |
| 966 | 908 | ||
| 967 | # | 909 | # |
| @@ -981,14 +923,15 @@ CONFIG_DAB=y | |||
| 981 | # Graphics support | 923 | # Graphics support |
| 982 | # | 924 | # |
| 983 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 925 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 984 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 985 | CONFIG_LCD_CLASS_DEVICE=m | 926 | CONFIG_LCD_CLASS_DEVICE=m |
| 927 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 986 | 928 | ||
| 987 | # | 929 | # |
| 988 | # Display device support | 930 | # Display device support |
| 989 | # | 931 | # |
| 990 | # CONFIG_DISPLAY_SUPPORT is not set | 932 | # CONFIG_DISPLAY_SUPPORT is not set |
| 991 | CONFIG_VGASTATE=y | 933 | CONFIG_VGASTATE=y |
| 934 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 992 | CONFIG_FB=y | 935 | CONFIG_FB=y |
| 993 | CONFIG_FIRMWARE_EDID=y | 936 | CONFIG_FIRMWARE_EDID=y |
| 994 | CONFIG_FB_DDC=y | 937 | CONFIG_FB_DDC=y |
| @@ -1049,6 +992,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
| 1049 | # CONFIG_VGA_CONSOLE is not set | 992 | # CONFIG_VGA_CONSOLE is not set |
| 1050 | CONFIG_DUMMY_CONSOLE=y | 993 | CONFIG_DUMMY_CONSOLE=y |
| 1051 | CONFIG_FRAMEBUFFER_CONSOLE=y | 994 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 995 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1052 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 996 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1053 | # CONFIG_FONTS is not set | 997 | # CONFIG_FONTS is not set |
| 1054 | CONFIG_FONT_8x8=y | 998 | CONFIG_FONT_8x8=y |
| @@ -1111,6 +1055,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1111 | # CONFIG_SND_CMIPCI is not set | 1055 | # CONFIG_SND_CMIPCI is not set |
| 1112 | # CONFIG_SND_CS4281 is not set | 1056 | # CONFIG_SND_CS4281 is not set |
| 1113 | # CONFIG_SND_CS46XX is not set | 1057 | # CONFIG_SND_CS46XX is not set |
| 1058 | # CONFIG_SND_CS5530 is not set | ||
| 1114 | # CONFIG_SND_DARLA20 is not set | 1059 | # CONFIG_SND_DARLA20 is not set |
| 1115 | # CONFIG_SND_GINA20 is not set | 1060 | # CONFIG_SND_GINA20 is not set |
| 1116 | # CONFIG_SND_LAYLA20 is not set | 1061 | # CONFIG_SND_LAYLA20 is not set |
| @@ -1160,6 +1105,10 @@ CONFIG_SND_POWERMAC=m | |||
| 1160 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1105 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
| 1161 | 1106 | ||
| 1162 | # | 1107 | # |
| 1108 | # ALSA PowerPC devices | ||
| 1109 | # | ||
| 1110 | |||
| 1111 | # | ||
| 1163 | # Apple Onboard Audio driver | 1112 | # Apple Onboard Audio driver |
| 1164 | # | 1113 | # |
| 1165 | CONFIG_SND_AOA=m | 1114 | CONFIG_SND_AOA=m |
| @@ -1183,13 +1132,14 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1183 | # CONFIG_SND_SOC is not set | 1132 | # CONFIG_SND_SOC is not set |
| 1184 | 1133 | ||
| 1185 | # | 1134 | # |
| 1186 | # Open Sound System | 1135 | # SoC Audio support for SuperH |
| 1187 | # | 1136 | # |
| 1188 | # CONFIG_SOUND_PRIME is not set | ||
| 1189 | 1137 | ||
| 1190 | # | 1138 | # |
| 1191 | # HID Devices | 1139 | # Open Sound System |
| 1192 | # | 1140 | # |
| 1141 | # CONFIG_SOUND_PRIME is not set | ||
| 1142 | CONFIG_HID_SUPPORT=y | ||
| 1193 | CONFIG_HID=y | 1143 | CONFIG_HID=y |
| 1194 | # CONFIG_HID_DEBUG is not set | 1144 | # CONFIG_HID_DEBUG is not set |
| 1195 | 1145 | ||
| @@ -1205,10 +1155,7 @@ CONFIG_LOGITECH_FF=y | |||
| 1205 | CONFIG_THRUSTMASTER_FF=y | 1155 | CONFIG_THRUSTMASTER_FF=y |
| 1206 | # CONFIG_ZEROPLUS_FF is not set | 1156 | # CONFIG_ZEROPLUS_FF is not set |
| 1207 | CONFIG_USB_HIDDEV=y | 1157 | CONFIG_USB_HIDDEV=y |
| 1208 | 1158 | CONFIG_USB_SUPPORT=y | |
| 1209 | # | ||
| 1210 | # USB support | ||
| 1211 | # | ||
| 1212 | CONFIG_USB_ARCH_HAS_HCD=y | 1159 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1213 | CONFIG_USB_ARCH_HAS_OHCI=y | 1160 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1214 | CONFIG_USB_ARCH_HAS_EHCI=y | 1161 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1230,7 +1177,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 1230 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 1177 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 1231 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1178 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1232 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1179 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1233 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1234 | # CONFIG_USB_ISP116X_HCD is not set | 1180 | # CONFIG_USB_ISP116X_HCD is not set |
| 1235 | CONFIG_USB_OHCI_HCD=y | 1181 | CONFIG_USB_OHCI_HCD=y |
| 1236 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1182 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -1242,6 +1188,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 1242 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1188 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1243 | # CONFIG_USB_UHCI_HCD is not set | 1189 | # CONFIG_USB_UHCI_HCD is not set |
| 1244 | # CONFIG_USB_SL811_HCD is not set | 1190 | # CONFIG_USB_SL811_HCD is not set |
| 1191 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1245 | 1192 | ||
| 1246 | # | 1193 | # |
| 1247 | # USB Device Class drivers | 1194 | # USB Device Class drivers |
| @@ -1326,6 +1273,7 @@ CONFIG_USB_SERIAL_MCT_U232=m | |||
| 1326 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1273 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1327 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1274 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1328 | CONFIG_USB_SERIAL_PL2303=m | 1275 | CONFIG_USB_SERIAL_PL2303=m |
| 1276 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
| 1329 | # CONFIG_USB_SERIAL_HP4X is not set | 1277 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1330 | CONFIG_USB_SERIAL_SAFE=m | 1278 | CONFIG_USB_SERIAL_SAFE=m |
| 1331 | CONFIG_USB_SERIAL_SAFE_PADDED=y | 1279 | CONFIG_USB_SERIAL_SAFE_PADDED=y |
| @@ -1371,32 +1319,9 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1371 | # | 1319 | # |
| 1372 | # CONFIG_USB_GADGET is not set | 1320 | # CONFIG_USB_GADGET is not set |
| 1373 | # CONFIG_MMC is not set | 1321 | # CONFIG_MMC is not set |
| 1374 | |||
| 1375 | # | ||
| 1376 | # LED devices | ||
| 1377 | # | ||
| 1378 | # CONFIG_NEW_LEDS is not set | 1322 | # CONFIG_NEW_LEDS is not set |
| 1379 | |||
| 1380 | # | ||
| 1381 | # LED drivers | ||
| 1382 | # | ||
| 1383 | |||
| 1384 | # | ||
| 1385 | # LED Triggers | ||
| 1386 | # | ||
| 1387 | |||
| 1388 | # | ||
| 1389 | # InfiniBand support | ||
| 1390 | # | ||
| 1391 | # CONFIG_INFINIBAND is not set | 1323 | # CONFIG_INFINIBAND is not set |
| 1392 | 1324 | # CONFIG_EDAC is not set | |
| 1393 | # | ||
| 1394 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1395 | # | ||
| 1396 | |||
| 1397 | # | ||
| 1398 | # Real Time Clock | ||
| 1399 | # | ||
| 1400 | # CONFIG_RTC_CLASS is not set | 1325 | # CONFIG_RTC_CLASS is not set |
| 1401 | 1326 | ||
| 1402 | # | 1327 | # |
| @@ -1413,6 +1338,11 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1413 | # | 1338 | # |
| 1414 | 1339 | ||
| 1415 | # | 1340 | # |
| 1341 | # Userspace I/O | ||
| 1342 | # | ||
| 1343 | # CONFIG_UIO is not set | ||
| 1344 | |||
| 1345 | # | ||
| 1416 | # File systems | 1346 | # File systems |
| 1417 | # | 1347 | # |
| 1418 | CONFIG_EXT2_FS=y | 1348 | CONFIG_EXT2_FS=y |
| @@ -1538,7 +1468,6 @@ CONFIG_CIFS=m | |||
| 1538 | # CONFIG_NCP_FS is not set | 1468 | # CONFIG_NCP_FS is not set |
| 1539 | # CONFIG_CODA_FS is not set | 1469 | # CONFIG_CODA_FS is not set |
| 1540 | # CONFIG_AFS_FS is not set | 1470 | # CONFIG_AFS_FS is not set |
| 1541 | # CONFIG_9P_FS is not set | ||
| 1542 | 1471 | ||
| 1543 | # | 1472 | # |
| 1544 | # Partition Types | 1473 | # Partition Types |
| @@ -1620,6 +1549,7 @@ CONFIG_CRC_CCITT=m | |||
| 1620 | # CONFIG_CRC16 is not set | 1549 | # CONFIG_CRC16 is not set |
| 1621 | # CONFIG_CRC_ITU_T is not set | 1550 | # CONFIG_CRC_ITU_T is not set |
| 1622 | CONFIG_CRC32=y | 1551 | CONFIG_CRC32=y |
| 1552 | # CONFIG_CRC7 is not set | ||
| 1623 | CONFIG_LIBCRC32C=m | 1553 | CONFIG_LIBCRC32C=m |
| 1624 | CONFIG_ZLIB_INFLATE=y | 1554 | CONFIG_ZLIB_INFLATE=y |
| 1625 | CONFIG_ZLIB_DEFLATE=m | 1555 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1647,6 +1577,7 @@ CONFIG_DEBUG_FS=y | |||
| 1647 | CONFIG_DEBUG_KERNEL=y | 1577 | CONFIG_DEBUG_KERNEL=y |
| 1648 | # CONFIG_DEBUG_SHIRQ is not set | 1578 | # CONFIG_DEBUG_SHIRQ is not set |
| 1649 | CONFIG_DETECT_SOFTLOCKUP=y | 1579 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1580 | CONFIG_SCHED_DEBUG=y | ||
| 1650 | # CONFIG_SCHEDSTATS is not set | 1581 | # CONFIG_SCHEDSTATS is not set |
| 1651 | # CONFIG_TIMER_STATS is not set | 1582 | # CONFIG_TIMER_STATS is not set |
| 1652 | # CONFIG_DEBUG_SLAB is not set | 1583 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1677,10 +1608,6 @@ CONFIG_BOOTX_TEXT=y | |||
| 1677 | # | 1608 | # |
| 1678 | # CONFIG_KEYS is not set | 1609 | # CONFIG_KEYS is not set |
| 1679 | # CONFIG_SECURITY is not set | 1610 | # CONFIG_SECURITY is not set |
| 1680 | |||
| 1681 | # | ||
| 1682 | # Cryptographic options | ||
| 1683 | # | ||
| 1684 | CONFIG_CRYPTO=y | 1611 | CONFIG_CRYPTO=y |
| 1685 | CONFIG_CRYPTO_ALGAPI=y | 1612 | CONFIG_CRYPTO_ALGAPI=y |
| 1686 | CONFIG_CRYPTO_BLKCIPHER=y | 1613 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1720,7 +1647,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1720 | CONFIG_CRYPTO_CRC32C=m | 1647 | CONFIG_CRYPTO_CRC32C=m |
| 1721 | # CONFIG_CRYPTO_CAMELLIA is not set | 1648 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1722 | CONFIG_CRYPTO_TEST=m | 1649 | CONFIG_CRYPTO_TEST=m |
| 1723 | 1650 | # CONFIG_CRYPTO_HW is not set | |
| 1724 | # | ||
| 1725 | # Hardware crypto devices | ||
| 1726 | # | ||
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig index 04b94f884aae..97d0202a9fe0 100644 --- a/arch/powerpc/configs/holly_defconfig +++ b/arch/powerpc/configs/holly_defconfig | |||
| @@ -1,9 +1,24 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 13:22:36 2007 | 4 | # Thu Aug 30 16:35:41 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_PPC_STD_MMU=y | ||
| 19 | CONFIG_PPC_STD_MMU_32=y | ||
| 20 | # CONFIG_PPC_MM_SLICES is not set | ||
| 21 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 23 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 24 | CONFIG_MMU=y |
| @@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 35 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 40 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 41 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 27 | # CONFIG_DEFAULT_UIMAGE is not set | 44 | # CONFIG_DEFAULT_UIMAGE is not set |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | CONFIG_CLASSIC32=y | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 45 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 46 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | # CONFIG_ALTIVEC is not set | ||
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 48 | ||
| 52 | # | 49 | # |
| 53 | # Code maturity level options | 50 | # General setup |
| 54 | # | 51 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 52 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 53 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 55 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 56 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 57 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 58 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 59 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 60 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 61 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 62 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 63 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 64 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 65 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 66 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -102,23 +94,16 @@ CONFIG_SLAB=y | |||
| 102 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 96 | CONFIG_BASE_SMALL=0 |
| 105 | |||
| 106 | # | ||
| 107 | # Loadable module support | ||
| 108 | # | ||
| 109 | CONFIG_MODULES=y | 97 | CONFIG_MODULES=y |
| 110 | # CONFIG_MODULE_UNLOAD is not set | 98 | # CONFIG_MODULE_UNLOAD is not set |
| 111 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 112 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 113 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 114 | |||
| 115 | # | ||
| 116 | # Block layer | ||
| 117 | # | ||
| 118 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 119 | CONFIG_LBD=y | 103 | CONFIG_LBD=y |
| 120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 121 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 122 | 107 | ||
| 123 | # | 108 | # |
| 124 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -138,7 +123,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 138 | # | 123 | # |
| 139 | # CONFIG_PPC_MULTIPLATFORM is not set | 124 | # CONFIG_PPC_MULTIPLATFORM is not set |
| 140 | CONFIG_EMBEDDED6xx=y | 125 | CONFIG_EMBEDDED6xx=y |
| 141 | # CONFIG_APUS is not set | 126 | # CONFIG_PPC_82xx is not set |
| 127 | # CONFIG_PPC_83xx is not set | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 142 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 143 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 144 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -159,8 +146,8 @@ CONFIG_MPIC_WEIRD=y | |||
| 159 | # CONFIG_PPC_INDIRECT_IO is not set | 146 | # CONFIG_PPC_INDIRECT_IO is not set |
| 160 | # CONFIG_GENERIC_IOMAP is not set | 147 | # CONFIG_GENERIC_IOMAP is not set |
| 161 | # CONFIG_CPU_FREQ is not set | 148 | # CONFIG_CPU_FREQ is not set |
| 162 | # CONFIG_TAU is not set | ||
| 163 | # CONFIG_CPM2 is not set | 149 | # CONFIG_CPM2 is not set |
| 150 | # CONFIG_FSL_ULI1575 is not set | ||
| 164 | 151 | ||
| 165 | # | 152 | # |
| 166 | # Kernel options | 153 | # Kernel options |
| @@ -189,6 +176,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 189 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 176 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 190 | # CONFIG_RESOURCES_64BIT is not set | 177 | # CONFIG_RESOURCES_64BIT is not set |
| 191 | CONFIG_ZONE_DMA_FLAG=1 | 178 | CONFIG_ZONE_DMA_FLAG=1 |
| 179 | CONFIG_BOUNCE=y | ||
| 180 | CONFIG_VIRT_TO_BUS=y | ||
| 192 | CONFIG_PROC_DEVICETREE=y | 181 | CONFIG_PROC_DEVICETREE=y |
| 193 | CONFIG_CMDLINE_BOOL=y | 182 | CONFIG_CMDLINE_BOOL=y |
| 194 | CONFIG_CMDLINE="console=ttyS0,115200" | 183 | CONFIG_CMDLINE="console=ttyS0,115200" |
| @@ -206,6 +195,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 206 | # CONFIG_PPC_INDIRECT_PCI is not set | 195 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 207 | CONFIG_PCI=y | 196 | CONFIG_PCI=y |
| 208 | CONFIG_PCI_DOMAINS=y | 197 | CONFIG_PCI_DOMAINS=y |
| 198 | CONFIG_PCI_SYSCALL=y | ||
| 209 | # CONFIG_PCIEPORTBUS is not set | 199 | # CONFIG_PCIEPORTBUS is not set |
| 210 | CONFIG_ARCH_SUPPORTS_MSI=y | 200 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 211 | # CONFIG_PCI_MSI is not set | 201 | # CONFIG_PCI_MSI is not set |
| @@ -316,6 +306,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 316 | # CONFIG_MAC80211 is not set | 306 | # CONFIG_MAC80211 is not set |
| 317 | # CONFIG_IEEE80211 is not set | 307 | # CONFIG_IEEE80211 is not set |
| 318 | # CONFIG_RFKILL is not set | 308 | # CONFIG_RFKILL is not set |
| 309 | # CONFIG_NET_9P is not set | ||
| 319 | 310 | ||
| 320 | # | 311 | # |
| 321 | # Device Drivers | 312 | # Device Drivers |
| @@ -330,26 +321,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 330 | # CONFIG_DEBUG_DRIVER is not set | 321 | # CONFIG_DEBUG_DRIVER is not set |
| 331 | # CONFIG_DEBUG_DEVRES is not set | 322 | # CONFIG_DEBUG_DEVRES is not set |
| 332 | # CONFIG_SYS_HYPERVISOR is not set | 323 | # CONFIG_SYS_HYPERVISOR is not set |
| 333 | |||
| 334 | # | ||
| 335 | # Connector - unified userspace <-> kernelspace linker | ||
| 336 | # | ||
| 337 | # CONFIG_CONNECTOR is not set | 324 | # CONFIG_CONNECTOR is not set |
| 338 | # CONFIG_MTD is not set | 325 | # CONFIG_MTD is not set |
| 339 | 326 | CONFIG_OF_DEVICE=y | |
| 340 | # | ||
| 341 | # Parallel port support | ||
| 342 | # | ||
| 343 | # CONFIG_PARPORT is not set | 327 | # CONFIG_PARPORT is not set |
| 344 | 328 | CONFIG_BLK_DEV=y | |
| 345 | # | ||
| 346 | # Plug and Play support | ||
| 347 | # | ||
| 348 | # CONFIG_PNPACPI is not set | ||
| 349 | |||
| 350 | # | ||
| 351 | # Block devices | ||
| 352 | # | ||
| 353 | # CONFIG_BLK_DEV_FD is not set | 329 | # CONFIG_BLK_DEV_FD is not set |
| 354 | # CONFIG_BLK_CPQ_DA is not set | 330 | # CONFIG_BLK_CPQ_DA is not set |
| 355 | # CONFIG_BLK_CPQ_CISS_DA is not set | 331 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -366,14 +342,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 366 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 342 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 367 | # CONFIG_CDROM_PKTCDVD is not set | 343 | # CONFIG_CDROM_PKTCDVD is not set |
| 368 | # CONFIG_ATA_OVER_ETH is not set | 344 | # CONFIG_ATA_OVER_ETH is not set |
| 369 | 345 | CONFIG_MISC_DEVICES=y | |
| 370 | # | ||
| 371 | # Misc devices | ||
| 372 | # | ||
| 373 | # CONFIG_PHANTOM is not set | 346 | # CONFIG_PHANTOM is not set |
| 347 | # CONFIG_EEPROM_93CX6 is not set | ||
| 374 | # CONFIG_SGI_IOC4 is not set | 348 | # CONFIG_SGI_IOC4 is not set |
| 375 | # CONFIG_TIFM_CORE is not set | 349 | # CONFIG_TIFM_CORE is not set |
| 376 | # CONFIG_BLINK is not set | ||
| 377 | # CONFIG_IDE is not set | 350 | # CONFIG_IDE is not set |
| 378 | 351 | ||
| 379 | # | 352 | # |
| @@ -381,6 +354,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 381 | # | 354 | # |
| 382 | # CONFIG_RAID_ATTRS is not set | 355 | # CONFIG_RAID_ATTRS is not set |
| 383 | CONFIG_SCSI=y | 356 | CONFIG_SCSI=y |
| 357 | CONFIG_SCSI_DMA=y | ||
| 384 | # CONFIG_SCSI_TGT is not set | 358 | # CONFIG_SCSI_TGT is not set |
| 385 | # CONFIG_SCSI_NETLINK is not set | 359 | # CONFIG_SCSI_NETLINK is not set |
| 386 | CONFIG_SCSI_PROC_FS=y | 360 | CONFIG_SCSI_PROC_FS=y |
| @@ -410,12 +384,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 410 | # CONFIG_SCSI_SPI_ATTRS is not set | 384 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 411 | # CONFIG_SCSI_FC_ATTRS is not set | 385 | # CONFIG_SCSI_FC_ATTRS is not set |
| 412 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 386 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 413 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 414 | # CONFIG_SCSI_SAS_LIBSAS is not set | 387 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 415 | 388 | CONFIG_SCSI_LOWLEVEL=y | |
| 416 | # | ||
| 417 | # SCSI low-level drivers | ||
| 418 | # | ||
| 419 | # CONFIG_ISCSI_TCP is not set | 389 | # CONFIG_ISCSI_TCP is not set |
| 420 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 390 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 421 | # CONFIG_SCSI_3W_9XXX is not set | 391 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -506,10 +476,6 @@ CONFIG_ATA=y | |||
| 506 | # CONFIG_PATA_VIA is not set | 476 | # CONFIG_PATA_VIA is not set |
| 507 | # CONFIG_PATA_WINBOND is not set | 477 | # CONFIG_PATA_WINBOND is not set |
| 508 | # CONFIG_PATA_PLATFORM is not set | 478 | # CONFIG_PATA_PLATFORM is not set |
| 509 | |||
| 510 | # | ||
| 511 | # Multi-device support (RAID and LVM) | ||
| 512 | # | ||
| 513 | # CONFIG_MD is not set | 479 | # CONFIG_MD is not set |
| 514 | 480 | ||
| 515 | # | 481 | # |
| @@ -525,19 +491,13 @@ CONFIG_ATA=y | |||
| 525 | # | 491 | # |
| 526 | # CONFIG_FIREWIRE is not set | 492 | # CONFIG_FIREWIRE is not set |
| 527 | # CONFIG_IEEE1394 is not set | 493 | # CONFIG_IEEE1394 is not set |
| 528 | |||
| 529 | # | ||
| 530 | # I2O device support | ||
| 531 | # | ||
| 532 | # CONFIG_I2O is not set | 494 | # CONFIG_I2O is not set |
| 533 | # CONFIG_MACINTOSH_DRIVERS is not set | 495 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 534 | |||
| 535 | # | ||
| 536 | # Network device support | ||
| 537 | # | ||
| 538 | CONFIG_NETDEVICES=y | 496 | CONFIG_NETDEVICES=y |
| 497 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 539 | # CONFIG_DUMMY is not set | 498 | # CONFIG_DUMMY is not set |
| 540 | # CONFIG_BONDING is not set | 499 | # CONFIG_BONDING is not set |
| 500 | # CONFIG_MACVLAN is not set | ||
| 541 | # CONFIG_EQUALIZER is not set | 501 | # CONFIG_EQUALIZER is not set |
| 542 | # CONFIG_TUN is not set | 502 | # CONFIG_TUN is not set |
| 543 | # CONFIG_ARCNET is not set | 503 | # CONFIG_ARCNET is not set |
| @@ -554,11 +514,8 @@ CONFIG_PHYLIB=y | |||
| 554 | # CONFIG_VITESSE_PHY is not set | 514 | # CONFIG_VITESSE_PHY is not set |
| 555 | # CONFIG_SMSC_PHY is not set | 515 | # CONFIG_SMSC_PHY is not set |
| 556 | # CONFIG_BROADCOM_PHY is not set | 516 | # CONFIG_BROADCOM_PHY is not set |
| 517 | # CONFIG_ICPLUS_PHY is not set | ||
| 557 | # CONFIG_FIXED_PHY is not set | 518 | # CONFIG_FIXED_PHY is not set |
| 558 | |||
| 559 | # | ||
| 560 | # Ethernet (10 or 100Mbit) | ||
| 561 | # | ||
| 562 | CONFIG_NET_ETHERNET=y | 519 | CONFIG_NET_ETHERNET=y |
| 563 | CONFIG_MII=y | 520 | CONFIG_MII=y |
| 564 | # CONFIG_HAPPYMEAL is not set | 521 | # CONFIG_HAPPYMEAL is not set |
| @@ -567,10 +524,6 @@ CONFIG_MII=y | |||
| 567 | CONFIG_NET_VENDOR_3COM=y | 524 | CONFIG_NET_VENDOR_3COM=y |
| 568 | CONFIG_VORTEX=y | 525 | CONFIG_VORTEX=y |
| 569 | # CONFIG_TYPHOON is not set | 526 | # CONFIG_TYPHOON is not set |
| 570 | |||
| 571 | # | ||
| 572 | # Tulip family network device support | ||
| 573 | # | ||
| 574 | # CONFIG_NET_TULIP is not set | 527 | # CONFIG_NET_TULIP is not set |
| 575 | # CONFIG_HP100 is not set | 528 | # CONFIG_HP100 is not set |
| 576 | # CONFIG_NET_PCI is not set | 529 | # CONFIG_NET_PCI is not set |
| @@ -585,7 +538,6 @@ CONFIG_NETDEV_1000=y | |||
| 585 | # CONFIG_SIS190 is not set | 538 | # CONFIG_SIS190 is not set |
| 586 | # CONFIG_SKGE is not set | 539 | # CONFIG_SKGE is not set |
| 587 | # CONFIG_SKY2 is not set | 540 | # CONFIG_SKY2 is not set |
| 588 | # CONFIG_SK98LIN is not set | ||
| 589 | # CONFIG_VIA_VELOCITY is not set | 541 | # CONFIG_VIA_VELOCITY is not set |
| 590 | # CONFIG_TIGON3 is not set | 542 | # CONFIG_TIGON3 is not set |
| 591 | # CONFIG_BNX2 is not set | 543 | # CONFIG_BNX2 is not set |
| @@ -617,15 +569,7 @@ CONFIG_NETDEV_10000=y | |||
| 617 | # CONFIG_NETCONSOLE is not set | 569 | # CONFIG_NETCONSOLE is not set |
| 618 | # CONFIG_NETPOLL is not set | 570 | # CONFIG_NETPOLL is not set |
| 619 | # CONFIG_NET_POLL_CONTROLLER is not set | 571 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 620 | |||
| 621 | # | ||
| 622 | # ISDN subsystem | ||
| 623 | # | ||
| 624 | # CONFIG_ISDN is not set | 572 | # CONFIG_ISDN is not set |
| 625 | |||
| 626 | # | ||
| 627 | # Telephony Support | ||
| 628 | # | ||
| 629 | # CONFIG_PHONE is not set | 573 | # CONFIG_PHONE is not set |
| 630 | 574 | ||
| 631 | # | 575 | # |
| @@ -691,10 +635,6 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
| 691 | CONFIG_UNIX98_PTYS=y | 635 | CONFIG_UNIX98_PTYS=y |
| 692 | CONFIG_LEGACY_PTYS=y | 636 | CONFIG_LEGACY_PTYS=y |
| 693 | CONFIG_LEGACY_PTY_COUNT=256 | 637 | CONFIG_LEGACY_PTY_COUNT=256 |
| 694 | |||
| 695 | # | ||
| 696 | # IPMI | ||
| 697 | # | ||
| 698 | # CONFIG_IPMI_HANDLER is not set | 638 | # CONFIG_IPMI_HANDLER is not set |
| 699 | # CONFIG_WATCHDOG is not set | 639 | # CONFIG_WATCHDOG is not set |
| 700 | # CONFIG_HW_RANDOM is not set | 640 | # CONFIG_HW_RANDOM is not set |
| @@ -706,10 +646,6 @@ CONFIG_GEN_RTC=y | |||
| 706 | # CONFIG_AGP is not set | 646 | # CONFIG_AGP is not set |
| 707 | # CONFIG_DRM is not set | 647 | # CONFIG_DRM is not set |
| 708 | # CONFIG_RAW_DRIVER is not set | 648 | # CONFIG_RAW_DRIVER is not set |
| 709 | |||
| 710 | # | ||
| 711 | # TPM devices | ||
| 712 | # | ||
| 713 | # CONFIG_TCG_TPM is not set | 649 | # CONFIG_TCG_TPM is not set |
| 714 | CONFIG_DEVPORT=y | 650 | CONFIG_DEVPORT=y |
| 715 | # CONFIG_I2C is not set | 651 | # CONFIG_I2C is not set |
| @@ -719,20 +655,24 @@ CONFIG_DEVPORT=y | |||
| 719 | # | 655 | # |
| 720 | # CONFIG_SPI is not set | 656 | # CONFIG_SPI is not set |
| 721 | # CONFIG_SPI_MASTER is not set | 657 | # CONFIG_SPI_MASTER is not set |
| 722 | |||
| 723 | # | ||
| 724 | # Dallas's 1-wire bus | ||
| 725 | # | ||
| 726 | # CONFIG_W1 is not set | 658 | # CONFIG_W1 is not set |
| 659 | # CONFIG_POWER_SUPPLY is not set | ||
| 727 | CONFIG_HWMON=y | 660 | CONFIG_HWMON=y |
| 728 | # CONFIG_HWMON_VID is not set | 661 | # CONFIG_HWMON_VID is not set |
| 729 | # CONFIG_SENSORS_ABITUGURU is not set | 662 | # CONFIG_SENSORS_ABITUGURU is not set |
| 663 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 730 | # CONFIG_SENSORS_F71805F is not set | 664 | # CONFIG_SENSORS_F71805F is not set |
| 665 | # CONFIG_SENSORS_IT87 is not set | ||
| 666 | # CONFIG_SENSORS_PC87360 is not set | ||
| 731 | # CONFIG_SENSORS_PC87427 is not set | 667 | # CONFIG_SENSORS_PC87427 is not set |
| 668 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 732 | # CONFIG_SENSORS_SMSC47M1 is not set | 669 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 733 | # CONFIG_SENSORS_SMSC47B397 is not set | 670 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 671 | # CONFIG_SENSORS_VIA686A is not set | ||
| 734 | # CONFIG_SENSORS_VT1211 is not set | 672 | # CONFIG_SENSORS_VT1211 is not set |
| 673 | # CONFIG_SENSORS_VT8231 is not set | ||
| 735 | # CONFIG_SENSORS_W83627HF is not set | 674 | # CONFIG_SENSORS_W83627HF is not set |
| 675 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 736 | # CONFIG_HWMON_DEBUG_CHIP is not set | 676 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 737 | 677 | ||
| 738 | # | 678 | # |
| @@ -757,6 +697,7 @@ CONFIG_HWMON=y | |||
| 757 | # | 697 | # |
| 758 | # CONFIG_DISPLAY_SUPPORT is not set | 698 | # CONFIG_DISPLAY_SUPPORT is not set |
| 759 | # CONFIG_VGASTATE is not set | 699 | # CONFIG_VGASTATE is not set |
| 700 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 760 | # CONFIG_FB is not set | 701 | # CONFIG_FB is not set |
| 761 | # CONFIG_FB_IBM_GXT4500 is not set | 702 | # CONFIG_FB_IBM_GXT4500 is not set |
| 762 | 703 | ||
| @@ -764,16 +705,10 @@ CONFIG_HWMON=y | |||
| 764 | # Sound | 705 | # Sound |
| 765 | # | 706 | # |
| 766 | # CONFIG_SOUND is not set | 707 | # CONFIG_SOUND is not set |
| 767 | 708 | CONFIG_HID_SUPPORT=y | |
| 768 | # | ||
| 769 | # HID Devices | ||
| 770 | # | ||
| 771 | CONFIG_HID=y | 709 | CONFIG_HID=y |
| 772 | # CONFIG_HID_DEBUG is not set | 710 | # CONFIG_HID_DEBUG is not set |
| 773 | 711 | CONFIG_USB_SUPPORT=y | |
| 774 | # | ||
| 775 | # USB support | ||
| 776 | # | ||
| 777 | CONFIG_USB_ARCH_HAS_HCD=y | 712 | CONFIG_USB_ARCH_HAS_HCD=y |
| 778 | CONFIG_USB_ARCH_HAS_OHCI=y | 713 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 779 | CONFIG_USB_ARCH_HAS_EHCI=y | 714 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -788,32 +723,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 788 | # | 723 | # |
| 789 | # CONFIG_USB_GADGET is not set | 724 | # CONFIG_USB_GADGET is not set |
| 790 | # CONFIG_MMC is not set | 725 | # CONFIG_MMC is not set |
| 791 | |||
| 792 | # | ||
| 793 | # LED devices | ||
| 794 | # | ||
| 795 | # CONFIG_NEW_LEDS is not set | 726 | # CONFIG_NEW_LEDS is not set |
| 796 | |||
| 797 | # | ||
| 798 | # LED drivers | ||
| 799 | # | ||
| 800 | |||
| 801 | # | ||
| 802 | # LED Triggers | ||
| 803 | # | ||
| 804 | |||
| 805 | # | ||
| 806 | # InfiniBand support | ||
| 807 | # | ||
| 808 | # CONFIG_INFINIBAND is not set | 727 | # CONFIG_INFINIBAND is not set |
| 809 | 728 | # CONFIG_EDAC is not set | |
| 810 | # | ||
| 811 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 812 | # | ||
| 813 | |||
| 814 | # | ||
| 815 | # Real Time Clock | ||
| 816 | # | ||
| 817 | # CONFIG_RTC_CLASS is not set | 729 | # CONFIG_RTC_CLASS is not set |
| 818 | 730 | ||
| 819 | # | 731 | # |
| @@ -830,6 +742,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 830 | # | 742 | # |
| 831 | 743 | ||
| 832 | # | 744 | # |
| 745 | # Userspace I/O | ||
| 746 | # | ||
| 747 | # CONFIG_UIO is not set | ||
| 748 | |||
| 749 | # | ||
| 833 | # File systems | 750 | # File systems |
| 834 | # | 751 | # |
| 835 | CONFIG_EXT2_FS=y | 752 | CONFIG_EXT2_FS=y |
| @@ -922,7 +839,6 @@ CONFIG_SUNRPC=y | |||
| 922 | # CONFIG_NCP_FS is not set | 839 | # CONFIG_NCP_FS is not set |
| 923 | # CONFIG_CODA_FS is not set | 840 | # CONFIG_CODA_FS is not set |
| 924 | # CONFIG_AFS_FS is not set | 841 | # CONFIG_AFS_FS is not set |
| 925 | # CONFIG_9P_FS is not set | ||
| 926 | 842 | ||
| 927 | # | 843 | # |
| 928 | # Partition Types | 844 | # Partition Types |
| @@ -965,6 +881,7 @@ CONFIG_BITREVERSE=y | |||
| 965 | # CONFIG_CRC16 is not set | 881 | # CONFIG_CRC16 is not set |
| 966 | # CONFIG_CRC_ITU_T is not set | 882 | # CONFIG_CRC_ITU_T is not set |
| 967 | CONFIG_CRC32=y | 883 | CONFIG_CRC32=y |
| 884 | # CONFIG_CRC7 is not set | ||
| 968 | # CONFIG_LIBCRC32C is not set | 885 | # CONFIG_LIBCRC32C is not set |
| 969 | CONFIG_PLIST=y | 886 | CONFIG_PLIST=y |
| 970 | CONFIG_HAS_IOMEM=y | 887 | CONFIG_HAS_IOMEM=y |
| @@ -989,6 +906,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 989 | CONFIG_DEBUG_KERNEL=y | 906 | CONFIG_DEBUG_KERNEL=y |
| 990 | # CONFIG_DEBUG_SHIRQ is not set | 907 | # CONFIG_DEBUG_SHIRQ is not set |
| 991 | CONFIG_DETECT_SOFTLOCKUP=y | 908 | CONFIG_DETECT_SOFTLOCKUP=y |
| 909 | # CONFIG_SCHED_DEBUG is not set | ||
| 992 | # CONFIG_SCHEDSTATS is not set | 910 | # CONFIG_SCHEDSTATS is not set |
| 993 | # CONFIG_TIMER_STATS is not set | 911 | # CONFIG_TIMER_STATS is not set |
| 994 | # CONFIG_DEBUG_SLAB is not set | 912 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1014,7 +932,6 @@ CONFIG_XMON=y | |||
| 1014 | CONFIG_XMON_DEFAULT=y | 932 | CONFIG_XMON_DEFAULT=y |
| 1015 | CONFIG_XMON_DISASSEMBLY=y | 933 | CONFIG_XMON_DISASSEMBLY=y |
| 1016 | # CONFIG_BDI_SWITCH is not set | 934 | # CONFIG_BDI_SWITCH is not set |
| 1017 | # CONFIG_BOOTX_TEXT is not set | ||
| 1018 | # CONFIG_PPC_EARLY_DEBUG is not set | 935 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1019 | 936 | ||
| 1020 | # | 937 | # |
| @@ -1022,8 +939,4 @@ CONFIG_XMON_DISASSEMBLY=y | |||
| 1022 | # | 939 | # |
| 1023 | # CONFIG_KEYS is not set | 940 | # CONFIG_KEYS is not set |
| 1024 | # CONFIG_SECURITY is not set | 941 | # CONFIG_SECURITY is not set |
| 1025 | |||
| 1026 | # | ||
| 1027 | # Cryptographic options | ||
| 1028 | # | ||
| 1029 | # CONFIG_CRYPTO is not set | 942 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 8e3367452427..3fe1929460e7 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
| @@ -1,9 +1,23 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 13:22:39 2007 | 4 | # Thu Aug 30 16:37:16 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_POWER4_ONLY is not set | ||
| 12 | CONFIG_POWER3=y | ||
| 13 | CONFIG_POWER4=y | ||
| 14 | CONFIG_PPC_FPU=y | ||
| 15 | # CONFIG_ALTIVEC is not set | ||
| 16 | CONFIG_PPC_STD_MMU=y | ||
| 17 | # CONFIG_PPC_MM_SLICES is not set | ||
| 18 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 19 | CONFIG_SMP=y | ||
| 20 | CONFIG_NR_CPUS=32 | ||
| 7 | CONFIG_64BIT=y | 21 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 22 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| @@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 35 | CONFIG_COMPAT=y |
| @@ -22,50 +37,32 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 25 | # CONFIG_PPC_UDBG_16550 is not set | 41 | # CONFIG_PPC_UDBG_16550 is not set |
| 26 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 27 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | |||
| 31 | # | ||
| 32 | # Processor support | ||
| 33 | # | ||
| 34 | # CONFIG_POWER4_ONLY is not set | ||
| 35 | CONFIG_POWER3=y | ||
| 36 | CONFIG_POWER4=y | ||
| 37 | CONFIG_PPC_FPU=y | ||
| 38 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 39 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 40 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | 48 | # CONFIG_PPC_OF_PLATFORM_PCI is not set |
| 41 | # CONFIG_ALTIVEC is not set | ||
| 42 | CONFIG_PPC_STD_MMU=y | ||
| 43 | # CONFIG_PPC_MM_SLICES is not set | ||
| 44 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 45 | CONFIG_SMP=y | ||
| 46 | CONFIG_NR_CPUS=32 | ||
| 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Code maturity level options | 52 | # General setup |
| 51 | # | 53 | # |
| 52 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 53 | CONFIG_LOCK_KERNEL=y | 55 | CONFIG_LOCK_KERNEL=y |
| 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 55 | |||
| 56 | # | ||
| 57 | # General setup | ||
| 58 | # | ||
| 59 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 60 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 61 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 62 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 63 | # CONFIG_IPC_NS is not set | ||
| 64 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 65 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 66 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 67 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 68 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 69 | CONFIG_AUDIT=y | 66 | CONFIG_AUDIT=y |
| 70 | CONFIG_AUDITSYSCALL=y | 67 | CONFIG_AUDITSYSCALL=y |
| 71 | CONFIG_IKCONFIG=y | 68 | CONFIG_IKCONFIG=y |
| @@ -102,10 +99,6 @@ CONFIG_SLAB=y | |||
| 102 | CONFIG_RT_MUTEXES=y | 99 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 100 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 101 | CONFIG_BASE_SMALL=0 |
| 105 | |||
| 106 | # | ||
| 107 | # Loadable module support | ||
| 108 | # | ||
| 109 | CONFIG_MODULES=y | 102 | CONFIG_MODULES=y |
| 110 | CONFIG_MODULE_UNLOAD=y | 103 | CONFIG_MODULE_UNLOAD=y |
| 111 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -113,12 +106,9 @@ CONFIG_MODVERSIONS=y | |||
| 113 | CONFIG_MODULE_SRCVERSION_ALL=y | 106 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 114 | CONFIG_KMOD=y | 107 | CONFIG_KMOD=y |
| 115 | CONFIG_STOP_MACHINE=y | 108 | CONFIG_STOP_MACHINE=y |
| 116 | |||
| 117 | # | ||
| 118 | # Block layer | ||
| 119 | # | ||
| 120 | CONFIG_BLOCK=y | 109 | CONFIG_BLOCK=y |
| 121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 111 | CONFIG_BLK_DEV_BSG=y | ||
| 122 | 112 | ||
| 123 | # | 113 | # |
| 124 | # IO Schedulers | 114 | # IO Schedulers |
| @@ -138,7 +128,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 138 | # | 128 | # |
| 139 | CONFIG_PPC_MULTIPLATFORM=y | 129 | CONFIG_PPC_MULTIPLATFORM=y |
| 140 | # CONFIG_EMBEDDED6xx is not set | 130 | # CONFIG_EMBEDDED6xx is not set |
| 141 | # CONFIG_APUS is not set | 131 | # CONFIG_PPC_82xx is not set |
| 132 | # CONFIG_PPC_83xx is not set | ||
| 133 | # CONFIG_PPC_86xx is not set | ||
| 142 | # CONFIG_PPC_PSERIES is not set | 134 | # CONFIG_PPC_PSERIES is not set |
| 143 | CONFIG_LPARCFG=y | 135 | CONFIG_LPARCFG=y |
| 144 | CONFIG_PPC_ISERIES=y | 136 | CONFIG_PPC_ISERIES=y |
| @@ -174,6 +166,7 @@ CONFIG_PPC_INDIRECT_IO=y | |||
| 174 | CONFIG_GENERIC_IOMAP=y | 166 | CONFIG_GENERIC_IOMAP=y |
| 175 | # CONFIG_CPU_FREQ is not set | 167 | # CONFIG_CPU_FREQ is not set |
| 176 | # CONFIG_CPM2 is not set | 168 | # CONFIG_CPM2 is not set |
| 169 | # CONFIG_FSL_ULI1575 is not set | ||
| 177 | 170 | ||
| 178 | # | 171 | # |
| 179 | # Kernel options | 172 | # Kernel options |
| @@ -210,6 +203,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 203 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | CONFIG_RESOURCES_64BIT=y | 204 | CONFIG_RESOURCES_64BIT=y |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 205 | CONFIG_ZONE_DMA_FLAG=1 |
| 206 | CONFIG_BOUNCE=y | ||
| 213 | # CONFIG_PPC_HAS_HASH_64K is not set | 207 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 214 | # CONFIG_PPC_64K_PAGES is not set | 208 | # CONFIG_PPC_64K_PAGES is not set |
| 215 | # CONFIG_SCHED_SMT is not set | 209 | # CONFIG_SCHED_SMT is not set |
| @@ -228,6 +222,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 228 | # CONFIG_PPC_INDIRECT_PCI is not set | 222 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 229 | CONFIG_PCI=y | 223 | CONFIG_PCI=y |
| 230 | CONFIG_PCI_DOMAINS=y | 224 | CONFIG_PCI_DOMAINS=y |
| 225 | CONFIG_PCI_SYSCALL=y | ||
| 231 | # CONFIG_PCIEPORTBUS is not set | 226 | # CONFIG_PCIEPORTBUS is not set |
| 232 | CONFIG_ARCH_SUPPORTS_MSI=y | 227 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 233 | # CONFIG_PCI_MSI is not set | 228 | # CONFIG_PCI_MSI is not set |
| @@ -299,6 +294,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 299 | CONFIG_NF_CONNTRACK_MARK=y | 294 | CONFIG_NF_CONNTRACK_MARK=y |
| 300 | CONFIG_NF_CONNTRACK_EVENTS=y | 295 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 301 | # CONFIG_NF_CT_PROTO_SCTP is not set | 296 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 297 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 302 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 298 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| 303 | CONFIG_NF_CONNTRACK_FTP=m | 299 | CONFIG_NF_CONNTRACK_FTP=m |
| 304 | # CONFIG_NF_CONNTRACK_H323 is not set | 300 | # CONFIG_NF_CONNTRACK_H323 is not set |
| @@ -316,9 +312,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 316 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 312 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 317 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 313 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 318 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set | 314 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set |
| 315 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
| 319 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 316 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
| 320 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 317 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 321 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set | 318 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set |
| 319 | # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set | ||
| 322 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 320 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 323 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 321 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 324 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 322 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| @@ -339,6 +337,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m | |||
| 339 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 337 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 340 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 338 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 341 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 339 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 340 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
| 342 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 341 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set |
| 343 | 342 | ||
| 344 | # | 343 | # |
| @@ -427,6 +426,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 427 | # CONFIG_MAC80211 is not set | 426 | # CONFIG_MAC80211 is not set |
| 428 | # CONFIG_IEEE80211 is not set | 427 | # CONFIG_IEEE80211 is not set |
| 429 | # CONFIG_RFKILL is not set | 428 | # CONFIG_RFKILL is not set |
| 429 | # CONFIG_NET_9P is not set | ||
| 430 | 430 | ||
| 431 | # | 431 | # |
| 432 | # Device Drivers | 432 | # Device Drivers |
| @@ -441,28 +441,12 @@ CONFIG_FW_LOADER=m | |||
| 441 | # CONFIG_DEBUG_DRIVER is not set | 441 | # CONFIG_DEBUG_DRIVER is not set |
| 442 | # CONFIG_DEBUG_DEVRES is not set | 442 | # CONFIG_DEBUG_DEVRES is not set |
| 443 | # CONFIG_SYS_HYPERVISOR is not set | 443 | # CONFIG_SYS_HYPERVISOR is not set |
| 444 | |||
| 445 | # | ||
| 446 | # Connector - unified userspace <-> kernelspace linker | ||
| 447 | # | ||
| 448 | # CONFIG_CONNECTOR is not set | 444 | # CONFIG_CONNECTOR is not set |
| 449 | # CONFIG_MTD is not set | 445 | # CONFIG_MTD is not set |
| 450 | 446 | CONFIG_OF_DEVICE=y | |
| 451 | # | ||
| 452 | # Parallel port support | ||
| 453 | # | ||
| 454 | # CONFIG_PARPORT is not set | 447 | # CONFIG_PARPORT is not set |
| 455 | 448 | CONFIG_BLK_DEV=y | |
| 456 | # | ||
| 457 | # Plug and Play support | ||
| 458 | # | ||
| 459 | # CONFIG_PNPACPI is not set | ||
| 460 | |||
| 461 | # | ||
| 462 | # Block devices | ||
| 463 | # | ||
| 464 | # CONFIG_BLK_DEV_FD is not set | 449 | # CONFIG_BLK_DEV_FD is not set |
| 465 | # CONFIG_BLK_CPQ_DA is not set | ||
| 466 | # CONFIG_BLK_CPQ_CISS_DA is not set | 450 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 467 | # CONFIG_BLK_DEV_DAC960 is not set | 451 | # CONFIG_BLK_DEV_DAC960 is not set |
| 468 | # CONFIG_BLK_DEV_UMEM is not set | 452 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -477,14 +461,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
| 477 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 461 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 478 | # CONFIG_CDROM_PKTCDVD is not set | 462 | # CONFIG_CDROM_PKTCDVD is not set |
| 479 | # CONFIG_ATA_OVER_ETH is not set | 463 | # CONFIG_ATA_OVER_ETH is not set |
| 480 | 464 | CONFIG_MISC_DEVICES=y | |
| 481 | # | ||
| 482 | # Misc devices | ||
| 483 | # | ||
| 484 | # CONFIG_PHANTOM is not set | 465 | # CONFIG_PHANTOM is not set |
| 466 | # CONFIG_EEPROM_93CX6 is not set | ||
| 485 | # CONFIG_SGI_IOC4 is not set | 467 | # CONFIG_SGI_IOC4 is not set |
| 486 | # CONFIG_TIFM_CORE is not set | 468 | # CONFIG_TIFM_CORE is not set |
| 487 | # CONFIG_BLINK is not set | ||
| 488 | # CONFIG_IDE is not set | 469 | # CONFIG_IDE is not set |
| 489 | 470 | ||
| 490 | # | 471 | # |
| @@ -492,6 +473,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 492 | # | 473 | # |
| 493 | # CONFIG_RAID_ATTRS is not set | 474 | # CONFIG_RAID_ATTRS is not set |
| 494 | CONFIG_SCSI=y | 475 | CONFIG_SCSI=y |
| 476 | CONFIG_SCSI_DMA=y | ||
| 495 | # CONFIG_SCSI_TGT is not set | 477 | # CONFIG_SCSI_TGT is not set |
| 496 | CONFIG_SCSI_NETLINK=y | 478 | CONFIG_SCSI_NETLINK=y |
| 497 | CONFIG_SCSI_PROC_FS=y | 479 | CONFIG_SCSI_PROC_FS=y |
| @@ -525,10 +507,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 525 | CONFIG_SCSI_SAS_ATTRS=m | 507 | CONFIG_SCSI_SAS_ATTRS=m |
| 526 | CONFIG_SCSI_SAS_LIBSAS=m | 508 | CONFIG_SCSI_SAS_LIBSAS=m |
| 527 | CONFIG_SCSI_SAS_LIBSAS_DEBUG=y | 509 | CONFIG_SCSI_SAS_LIBSAS_DEBUG=y |
| 528 | 510 | CONFIG_SCSI_LOWLEVEL=y | |
| 529 | # | ||
| 530 | # SCSI low-level drivers | ||
| 531 | # | ||
| 532 | # CONFIG_ISCSI_TCP is not set | 511 | # CONFIG_ISCSI_TCP is not set |
| 533 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 512 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 534 | # CONFIG_SCSI_3W_9XXX is not set | 513 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -543,7 +522,6 @@ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y | |||
| 543 | # CONFIG_MEGARAID_LEGACY is not set | 522 | # CONFIG_MEGARAID_LEGACY is not set |
| 544 | # CONFIG_MEGARAID_SAS is not set | 523 | # CONFIG_MEGARAID_SAS is not set |
| 545 | # CONFIG_SCSI_HPTIOP is not set | 524 | # CONFIG_SCSI_HPTIOP is not set |
| 546 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 547 | # CONFIG_SCSI_DMX3191D is not set | 525 | # CONFIG_SCSI_DMX3191D is not set |
| 548 | # CONFIG_SCSI_EATA is not set | 526 | # CONFIG_SCSI_EATA is not set |
| 549 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 527 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -563,10 +541,6 @@ CONFIG_SCSI_IBMVSCSI=m | |||
| 563 | # CONFIG_SCSI_DEBUG is not set | 541 | # CONFIG_SCSI_DEBUG is not set |
| 564 | # CONFIG_SCSI_SRP is not set | 542 | # CONFIG_SCSI_SRP is not set |
| 565 | # CONFIG_ATA is not set | 543 | # CONFIG_ATA is not set |
| 566 | |||
| 567 | # | ||
| 568 | # Multi-device support (RAID and LVM) | ||
| 569 | # | ||
| 570 | CONFIG_MD=y | 544 | CONFIG_MD=y |
| 571 | CONFIG_BLK_DEV_MD=y | 545 | CONFIG_BLK_DEV_MD=y |
| 572 | CONFIG_MD_LINEAR=y | 546 | CONFIG_MD_LINEAR=y |
| @@ -598,37 +572,23 @@ CONFIG_DM_ZERO=m | |||
| 598 | # | 572 | # |
| 599 | # CONFIG_FIREWIRE is not set | 573 | # CONFIG_FIREWIRE is not set |
| 600 | # CONFIG_IEEE1394 is not set | 574 | # CONFIG_IEEE1394 is not set |
| 601 | |||
| 602 | # | ||
| 603 | # I2O device support | ||
| 604 | # | ||
| 605 | # CONFIG_I2O is not set | 575 | # CONFIG_I2O is not set |
| 606 | # CONFIG_MACINTOSH_DRIVERS is not set | 576 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 607 | |||
| 608 | # | ||
| 609 | # Network device support | ||
| 610 | # | ||
| 611 | CONFIG_NETDEVICES=y | 577 | CONFIG_NETDEVICES=y |
| 578 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 612 | CONFIG_DUMMY=m | 579 | CONFIG_DUMMY=m |
| 613 | CONFIG_BONDING=m | 580 | CONFIG_BONDING=m |
| 581 | # CONFIG_MACVLAN is not set | ||
| 614 | # CONFIG_EQUALIZER is not set | 582 | # CONFIG_EQUALIZER is not set |
| 615 | CONFIG_TUN=m | 583 | CONFIG_TUN=m |
| 616 | # CONFIG_ARCNET is not set | 584 | # CONFIG_ARCNET is not set |
| 617 | # CONFIG_PHYLIB is not set | 585 | # CONFIG_PHYLIB is not set |
| 618 | |||
| 619 | # | ||
| 620 | # Ethernet (10 or 100Mbit) | ||
| 621 | # | ||
| 622 | CONFIG_NET_ETHERNET=y | 586 | CONFIG_NET_ETHERNET=y |
| 623 | CONFIG_MII=y | 587 | CONFIG_MII=y |
| 624 | # CONFIG_HAPPYMEAL is not set | 588 | # CONFIG_HAPPYMEAL is not set |
| 625 | # CONFIG_SUNGEM is not set | 589 | # CONFIG_SUNGEM is not set |
| 626 | # CONFIG_CASSINI is not set | 590 | # CONFIG_CASSINI is not set |
| 627 | # CONFIG_NET_VENDOR_3COM is not set | 591 | # CONFIG_NET_VENDOR_3COM is not set |
| 628 | |||
| 629 | # | ||
| 630 | # Tulip family network device support | ||
| 631 | # | ||
| 632 | # CONFIG_NET_TULIP is not set | 592 | # CONFIG_NET_TULIP is not set |
| 633 | # CONFIG_HP100 is not set | 593 | # CONFIG_HP100 is not set |
| 634 | CONFIG_NET_PCI=y | 594 | CONFIG_NET_PCI=y |
| @@ -665,7 +625,6 @@ CONFIG_E1000=m | |||
| 665 | # CONFIG_SIS190 is not set | 625 | # CONFIG_SIS190 is not set |
| 666 | # CONFIG_SKGE is not set | 626 | # CONFIG_SKGE is not set |
| 667 | # CONFIG_SKY2 is not set | 627 | # CONFIG_SKY2 is not set |
| 668 | # CONFIG_SK98LIN is not set | ||
| 669 | # CONFIG_VIA_VELOCITY is not set | 628 | # CONFIG_VIA_VELOCITY is not set |
| 670 | # CONFIG_TIGON3 is not set | 629 | # CONFIG_TIGON3 is not set |
| 671 | # CONFIG_BNX2 is not set | 630 | # CONFIG_BNX2 is not set |
| @@ -703,6 +662,7 @@ CONFIG_PPP_DEFLATE=m | |||
| 703 | CONFIG_PPP_BSDCOMP=m | 662 | CONFIG_PPP_BSDCOMP=m |
| 704 | # CONFIG_PPP_MPPE is not set | 663 | # CONFIG_PPP_MPPE is not set |
| 705 | CONFIG_PPPOE=m | 664 | CONFIG_PPPOE=m |
| 665 | # CONFIG_PPPOL2TP is not set | ||
| 706 | # CONFIG_SLIP is not set | 666 | # CONFIG_SLIP is not set |
| 707 | CONFIG_SLHC=m | 667 | CONFIG_SLHC=m |
| 708 | # CONFIG_NET_FC is not set | 668 | # CONFIG_NET_FC is not set |
| @@ -711,15 +671,7 @@ CONFIG_NETCONSOLE=y | |||
| 711 | CONFIG_NETPOLL=y | 671 | CONFIG_NETPOLL=y |
| 712 | CONFIG_NETPOLL_TRAP=y | 672 | CONFIG_NETPOLL_TRAP=y |
| 713 | CONFIG_NET_POLL_CONTROLLER=y | 673 | CONFIG_NET_POLL_CONTROLLER=y |
| 714 | |||
| 715 | # | ||
| 716 | # ISDN subsystem | ||
| 717 | # | ||
| 718 | # CONFIG_ISDN is not set | 674 | # CONFIG_ISDN is not set |
| 719 | |||
| 720 | # | ||
| 721 | # Telephony Support | ||
| 722 | # | ||
| 723 | # CONFIG_PHONE is not set | 675 | # CONFIG_PHONE is not set |
| 724 | 676 | ||
| 725 | # | 677 | # |
| @@ -782,10 +734,6 @@ CONFIG_LEGACY_PTYS=y | |||
| 782 | CONFIG_LEGACY_PTY_COUNT=256 | 734 | CONFIG_LEGACY_PTY_COUNT=256 |
| 783 | CONFIG_HVC_DRIVER=y | 735 | CONFIG_HVC_DRIVER=y |
| 784 | CONFIG_HVC_ISERIES=y | 736 | CONFIG_HVC_ISERIES=y |
| 785 | |||
| 786 | # | ||
| 787 | # IPMI | ||
| 788 | # | ||
| 789 | # CONFIG_IPMI_HANDLER is not set | 737 | # CONFIG_IPMI_HANDLER is not set |
| 790 | # CONFIG_WATCHDOG is not set | 738 | # CONFIG_WATCHDOG is not set |
| 791 | # CONFIG_HW_RANDOM is not set | 739 | # CONFIG_HW_RANDOM is not set |
| @@ -798,10 +746,6 @@ CONFIG_GEN_RTC=y | |||
| 798 | CONFIG_RAW_DRIVER=y | 746 | CONFIG_RAW_DRIVER=y |
| 799 | CONFIG_MAX_RAW_DEVS=256 | 747 | CONFIG_MAX_RAW_DEVS=256 |
| 800 | # CONFIG_HANGCHECK_TIMER is not set | 748 | # CONFIG_HANGCHECK_TIMER is not set |
| 801 | |||
| 802 | # | ||
| 803 | # TPM devices | ||
| 804 | # | ||
| 805 | # CONFIG_TCG_TPM is not set | 749 | # CONFIG_TCG_TPM is not set |
| 806 | CONFIG_DEVPORT=y | 750 | CONFIG_DEVPORT=y |
| 807 | # CONFIG_I2C is not set | 751 | # CONFIG_I2C is not set |
| @@ -811,11 +755,8 @@ CONFIG_DEVPORT=y | |||
| 811 | # | 755 | # |
| 812 | # CONFIG_SPI is not set | 756 | # CONFIG_SPI is not set |
| 813 | # CONFIG_SPI_MASTER is not set | 757 | # CONFIG_SPI_MASTER is not set |
| 814 | |||
| 815 | # | ||
| 816 | # Dallas's 1-wire bus | ||
| 817 | # | ||
| 818 | # CONFIG_W1 is not set | 758 | # CONFIG_W1 is not set |
| 759 | # CONFIG_POWER_SUPPLY is not set | ||
| 819 | # CONFIG_HWMON is not set | 760 | # CONFIG_HWMON is not set |
| 820 | 761 | ||
| 821 | # | 762 | # |
| @@ -840,6 +781,7 @@ CONFIG_DEVPORT=y | |||
| 840 | # | 781 | # |
| 841 | # CONFIG_DISPLAY_SUPPORT is not set | 782 | # CONFIG_DISPLAY_SUPPORT is not set |
| 842 | # CONFIG_VGASTATE is not set | 783 | # CONFIG_VGASTATE is not set |
| 784 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 843 | # CONFIG_FB is not set | 785 | # CONFIG_FB is not set |
| 844 | # CONFIG_FB_IBM_GXT4500 is not set | 786 | # CONFIG_FB_IBM_GXT4500 is not set |
| 845 | 787 | ||
| @@ -854,55 +796,12 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 854 | # Sound | 796 | # Sound |
| 855 | # | 797 | # |
| 856 | # CONFIG_SOUND is not set | 798 | # CONFIG_SOUND is not set |
| 857 | 799 | # CONFIG_HID_SUPPORT is not set | |
| 858 | # | 800 | # CONFIG_USB_SUPPORT is not set |
| 859 | # HID Devices | ||
| 860 | # | ||
| 861 | # CONFIG_HID is not set | ||
| 862 | |||
| 863 | # | ||
| 864 | # USB support | ||
| 865 | # | ||
| 866 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 867 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 868 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 869 | # CONFIG_USB is not set | ||
| 870 | |||
| 871 | # | ||
| 872 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 873 | # | ||
| 874 | |||
| 875 | # | ||
| 876 | # USB Gadget Support | ||
| 877 | # | ||
| 878 | # CONFIG_USB_GADGET is not set | ||
| 879 | # CONFIG_MMC is not set | 801 | # CONFIG_MMC is not set |
| 880 | |||
| 881 | # | ||
| 882 | # LED devices | ||
| 883 | # | ||
| 884 | # CONFIG_NEW_LEDS is not set | 802 | # CONFIG_NEW_LEDS is not set |
| 885 | |||
| 886 | # | ||
| 887 | # LED drivers | ||
| 888 | # | ||
| 889 | |||
| 890 | # | ||
| 891 | # LED Triggers | ||
| 892 | # | ||
| 893 | |||
| 894 | # | ||
| 895 | # InfiniBand support | ||
| 896 | # | ||
| 897 | # CONFIG_INFINIBAND is not set | 803 | # CONFIG_INFINIBAND is not set |
| 898 | 804 | # CONFIG_EDAC is not set | |
| 899 | # | ||
| 900 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 901 | # | ||
| 902 | |||
| 903 | # | ||
| 904 | # Real Time Clock | ||
| 905 | # | ||
| 906 | # CONFIG_RTC_CLASS is not set | 805 | # CONFIG_RTC_CLASS is not set |
| 907 | 806 | ||
| 908 | # | 807 | # |
| @@ -919,6 +818,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 919 | # | 818 | # |
| 920 | 819 | ||
| 921 | # | 820 | # |
| 821 | # Userspace I/O | ||
| 822 | # | ||
| 823 | # CONFIG_UIO is not set | ||
| 824 | |||
| 825 | # | ||
| 922 | # File systems | 826 | # File systems |
| 923 | # | 827 | # |
| 924 | CONFIG_EXT2_FS=y | 828 | CONFIG_EXT2_FS=y |
| @@ -1052,7 +956,6 @@ CONFIG_CIFS_POSIX=y | |||
| 1052 | # CONFIG_NCP_FS is not set | 956 | # CONFIG_NCP_FS is not set |
| 1053 | # CONFIG_CODA_FS is not set | 957 | # CONFIG_CODA_FS is not set |
| 1054 | # CONFIG_AFS_FS is not set | 958 | # CONFIG_AFS_FS is not set |
| 1055 | # CONFIG_9P_FS is not set | ||
| 1056 | 959 | ||
| 1057 | # | 960 | # |
| 1058 | # Partition Types | 961 | # Partition Types |
| @@ -1119,6 +1022,7 @@ CONFIG_CRC_CCITT=m | |||
| 1119 | # CONFIG_CRC16 is not set | 1022 | # CONFIG_CRC16 is not set |
| 1120 | # CONFIG_CRC_ITU_T is not set | 1023 | # CONFIG_CRC_ITU_T is not set |
| 1121 | CONFIG_CRC32=y | 1024 | CONFIG_CRC32=y |
| 1025 | # CONFIG_CRC7 is not set | ||
| 1122 | CONFIG_LIBCRC32C=m | 1026 | CONFIG_LIBCRC32C=m |
| 1123 | CONFIG_ZLIB_INFLATE=y | 1027 | CONFIG_ZLIB_INFLATE=y |
| 1124 | CONFIG_ZLIB_DEFLATE=m | 1028 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1149,6 +1053,7 @@ CONFIG_DEBUG_FS=y | |||
| 1149 | CONFIG_DEBUG_KERNEL=y | 1053 | CONFIG_DEBUG_KERNEL=y |
| 1150 | # CONFIG_DEBUG_SHIRQ is not set | 1054 | # CONFIG_DEBUG_SHIRQ is not set |
| 1151 | CONFIG_DETECT_SOFTLOCKUP=y | 1055 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1056 | CONFIG_SCHED_DEBUG=y | ||
| 1152 | # CONFIG_SCHEDSTATS is not set | 1057 | # CONFIG_SCHEDSTATS is not set |
| 1153 | # CONFIG_TIMER_STATS is not set | 1058 | # CONFIG_TIMER_STATS is not set |
| 1154 | # CONFIG_DEBUG_SLAB is not set | 1059 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1179,10 +1084,6 @@ CONFIG_IRQSTACKS=y | |||
| 1179 | # | 1084 | # |
| 1180 | # CONFIG_KEYS is not set | 1085 | # CONFIG_KEYS is not set |
| 1181 | # CONFIG_SECURITY is not set | 1086 | # CONFIG_SECURITY is not set |
| 1182 | |||
| 1183 | # | ||
| 1184 | # Cryptographic options | ||
| 1185 | # | ||
| 1186 | CONFIG_CRYPTO=y | 1087 | CONFIG_CRYPTO=y |
| 1187 | CONFIG_CRYPTO_ALGAPI=y | 1088 | CONFIG_CRYPTO_ALGAPI=y |
| 1188 | CONFIG_CRYPTO_BLKCIPHER=y | 1089 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1222,7 +1123,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1222 | CONFIG_CRYPTO_CRC32C=m | 1123 | CONFIG_CRYPTO_CRC32C=m |
| 1223 | # CONFIG_CRYPTO_CAMELLIA is not set | 1124 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1224 | CONFIG_CRYPTO_TEST=m | 1125 | CONFIG_CRYPTO_TEST=m |
| 1225 | 1126 | # CONFIG_CRYPTO_HW is not set | |
| 1226 | # | ||
| 1227 | # Hardware crypto devices | ||
| 1228 | # | ||
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 78fd07c5f47f..a4e3ee045a6a 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
| @@ -1,9 +1,24 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 13:25:19 2007 | 4 | # Tue Aug 28 21:24:38 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_PPC_STD_MMU=y | ||
| 19 | CONFIG_PPC_STD_MMU_32=y | ||
| 20 | # CONFIG_PPC_MM_SLICES is not set | ||
| 21 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 23 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 24 | CONFIG_MMU=y |
| @@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 35 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 40 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 41 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 44 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | CONFIG_CLASSIC32=y | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 45 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 46 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | # CONFIG_ALTIVEC is not set | ||
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 48 | ||
| 52 | # | 49 | # |
| 53 | # Code maturity level options | 50 | # General setup |
| 54 | # | 51 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 52 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 53 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 55 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 56 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 57 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 58 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 59 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | CONFIG_POSIX_MQUEUE=y | 60 | CONFIG_POSIX_MQUEUE=y |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 61 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 62 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 63 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 64 | # CONFIG_AUDIT is not set |
| 73 | CONFIG_IKCONFIG=y | 65 | CONFIG_IKCONFIG=y |
| 74 | CONFIG_IKCONFIG_PROC=y | 66 | CONFIG_IKCONFIG_PROC=y |
| @@ -103,24 +95,17 @@ CONFIG_SLAB=y | |||
| 103 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
| 104 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
| 105 | CONFIG_BASE_SMALL=0 | 97 | CONFIG_BASE_SMALL=0 |
| 106 | |||
| 107 | # | ||
| 108 | # Loadable module support | ||
| 109 | # | ||
| 110 | CONFIG_MODULES=y | 98 | CONFIG_MODULES=y |
| 111 | CONFIG_MODULE_UNLOAD=y | 99 | CONFIG_MODULE_UNLOAD=y |
| 112 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 100 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 113 | # CONFIG_MODVERSIONS is not set | 101 | # CONFIG_MODVERSIONS is not set |
| 114 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 102 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 115 | CONFIG_KMOD=y | 103 | CONFIG_KMOD=y |
| 116 | |||
| 117 | # | ||
| 118 | # Block layer | ||
| 119 | # | ||
| 120 | CONFIG_BLOCK=y | 104 | CONFIG_BLOCK=y |
| 121 | # CONFIG_LBD is not set | 105 | # CONFIG_LBD is not set |
| 122 | # CONFIG_BLK_DEV_IO_TRACE is not set | 106 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 123 | # CONFIG_LSF is not set | 107 | # CONFIG_LSF is not set |
| 108 | # CONFIG_BLK_DEV_BSG is not set | ||
| 124 | 109 | ||
| 125 | # | 110 | # |
| 126 | # IO Schedulers | 111 | # IO Schedulers |
| @@ -140,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 140 | # | 125 | # |
| 141 | # CONFIG_PPC_MULTIPLATFORM is not set | 126 | # CONFIG_PPC_MULTIPLATFORM is not set |
| 142 | CONFIG_EMBEDDED6xx=y | 127 | CONFIG_EMBEDDED6xx=y |
| 143 | # CONFIG_APUS is not set | 128 | # CONFIG_PPC_82xx is not set |
| 129 | # CONFIG_PPC_83xx is not set | ||
| 130 | # CONFIG_PPC_86xx is not set | ||
| 144 | # CONFIG_PPC_MPC52xx is not set | 131 | # CONFIG_PPC_MPC52xx is not set |
| 145 | # CONFIG_PPC_MPC5200 is not set | 132 | # CONFIG_PPC_MPC5200 is not set |
| 146 | # CONFIG_PPC_CELL is not set | 133 | # CONFIG_PPC_CELL is not set |
| @@ -163,8 +150,8 @@ CONFIG_MPIC=y | |||
| 163 | # CONFIG_PPC_INDIRECT_IO is not set | 150 | # CONFIG_PPC_INDIRECT_IO is not set |
| 164 | # CONFIG_GENERIC_IOMAP is not set | 151 | # CONFIG_GENERIC_IOMAP is not set |
| 165 | # CONFIG_CPU_FREQ is not set | 152 | # CONFIG_CPU_FREQ is not set |
| 166 | # CONFIG_TAU is not set | ||
| 167 | # CONFIG_CPM2 is not set | 153 | # CONFIG_CPM2 is not set |
| 154 | # CONFIG_FSL_ULI1575 is not set | ||
| 168 | 155 | ||
| 169 | # | 156 | # |
| 170 | # Kernel options | 157 | # Kernel options |
| @@ -193,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 193 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 180 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 194 | # CONFIG_RESOURCES_64BIT is not set | 181 | # CONFIG_RESOURCES_64BIT is not set |
| 195 | CONFIG_ZONE_DMA_FLAG=1 | 182 | CONFIG_ZONE_DMA_FLAG=1 |
| 183 | CONFIG_BOUNCE=y | ||
| 184 | CONFIG_VIRT_TO_BUS=y | ||
| 196 | CONFIG_PROC_DEVICETREE=y | 185 | CONFIG_PROC_DEVICETREE=y |
| 197 | # CONFIG_CMDLINE_BOOL is not set | 186 | # CONFIG_CMDLINE_BOOL is not set |
| 198 | # CONFIG_PM is not set | 187 | # CONFIG_PM is not set |
| @@ -206,10 +195,10 @@ CONFIG_ISA_DMA_API=y | |||
| 206 | CONFIG_ZONE_DMA=y | 195 | CONFIG_ZONE_DMA=y |
| 207 | CONFIG_GENERIC_ISA_DMA=y | 196 | CONFIG_GENERIC_ISA_DMA=y |
| 208 | CONFIG_PPC_INDIRECT_PCI=y | 197 | CONFIG_PPC_INDIRECT_PCI=y |
| 209 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 210 | CONFIG_FSL_SOC=y | 198 | CONFIG_FSL_SOC=y |
| 211 | CONFIG_PCI=y | 199 | CONFIG_PCI=y |
| 212 | CONFIG_PCI_DOMAINS=y | 200 | CONFIG_PCI_DOMAINS=y |
| 201 | CONFIG_PCI_SYSCALL=y | ||
| 213 | # CONFIG_PCIEPORTBUS is not set | 202 | # CONFIG_PCIEPORTBUS is not set |
| 214 | CONFIG_ARCH_SUPPORTS_MSI=y | 203 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 215 | # CONFIG_PCI_MSI is not set | 204 | # CONFIG_PCI_MSI is not set |
| @@ -297,6 +286,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 297 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 286 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 298 | CONFIG_NF_CT_PROTO_GRE=m | 287 | CONFIG_NF_CT_PROTO_GRE=m |
| 299 | CONFIG_NF_CT_PROTO_SCTP=m | 288 | CONFIG_NF_CT_PROTO_SCTP=m |
| 289 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 300 | CONFIG_NF_CONNTRACK_AMANDA=m | 290 | CONFIG_NF_CONNTRACK_AMANDA=m |
| 301 | CONFIG_NF_CONNTRACK_FTP=m | 291 | CONFIG_NF_CONNTRACK_FTP=m |
| 302 | CONFIG_NF_CONNTRACK_H323=m | 292 | CONFIG_NF_CONNTRACK_H323=m |
| @@ -314,9 +304,11 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 314 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | 304 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set |
| 315 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 305 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 316 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set | 306 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set |
| 307 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
| 317 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 308 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
| 318 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set | 309 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set |
| 319 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set | 310 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set |
| 311 | # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set | ||
| 320 | # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set | 312 | # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set |
| 321 | # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set | 313 | # CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set |
| 322 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 314 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| @@ -337,6 +329,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m | |||
| 337 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 329 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 338 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | 330 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set |
| 339 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | 331 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set |
| 332 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
| 340 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 333 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set |
| 341 | 334 | ||
| 342 | # | 335 | # |
| @@ -425,6 +418,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
| 425 | CONFIG_IEEE80211_SOFTMAC=m | 418 | CONFIG_IEEE80211_SOFTMAC=m |
| 426 | CONFIG_IEEE80211_SOFTMAC_DEBUG=y | 419 | CONFIG_IEEE80211_SOFTMAC_DEBUG=y |
| 427 | # CONFIG_RFKILL is not set | 420 | # CONFIG_RFKILL is not set |
| 421 | # CONFIG_NET_9P is not set | ||
| 428 | 422 | ||
| 429 | # | 423 | # |
| 430 | # Device Drivers | 424 | # Device Drivers |
| @@ -439,10 +433,6 @@ CONFIG_FW_LOADER=m | |||
| 439 | # CONFIG_DEBUG_DRIVER is not set | 433 | # CONFIG_DEBUG_DRIVER is not set |
| 440 | # CONFIG_DEBUG_DEVRES is not set | 434 | # CONFIG_DEBUG_DEVRES is not set |
| 441 | # CONFIG_SYS_HYPERVISOR is not set | 435 | # CONFIG_SYS_HYPERVISOR is not set |
| 442 | |||
| 443 | # | ||
| 444 | # Connector - unified userspace <-> kernelspace linker | ||
| 445 | # | ||
| 446 | # CONFIG_CONNECTOR is not set | 436 | # CONFIG_CONNECTOR is not set |
| 447 | CONFIG_MTD=y | 437 | CONFIG_MTD=y |
| 448 | # CONFIG_MTD_DEBUG is not set | 438 | # CONFIG_MTD_DEBUG is not set |
| @@ -526,20 +516,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 526 | # UBI - Unsorted block images | 516 | # UBI - Unsorted block images |
| 527 | # | 517 | # |
| 528 | # CONFIG_MTD_UBI is not set | 518 | # CONFIG_MTD_UBI is not set |
| 529 | 519 | CONFIG_OF_DEVICE=y | |
| 530 | # | ||
| 531 | # Parallel port support | ||
| 532 | # | ||
| 533 | # CONFIG_PARPORT is not set | 520 | # CONFIG_PARPORT is not set |
| 534 | 521 | CONFIG_BLK_DEV=y | |
| 535 | # | ||
| 536 | # Plug and Play support | ||
| 537 | # | ||
| 538 | # CONFIG_PNPACPI is not set | ||
| 539 | |||
| 540 | # | ||
| 541 | # Block devices | ||
| 542 | # | ||
| 543 | # CONFIG_BLK_DEV_FD is not set | 522 | # CONFIG_BLK_DEV_FD is not set |
| 544 | # CONFIG_BLK_CPQ_DA is not set | 523 | # CONFIG_BLK_CPQ_DA is not set |
| 545 | # CONFIG_BLK_CPQ_CISS_DA is not set | 524 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -557,14 +536,11 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
| 557 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 536 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 558 | # CONFIG_CDROM_PKTCDVD is not set | 537 | # CONFIG_CDROM_PKTCDVD is not set |
| 559 | # CONFIG_ATA_OVER_ETH is not set | 538 | # CONFIG_ATA_OVER_ETH is not set |
| 560 | 539 | CONFIG_MISC_DEVICES=y | |
| 561 | # | ||
| 562 | # Misc devices | ||
| 563 | # | ||
| 564 | # CONFIG_PHANTOM is not set | 540 | # CONFIG_PHANTOM is not set |
| 541 | # CONFIG_EEPROM_93CX6 is not set | ||
| 565 | # CONFIG_SGI_IOC4 is not set | 542 | # CONFIG_SGI_IOC4 is not set |
| 566 | # CONFIG_TIFM_CORE is not set | 543 | # CONFIG_TIFM_CORE is not set |
| 567 | # CONFIG_BLINK is not set | ||
| 568 | # CONFIG_IDE is not set | 544 | # CONFIG_IDE is not set |
| 569 | 545 | ||
| 570 | # | 546 | # |
| @@ -572,6 +548,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 572 | # | 548 | # |
| 573 | # CONFIG_RAID_ATTRS is not set | 549 | # CONFIG_RAID_ATTRS is not set |
| 574 | CONFIG_SCSI=y | 550 | CONFIG_SCSI=y |
| 551 | CONFIG_SCSI_DMA=y | ||
| 575 | # CONFIG_SCSI_TGT is not set | 552 | # CONFIG_SCSI_TGT is not set |
| 576 | # CONFIG_SCSI_NETLINK is not set | 553 | # CONFIG_SCSI_NETLINK is not set |
| 577 | CONFIG_SCSI_PROC_FS=y | 554 | CONFIG_SCSI_PROC_FS=y |
| @@ -601,12 +578,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 601 | # CONFIG_SCSI_SPI_ATTRS is not set | 578 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 602 | # CONFIG_SCSI_FC_ATTRS is not set | 579 | # CONFIG_SCSI_FC_ATTRS is not set |
| 603 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 580 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 604 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 605 | # CONFIG_SCSI_SAS_LIBSAS is not set | 581 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 606 | 582 | CONFIG_SCSI_LOWLEVEL=y | |
| 607 | # | ||
| 608 | # SCSI low-level drivers | ||
| 609 | # | ||
| 610 | # CONFIG_ISCSI_TCP is not set | 583 | # CONFIG_ISCSI_TCP is not set |
| 611 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 584 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 612 | # CONFIG_SCSI_3W_9XXX is not set | 585 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -696,10 +669,6 @@ CONFIG_PATA_SIL680=y | |||
| 696 | # CONFIG_PATA_SIS is not set | 669 | # CONFIG_PATA_SIS is not set |
| 697 | # CONFIG_PATA_VIA is not set | 670 | # CONFIG_PATA_VIA is not set |
| 698 | # CONFIG_PATA_WINBOND is not set | 671 | # CONFIG_PATA_WINBOND is not set |
| 699 | |||
| 700 | # | ||
| 701 | # Multi-device support (RAID and LVM) | ||
| 702 | # | ||
| 703 | # CONFIG_MD is not set | 672 | # CONFIG_MD is not set |
| 704 | 673 | ||
| 705 | # | 674 | # |
| @@ -715,37 +684,23 @@ CONFIG_PATA_SIL680=y | |||
| 715 | # | 684 | # |
| 716 | # CONFIG_FIREWIRE is not set | 685 | # CONFIG_FIREWIRE is not set |
| 717 | # CONFIG_IEEE1394 is not set | 686 | # CONFIG_IEEE1394 is not set |
| 718 | |||
| 719 | # | ||
| 720 | # I2O device support | ||
| 721 | # | ||
| 722 | # CONFIG_I2O is not set | 687 | # CONFIG_I2O is not set |
| 723 | # CONFIG_MACINTOSH_DRIVERS is not set | 688 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 724 | |||
| 725 | # | ||
| 726 | # Network device support | ||
| 727 | # | ||
| 728 | CONFIG_NETDEVICES=y | 689 | CONFIG_NETDEVICES=y |
| 690 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 729 | # CONFIG_DUMMY is not set | 691 | # CONFIG_DUMMY is not set |
| 730 | # CONFIG_BONDING is not set | 692 | # CONFIG_BONDING is not set |
| 693 | # CONFIG_MACVLAN is not set | ||
| 731 | # CONFIG_EQUALIZER is not set | 694 | # CONFIG_EQUALIZER is not set |
| 732 | CONFIG_TUN=m | 695 | CONFIG_TUN=m |
| 733 | # CONFIG_ARCNET is not set | 696 | # CONFIG_ARCNET is not set |
| 734 | # CONFIG_PHYLIB is not set | 697 | # CONFIG_PHYLIB is not set |
| 735 | |||
| 736 | # | ||
| 737 | # Ethernet (10 or 100Mbit) | ||
| 738 | # | ||
| 739 | CONFIG_NET_ETHERNET=y | 698 | CONFIG_NET_ETHERNET=y |
| 740 | # CONFIG_MII is not set | 699 | # CONFIG_MII is not set |
| 741 | # CONFIG_HAPPYMEAL is not set | 700 | # CONFIG_HAPPYMEAL is not set |
| 742 | # CONFIG_SUNGEM is not set | 701 | # CONFIG_SUNGEM is not set |
| 743 | # CONFIG_CASSINI is not set | 702 | # CONFIG_CASSINI is not set |
| 744 | # CONFIG_NET_VENDOR_3COM is not set | 703 | # CONFIG_NET_VENDOR_3COM is not set |
| 745 | |||
| 746 | # | ||
| 747 | # Tulip family network device support | ||
| 748 | # | ||
| 749 | CONFIG_NET_TULIP=y | 704 | CONFIG_NET_TULIP=y |
| 750 | # CONFIG_DE2104X is not set | 705 | # CONFIG_DE2104X is not set |
| 751 | CONFIG_TULIP=y | 706 | CONFIG_TULIP=y |
| @@ -770,7 +725,6 @@ CONFIG_R8169=y | |||
| 770 | # CONFIG_SIS190 is not set | 725 | # CONFIG_SIS190 is not set |
| 771 | # CONFIG_SKGE is not set | 726 | # CONFIG_SKGE is not set |
| 772 | # CONFIG_SKY2 is not set | 727 | # CONFIG_SKY2 is not set |
| 773 | # CONFIG_SK98LIN is not set | ||
| 774 | # CONFIG_VIA_VELOCITY is not set | 728 | # CONFIG_VIA_VELOCITY is not set |
| 775 | # CONFIG_TIGON3 is not set | 729 | # CONFIG_TIGON3 is not set |
| 776 | # CONFIG_BNX2 is not set | 730 | # CONFIG_BNX2 is not set |
| @@ -812,15 +766,7 @@ CONFIG_NETCONSOLE=y | |||
| 812 | CONFIG_NETPOLL=y | 766 | CONFIG_NETPOLL=y |
| 813 | # CONFIG_NETPOLL_TRAP is not set | 767 | # CONFIG_NETPOLL_TRAP is not set |
| 814 | CONFIG_NET_POLL_CONTROLLER=y | 768 | CONFIG_NET_POLL_CONTROLLER=y |
| 815 | |||
| 816 | # | ||
| 817 | # ISDN subsystem | ||
| 818 | # | ||
| 819 | # CONFIG_ISDN is not set | 769 | # CONFIG_ISDN is not set |
| 820 | |||
| 821 | # | ||
| 822 | # Telephony Support | ||
| 823 | # | ||
| 824 | # CONFIG_PHONE is not set | 770 | # CONFIG_PHONE is not set |
| 825 | 771 | ||
| 826 | # | 772 | # |
| @@ -898,10 +844,6 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
| 898 | CONFIG_UNIX98_PTYS=y | 844 | CONFIG_UNIX98_PTYS=y |
| 899 | CONFIG_LEGACY_PTYS=y | 845 | CONFIG_LEGACY_PTYS=y |
| 900 | CONFIG_LEGACY_PTY_COUNT=256 | 846 | CONFIG_LEGACY_PTY_COUNT=256 |
| 901 | |||
| 902 | # | ||
| 903 | # IPMI | ||
| 904 | # | ||
| 905 | # CONFIG_IPMI_HANDLER is not set | 847 | # CONFIG_IPMI_HANDLER is not set |
| 906 | # CONFIG_WATCHDOG is not set | 848 | # CONFIG_WATCHDOG is not set |
| 907 | CONFIG_HW_RANDOM=y | 849 | CONFIG_HW_RANDOM=y |
| @@ -912,10 +854,6 @@ CONFIG_HW_RANDOM=y | |||
| 912 | # CONFIG_AGP is not set | 854 | # CONFIG_AGP is not set |
| 913 | # CONFIG_DRM is not set | 855 | # CONFIG_DRM is not set |
| 914 | # CONFIG_RAW_DRIVER is not set | 856 | # CONFIG_RAW_DRIVER is not set |
| 915 | |||
| 916 | # | ||
| 917 | # TPM devices | ||
| 918 | # | ||
| 919 | # CONFIG_TCG_TPM is not set | 857 | # CONFIG_TCG_TPM is not set |
| 920 | CONFIG_DEVPORT=y | 858 | CONFIG_DEVPORT=y |
| 921 | CONFIG_I2C=y | 859 | CONFIG_I2C=y |
| @@ -950,6 +888,7 @@ CONFIG_I2C_MPC=y | |||
| 950 | # CONFIG_I2C_SIS5595 is not set | 888 | # CONFIG_I2C_SIS5595 is not set |
| 951 | # CONFIG_I2C_SIS630 is not set | 889 | # CONFIG_I2C_SIS630 is not set |
| 952 | # CONFIG_I2C_SIS96X is not set | 890 | # CONFIG_I2C_SIS96X is not set |
| 891 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 953 | # CONFIG_I2C_STUB is not set | 892 | # CONFIG_I2C_STUB is not set |
| 954 | # CONFIG_I2C_TINY_USB is not set | 893 | # CONFIG_I2C_TINY_USB is not set |
| 955 | # CONFIG_I2C_VIA is not set | 894 | # CONFIG_I2C_VIA is not set |
| @@ -961,12 +900,14 @@ CONFIG_I2C_MPC=y | |||
| 961 | # | 900 | # |
| 962 | # CONFIG_SENSORS_DS1337 is not set | 901 | # CONFIG_SENSORS_DS1337 is not set |
| 963 | # CONFIG_SENSORS_DS1374 is not set | 902 | # CONFIG_SENSORS_DS1374 is not set |
| 903 | # CONFIG_DS1682 is not set | ||
| 964 | CONFIG_SENSORS_EEPROM=m | 904 | CONFIG_SENSORS_EEPROM=m |
| 965 | # CONFIG_SENSORS_PCF8574 is not set | 905 | # CONFIG_SENSORS_PCF8574 is not set |
| 966 | # CONFIG_SENSORS_PCA9539 is not set | 906 | # CONFIG_SENSORS_PCA9539 is not set |
| 967 | # CONFIG_SENSORS_PCF8591 is not set | 907 | # CONFIG_SENSORS_PCF8591 is not set |
| 968 | # CONFIG_SENSORS_M41T00 is not set | 908 | # CONFIG_SENSORS_M41T00 is not set |
| 969 | # CONFIG_SENSORS_MAX6875 is not set | 909 | # CONFIG_SENSORS_MAX6875 is not set |
| 910 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 970 | # CONFIG_I2C_DEBUG_CORE is not set | 911 | # CONFIG_I2C_DEBUG_CORE is not set |
| 971 | # CONFIG_I2C_DEBUG_ALGO is not set | 912 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 972 | # CONFIG_I2C_DEBUG_BUS is not set | 913 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -977,14 +918,12 @@ CONFIG_SENSORS_EEPROM=m | |||
| 977 | # | 918 | # |
| 978 | # CONFIG_SPI is not set | 919 | # CONFIG_SPI is not set |
| 979 | # CONFIG_SPI_MASTER is not set | 920 | # CONFIG_SPI_MASTER is not set |
| 980 | |||
| 981 | # | ||
| 982 | # Dallas's 1-wire bus | ||
| 983 | # | ||
| 984 | # CONFIG_W1 is not set | 921 | # CONFIG_W1 is not set |
| 922 | # CONFIG_POWER_SUPPLY is not set | ||
| 985 | CONFIG_HWMON=y | 923 | CONFIG_HWMON=y |
| 986 | # CONFIG_HWMON_VID is not set | 924 | # CONFIG_HWMON_VID is not set |
| 987 | # CONFIG_SENSORS_ABITUGURU is not set | 925 | # CONFIG_SENSORS_ABITUGURU is not set |
| 926 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 988 | # CONFIG_SENSORS_AD7418 is not set | 927 | # CONFIG_SENSORS_AD7418 is not set |
| 989 | # CONFIG_SENSORS_ADM1021 is not set | 928 | # CONFIG_SENSORS_ADM1021 is not set |
| 990 | # CONFIG_SENSORS_ADM1025 is not set | 929 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -1011,14 +950,17 @@ CONFIG_HWMON=y | |||
| 1011 | # CONFIG_SENSORS_LM87 is not set | 950 | # CONFIG_SENSORS_LM87 is not set |
| 1012 | # CONFIG_SENSORS_LM90 is not set | 951 | # CONFIG_SENSORS_LM90 is not set |
| 1013 | # CONFIG_SENSORS_LM92 is not set | 952 | # CONFIG_SENSORS_LM92 is not set |
| 953 | # CONFIG_SENSORS_LM93 is not set | ||
| 1014 | # CONFIG_SENSORS_MAX1619 is not set | 954 | # CONFIG_SENSORS_MAX1619 is not set |
| 1015 | # CONFIG_SENSORS_MAX6650 is not set | 955 | # CONFIG_SENSORS_MAX6650 is not set |
| 1016 | # CONFIG_SENSORS_PC87360 is not set | 956 | # CONFIG_SENSORS_PC87360 is not set |
| 1017 | # CONFIG_SENSORS_PC87427 is not set | 957 | # CONFIG_SENSORS_PC87427 is not set |
| 1018 | # CONFIG_SENSORS_SIS5595 is not set | 958 | # CONFIG_SENSORS_SIS5595 is not set |
| 959 | # CONFIG_SENSORS_DME1737 is not set | ||
| 1019 | # CONFIG_SENSORS_SMSC47M1 is not set | 960 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 1020 | # CONFIG_SENSORS_SMSC47M192 is not set | 961 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 1021 | # CONFIG_SENSORS_SMSC47B397 is not set | 962 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 963 | # CONFIG_SENSORS_THMC50 is not set | ||
| 1022 | # CONFIG_SENSORS_VIA686A is not set | 964 | # CONFIG_SENSORS_VIA686A is not set |
| 1023 | # CONFIG_SENSORS_VT1211 is not set | 965 | # CONFIG_SENSORS_VT1211 is not set |
| 1024 | # CONFIG_SENSORS_VT8231 is not set | 966 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -1053,6 +995,7 @@ CONFIG_HWMON=y | |||
| 1053 | # | 995 | # |
| 1054 | # CONFIG_DISPLAY_SUPPORT is not set | 996 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1055 | # CONFIG_VGASTATE is not set | 997 | # CONFIG_VGASTATE is not set |
| 998 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 1056 | # CONFIG_FB is not set | 999 | # CONFIG_FB is not set |
| 1057 | # CONFIG_FB_IBM_GXT4500 is not set | 1000 | # CONFIG_FB_IBM_GXT4500 is not set |
| 1058 | 1001 | ||
| @@ -1066,10 +1009,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 1066 | # Sound | 1009 | # Sound |
| 1067 | # | 1010 | # |
| 1068 | # CONFIG_SOUND is not set | 1011 | # CONFIG_SOUND is not set |
| 1069 | 1012 | CONFIG_HID_SUPPORT=y | |
| 1070 | # | ||
| 1071 | # HID Devices | ||
| 1072 | # | ||
| 1073 | CONFIG_HID=m | 1013 | CONFIG_HID=m |
| 1074 | # CONFIG_HID_DEBUG is not set | 1014 | # CONFIG_HID_DEBUG is not set |
| 1075 | 1015 | ||
| @@ -1083,10 +1023,7 @@ CONFIG_HID=m | |||
| 1083 | # | 1023 | # |
| 1084 | # CONFIG_USB_KBD is not set | 1024 | # CONFIG_USB_KBD is not set |
| 1085 | # CONFIG_USB_MOUSE is not set | 1025 | # CONFIG_USB_MOUSE is not set |
| 1086 | 1026 | CONFIG_USB_SUPPORT=y | |
| 1087 | # | ||
| 1088 | # USB support | ||
| 1089 | # | ||
| 1090 | CONFIG_USB_ARCH_HAS_HCD=y | 1027 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1091 | CONFIG_USB_ARCH_HAS_OHCI=y | 1028 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1092 | CONFIG_USB_ARCH_HAS_EHCI=y | 1029 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1108,7 +1045,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 1108 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 1045 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 1109 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1046 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1110 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1047 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1111 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1112 | # CONFIG_USB_ISP116X_HCD is not set | 1048 | # CONFIG_USB_ISP116X_HCD is not set |
| 1113 | CONFIG_USB_OHCI_HCD=y | 1049 | CONFIG_USB_OHCI_HCD=y |
| 1114 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1050 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -1120,6 +1056,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 1120 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1056 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1121 | # CONFIG_USB_UHCI_HCD is not set | 1057 | # CONFIG_USB_UHCI_HCD is not set |
| 1122 | # CONFIG_USB_SL811_HCD is not set | 1058 | # CONFIG_USB_SL811_HCD is not set |
| 1059 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1123 | 1060 | ||
| 1124 | # | 1061 | # |
| 1125 | # USB Device Class drivers | 1062 | # USB Device Class drivers |
| @@ -1192,6 +1129,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1192 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1129 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1193 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1130 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1194 | # CONFIG_USB_SERIAL_PL2303 is not set | 1131 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1132 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
| 1195 | # CONFIG_USB_SERIAL_HP4X is not set | 1133 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1196 | # CONFIG_USB_SERIAL_SAFE is not set | 1134 | # CONFIG_USB_SERIAL_SAFE is not set |
| 1197 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1135 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -1235,32 +1173,9 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1235 | # | 1173 | # |
| 1236 | # CONFIG_USB_GADGET is not set | 1174 | # CONFIG_USB_GADGET is not set |
| 1237 | # CONFIG_MMC is not set | 1175 | # CONFIG_MMC is not set |
| 1238 | |||
| 1239 | # | ||
| 1240 | # LED devices | ||
| 1241 | # | ||
| 1242 | # CONFIG_NEW_LEDS is not set | 1176 | # CONFIG_NEW_LEDS is not set |
| 1243 | |||
| 1244 | # | ||
| 1245 | # LED drivers | ||
| 1246 | # | ||
| 1247 | |||
| 1248 | # | ||
| 1249 | # LED Triggers | ||
| 1250 | # | ||
| 1251 | |||
| 1252 | # | ||
| 1253 | # InfiniBand support | ||
| 1254 | # | ||
| 1255 | # CONFIG_INFINIBAND is not set | 1177 | # CONFIG_INFINIBAND is not set |
| 1256 | 1178 | # CONFIG_EDAC is not set | |
| 1257 | # | ||
| 1258 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1259 | # | ||
| 1260 | |||
| 1261 | # | ||
| 1262 | # Real Time Clock | ||
| 1263 | # | ||
| 1264 | CONFIG_RTC_LIB=y | 1179 | CONFIG_RTC_LIB=y |
| 1265 | CONFIG_RTC_CLASS=y | 1180 | CONFIG_RTC_CLASS=y |
| 1266 | CONFIG_RTC_HCTOSYS=y | 1181 | CONFIG_RTC_HCTOSYS=y |
| @@ -1287,6 +1202,7 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1287 | # CONFIG_RTC_DRV_X1205 is not set | 1202 | # CONFIG_RTC_DRV_X1205 is not set |
| 1288 | # CONFIG_RTC_DRV_PCF8563 is not set | 1203 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1289 | # CONFIG_RTC_DRV_PCF8583 is not set | 1204 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1205 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1290 | 1206 | ||
| 1291 | # | 1207 | # |
| 1292 | # SPI RTC drivers | 1208 | # SPI RTC drivers |
| @@ -1295,9 +1211,12 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1295 | # | 1211 | # |
| 1296 | # Platform RTC drivers | 1212 | # Platform RTC drivers |
| 1297 | # | 1213 | # |
| 1214 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1298 | # CONFIG_RTC_DRV_DS1553 is not set | 1215 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1216 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1299 | # CONFIG_RTC_DRV_DS1742 is not set | 1217 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1300 | # CONFIG_RTC_DRV_M48T86 is not set | 1218 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1219 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1301 | # CONFIG_RTC_DRV_V3020 is not set | 1220 | # CONFIG_RTC_DRV_V3020 is not set |
| 1302 | 1221 | ||
| 1303 | # | 1222 | # |
| @@ -1318,6 +1237,11 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1318 | # | 1237 | # |
| 1319 | 1238 | ||
| 1320 | # | 1239 | # |
| 1240 | # Userspace I/O | ||
| 1241 | # | ||
| 1242 | # CONFIG_UIO is not set | ||
| 1243 | |||
| 1244 | # | ||
| 1321 | # File systems | 1245 | # File systems |
| 1322 | # | 1246 | # |
| 1323 | CONFIG_EXT2_FS=y | 1247 | CONFIG_EXT2_FS=y |
| @@ -1437,7 +1361,6 @@ CONFIG_CIFS=m | |||
| 1437 | # CONFIG_NCP_FS is not set | 1361 | # CONFIG_NCP_FS is not set |
| 1438 | # CONFIG_CODA_FS is not set | 1362 | # CONFIG_CODA_FS is not set |
| 1439 | # CONFIG_AFS_FS is not set | 1363 | # CONFIG_AFS_FS is not set |
| 1440 | # CONFIG_9P_FS is not set | ||
| 1441 | 1364 | ||
| 1442 | # | 1365 | # |
| 1443 | # Partition Types | 1366 | # Partition Types |
| @@ -1503,6 +1426,7 @@ CONFIG_CRC_CCITT=m | |||
| 1503 | # CONFIG_CRC16 is not set | 1426 | # CONFIG_CRC16 is not set |
| 1504 | # CONFIG_CRC_ITU_T is not set | 1427 | # CONFIG_CRC_ITU_T is not set |
| 1505 | CONFIG_CRC32=y | 1428 | CONFIG_CRC32=y |
| 1429 | # CONFIG_CRC7 is not set | ||
| 1506 | CONFIG_LIBCRC32C=m | 1430 | CONFIG_LIBCRC32C=m |
| 1507 | CONFIG_ZLIB_INFLATE=m | 1431 | CONFIG_ZLIB_INFLATE=m |
| 1508 | CONFIG_ZLIB_DEFLATE=m | 1432 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1532,6 +1456,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1532 | CONFIG_DEBUG_KERNEL=y | 1456 | CONFIG_DEBUG_KERNEL=y |
| 1533 | # CONFIG_DEBUG_SHIRQ is not set | 1457 | # CONFIG_DEBUG_SHIRQ is not set |
| 1534 | CONFIG_DETECT_SOFTLOCKUP=y | 1458 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1459 | CONFIG_SCHED_DEBUG=y | ||
| 1535 | # CONFIG_SCHEDSTATS is not set | 1460 | # CONFIG_SCHEDSTATS is not set |
| 1536 | # CONFIG_TIMER_STATS is not set | 1461 | # CONFIG_TIMER_STATS is not set |
| 1537 | # CONFIG_DEBUG_SLAB is not set | 1462 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1554,7 +1479,6 @@ CONFIG_FORCED_INLINING=y | |||
| 1554 | # CONFIG_DEBUG_PAGEALLOC is not set | 1479 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1555 | # CONFIG_DEBUGGER is not set | 1480 | # CONFIG_DEBUGGER is not set |
| 1556 | # CONFIG_BDI_SWITCH is not set | 1481 | # CONFIG_BDI_SWITCH is not set |
| 1557 | # CONFIG_BOOTX_TEXT is not set | ||
| 1558 | # CONFIG_PPC_EARLY_DEBUG is not set | 1482 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1559 | 1483 | ||
| 1560 | # | 1484 | # |
| @@ -1562,10 +1486,6 @@ CONFIG_FORCED_INLINING=y | |||
| 1562 | # | 1486 | # |
| 1563 | # CONFIG_KEYS is not set | 1487 | # CONFIG_KEYS is not set |
| 1564 | # CONFIG_SECURITY is not set | 1488 | # CONFIG_SECURITY is not set |
| 1565 | |||
| 1566 | # | ||
| 1567 | # Cryptographic options | ||
| 1568 | # | ||
| 1569 | CONFIG_CRYPTO=y | 1489 | CONFIG_CRYPTO=y |
| 1570 | CONFIG_CRYPTO_ALGAPI=y | 1490 | CONFIG_CRYPTO_ALGAPI=y |
| 1571 | CONFIG_CRYPTO_BLKCIPHER=y | 1491 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1604,7 +1524,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1604 | CONFIG_CRYPTO_CRC32C=m | 1524 | CONFIG_CRYPTO_CRC32C=m |
| 1605 | # CONFIG_CRYPTO_CAMELLIA is not set | 1525 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1606 | # CONFIG_CRYPTO_TEST is not set | 1526 | # CONFIG_CRYPTO_TEST is not set |
| 1607 | 1527 | CONFIG_CRYPTO_HW=y | |
| 1608 | # | ||
| 1609 | # Hardware crypto devices | ||
| 1610 | # | ||
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig index 9c30ca451617..d42e226d3a28 100644 --- a/arch/powerpc/configs/lite5200_defconfig +++ b/arch/powerpc/configs/lite5200_defconfig | |||
| @@ -1,10 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 13:26:09 2007 | 4 | # Tue Aug 28 21:24:38 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC_PM_NEEDS_RTC_LIB=y | 7 | |
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | # CONFIG_ALTIVEC is not set | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 8 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 9 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 10 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -15,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 18 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 21 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 22 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 23 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 24 | # CONFIG_PPC_UDBG_16550 is not set | 41 | # CONFIG_PPC_UDBG_16550 is not set |
| 25 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 26 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 27 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 28 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
| 29 | |||
| 30 | # | ||
| 31 | # Processor support | ||
| 32 | # | ||
| 33 | CONFIG_CLASSIC32=y | ||
| 34 | # CONFIG_PPC_82xx is not set | ||
| 35 | # CONFIG_PPC_83xx is not set | ||
| 36 | # CONFIG_PPC_85xx is not set | ||
| 37 | # CONFIG_PPC_86xx is not set | ||
| 38 | # CONFIG_PPC_8xx is not set | ||
| 39 | # CONFIG_40x is not set | ||
| 40 | # CONFIG_44x is not set | ||
| 41 | # CONFIG_E200 is not set | ||
| 42 | CONFIG_6xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | # CONFIG_ALTIVEC is not set | ||
| 47 | CONFIG_PPC_STD_MMU=y | ||
| 48 | CONFIG_PPC_STD_MMU_32=y | ||
| 49 | # CONFIG_PPC_MM_SLICES is not set | ||
| 50 | # CONFIG_SMP is not set | ||
| 51 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 52 | 49 | ||
| 53 | # | 50 | # |
| 54 | # Code maturity level options | 51 | # General setup |
| 55 | # | 52 | # |
| 56 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 57 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 58 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 59 | |||
| 60 | # | ||
| 61 | # General setup | ||
| 62 | # | ||
| 63 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 64 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 65 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 66 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 67 | # CONFIG_IPC_NS is not set | ||
| 68 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 69 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 70 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 71 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 72 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 73 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 74 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -101,24 +93,17 @@ CONFIG_SLAB=y | |||
| 101 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 102 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 103 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 104 | |||
| 105 | # | ||
| 106 | # Loadable module support | ||
| 107 | # | ||
| 108 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 109 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 110 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 111 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 112 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 113 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 114 | |||
| 115 | # | ||
| 116 | # Block layer | ||
| 117 | # | ||
| 118 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 119 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 121 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 122 | 107 | ||
| 123 | # | 108 | # |
| 124 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -138,7 +123,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 138 | # | 123 | # |
| 139 | CONFIG_PPC_MULTIPLATFORM=y | 124 | CONFIG_PPC_MULTIPLATFORM=y |
| 140 | # CONFIG_EMBEDDED6xx is not set | 125 | # CONFIG_EMBEDDED6xx is not set |
| 141 | # CONFIG_APUS is not set | 126 | # CONFIG_PPC_82xx is not set |
| 127 | # CONFIG_PPC_83xx is not set | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 129 | CONFIG_CLASSIC32=y | ||
| 142 | # CONFIG_PPC_CHRP is not set | 130 | # CONFIG_PPC_CHRP is not set |
| 143 | CONFIG_PPC_MPC52xx=y | 131 | CONFIG_PPC_MPC52xx=y |
| 144 | CONFIG_PPC_MPC5200=y | 132 | CONFIG_PPC_MPC5200=y |
| @@ -161,6 +149,7 @@ CONFIG_PPC_LITE5200=y | |||
| 161 | # CONFIG_CPU_FREQ is not set | 149 | # CONFIG_CPU_FREQ is not set |
| 162 | # CONFIG_TAU is not set | 150 | # CONFIG_TAU is not set |
| 163 | # CONFIG_CPM2 is not set | 151 | # CONFIG_CPM2 is not set |
| 152 | # CONFIG_FSL_ULI1575 is not set | ||
| 164 | 153 | ||
| 165 | # | 154 | # |
| 166 | # Kernel options | 155 | # Kernel options |
| @@ -190,12 +179,15 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 190 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 179 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 191 | # CONFIG_RESOURCES_64BIT is not set | 180 | # CONFIG_RESOURCES_64BIT is not set |
| 192 | CONFIG_ZONE_DMA_FLAG=1 | 181 | CONFIG_ZONE_DMA_FLAG=1 |
| 182 | CONFIG_BOUNCE=y | ||
| 183 | CONFIG_VIRT_TO_BUS=y | ||
| 193 | CONFIG_PROC_DEVICETREE=y | 184 | CONFIG_PROC_DEVICETREE=y |
| 194 | # CONFIG_CMDLINE_BOOL is not set | 185 | # CONFIG_CMDLINE_BOOL is not set |
| 195 | CONFIG_PM=y | 186 | CONFIG_PM=y |
| 196 | # CONFIG_PM_LEGACY is not set | 187 | # CONFIG_PM_LEGACY is not set |
| 197 | # CONFIG_PM_DEBUG is not set | 188 | # CONFIG_PM_DEBUG is not set |
| 198 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 189 | CONFIG_PM_SLEEP=y |
| 190 | CONFIG_SUSPEND=y | ||
| 199 | # CONFIG_HIBERNATION is not set | 191 | # CONFIG_HIBERNATION is not set |
| 200 | CONFIG_SECCOMP=y | 192 | CONFIG_SECCOMP=y |
| 201 | # CONFIG_WANT_DEVICE_TREE is not set | 193 | # CONFIG_WANT_DEVICE_TREE is not set |
| @@ -210,6 +202,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 210 | CONFIG_FSL_SOC=y | 202 | CONFIG_FSL_SOC=y |
| 211 | CONFIG_PCI=y | 203 | CONFIG_PCI=y |
| 212 | CONFIG_PCI_DOMAINS=y | 204 | CONFIG_PCI_DOMAINS=y |
| 205 | CONFIG_PCI_SYSCALL=y | ||
| 213 | # CONFIG_PCIEPORTBUS is not set | 206 | # CONFIG_PCIEPORTBUS is not set |
| 214 | CONFIG_ARCH_SUPPORTS_MSI=y | 207 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 215 | # CONFIG_PCI_MSI is not set | 208 | # CONFIG_PCI_MSI is not set |
| @@ -320,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 320 | # CONFIG_MAC80211 is not set | 313 | # CONFIG_MAC80211 is not set |
| 321 | # CONFIG_IEEE80211 is not set | 314 | # CONFIG_IEEE80211 is not set |
| 322 | # CONFIG_RFKILL is not set | 315 | # CONFIG_RFKILL is not set |
| 316 | # CONFIG_NET_9P is not set | ||
| 323 | 317 | ||
| 324 | # | 318 | # |
| 325 | # Device Drivers | 319 | # Device Drivers |
| @@ -334,26 +328,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 334 | # CONFIG_DEBUG_DRIVER is not set | 328 | # CONFIG_DEBUG_DRIVER is not set |
| 335 | # CONFIG_DEBUG_DEVRES is not set | 329 | # CONFIG_DEBUG_DEVRES is not set |
| 336 | # CONFIG_SYS_HYPERVISOR is not set | 330 | # CONFIG_SYS_HYPERVISOR is not set |
| 337 | |||
| 338 | # | ||
| 339 | # Connector - unified userspace <-> kernelspace linker | ||
| 340 | # | ||
| 341 | # CONFIG_CONNECTOR is not set | 331 | # CONFIG_CONNECTOR is not set |
| 342 | # CONFIG_MTD is not set | 332 | # CONFIG_MTD is not set |
| 343 | 333 | CONFIG_OF_DEVICE=y | |
| 344 | # | ||
| 345 | # Parallel port support | ||
| 346 | # | ||
| 347 | # CONFIG_PARPORT is not set | 334 | # CONFIG_PARPORT is not set |
| 348 | 335 | CONFIG_BLK_DEV=y | |
| 349 | # | ||
| 350 | # Plug and Play support | ||
| 351 | # | ||
| 352 | # CONFIG_PNPACPI is not set | ||
| 353 | |||
| 354 | # | ||
| 355 | # Block devices | ||
| 356 | # | ||
| 357 | # CONFIG_BLK_DEV_FD is not set | 336 | # CONFIG_BLK_DEV_FD is not set |
| 358 | # CONFIG_BLK_CPQ_DA is not set | 337 | # CONFIG_BLK_CPQ_DA is not set |
| 359 | # CONFIG_BLK_CPQ_CISS_DA is not set | 338 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -370,14 +349,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 370 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 349 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 371 | # CONFIG_CDROM_PKTCDVD is not set | 350 | # CONFIG_CDROM_PKTCDVD is not set |
| 372 | # CONFIG_ATA_OVER_ETH is not set | 351 | # CONFIG_ATA_OVER_ETH is not set |
| 373 | 352 | CONFIG_MISC_DEVICES=y | |
| 374 | # | ||
| 375 | # Misc devices | ||
| 376 | # | ||
| 377 | # CONFIG_PHANTOM is not set | 353 | # CONFIG_PHANTOM is not set |
| 354 | # CONFIG_EEPROM_93CX6 is not set | ||
| 378 | # CONFIG_SGI_IOC4 is not set | 355 | # CONFIG_SGI_IOC4 is not set |
| 379 | # CONFIG_TIFM_CORE is not set | 356 | # CONFIG_TIFM_CORE is not set |
| 380 | # CONFIG_BLINK is not set | ||
| 381 | # CONFIG_IDE is not set | 357 | # CONFIG_IDE is not set |
| 382 | 358 | ||
| 383 | # | 359 | # |
| @@ -385,6 +361,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 385 | # | 361 | # |
| 386 | # CONFIG_RAID_ATTRS is not set | 362 | # CONFIG_RAID_ATTRS is not set |
| 387 | CONFIG_SCSI=y | 363 | CONFIG_SCSI=y |
| 364 | CONFIG_SCSI_DMA=y | ||
| 388 | # CONFIG_SCSI_TGT is not set | 365 | # CONFIG_SCSI_TGT is not set |
| 389 | # CONFIG_SCSI_NETLINK is not set | 366 | # CONFIG_SCSI_NETLINK is not set |
| 390 | # CONFIG_SCSI_PROC_FS is not set | 367 | # CONFIG_SCSI_PROC_FS is not set |
| @@ -414,12 +391,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 414 | # CONFIG_SCSI_SPI_ATTRS is not set | 391 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 415 | # CONFIG_SCSI_FC_ATTRS is not set | 392 | # CONFIG_SCSI_FC_ATTRS is not set |
| 416 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 393 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 417 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 418 | # CONFIG_SCSI_SAS_LIBSAS is not set | 394 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 419 | 395 | CONFIG_SCSI_LOWLEVEL=y | |
| 420 | # | ||
| 421 | # SCSI low-level drivers | ||
| 422 | # | ||
| 423 | # CONFIG_ISCSI_TCP is not set | 396 | # CONFIG_ISCSI_TCP is not set |
| 424 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 397 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 425 | # CONFIG_SCSI_3W_9XXX is not set | 398 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -511,10 +484,6 @@ CONFIG_PATA_MPC52xx=y | |||
| 511 | # CONFIG_PATA_VIA is not set | 484 | # CONFIG_PATA_VIA is not set |
| 512 | # CONFIG_PATA_WINBOND is not set | 485 | # CONFIG_PATA_WINBOND is not set |
| 513 | # CONFIG_PATA_PLATFORM is not set | 486 | # CONFIG_PATA_PLATFORM is not set |
| 514 | |||
| 515 | # | ||
| 516 | # Multi-device support (RAID and LVM) | ||
| 517 | # | ||
| 518 | # CONFIG_MD is not set | 487 | # CONFIG_MD is not set |
| 519 | 488 | ||
| 520 | # | 489 | # |
| @@ -530,26 +499,16 @@ CONFIG_PATA_MPC52xx=y | |||
| 530 | # | 499 | # |
| 531 | # CONFIG_FIREWIRE is not set | 500 | # CONFIG_FIREWIRE is not set |
| 532 | # CONFIG_IEEE1394 is not set | 501 | # CONFIG_IEEE1394 is not set |
| 533 | |||
| 534 | # | ||
| 535 | # I2O device support | ||
| 536 | # | ||
| 537 | # CONFIG_I2O is not set | 502 | # CONFIG_I2O is not set |
| 538 | # CONFIG_MACINTOSH_DRIVERS is not set | 503 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 539 | |||
| 540 | # | ||
| 541 | # Network device support | ||
| 542 | # | ||
| 543 | CONFIG_NETDEVICES=y | 504 | CONFIG_NETDEVICES=y |
| 505 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 544 | # CONFIG_DUMMY is not set | 506 | # CONFIG_DUMMY is not set |
| 545 | # CONFIG_BONDING is not set | 507 | # CONFIG_BONDING is not set |
| 508 | # CONFIG_MACVLAN is not set | ||
| 546 | # CONFIG_EQUALIZER is not set | 509 | # CONFIG_EQUALIZER is not set |
| 547 | # CONFIG_TUN is not set | 510 | # CONFIG_TUN is not set |
| 548 | # CONFIG_ARCNET is not set | 511 | # CONFIG_ARCNET is not set |
| 549 | |||
| 550 | # | ||
| 551 | # Ethernet (10 or 100Mbit) | ||
| 552 | # | ||
| 553 | # CONFIG_NET_ETHERNET is not set | 512 | # CONFIG_NET_ETHERNET is not set |
| 554 | CONFIG_NETDEV_1000=y | 513 | CONFIG_NETDEV_1000=y |
| 555 | # CONFIG_ACENIC is not set | 514 | # CONFIG_ACENIC is not set |
| @@ -562,7 +521,6 @@ CONFIG_NETDEV_1000=y | |||
| 562 | # CONFIG_SIS190 is not set | 521 | # CONFIG_SIS190 is not set |
| 563 | # CONFIG_SKGE is not set | 522 | # CONFIG_SKGE is not set |
| 564 | # CONFIG_SKY2 is not set | 523 | # CONFIG_SKY2 is not set |
| 565 | # CONFIG_SK98LIN is not set | ||
| 566 | # CONFIG_VIA_VELOCITY is not set | 524 | # CONFIG_VIA_VELOCITY is not set |
| 567 | # CONFIG_TIGON3 is not set | 525 | # CONFIG_TIGON3 is not set |
| 568 | # CONFIG_BNX2 is not set | 526 | # CONFIG_BNX2 is not set |
| @@ -594,15 +552,7 @@ CONFIG_NETDEV_10000=y | |||
| 594 | # CONFIG_NETCONSOLE is not set | 552 | # CONFIG_NETCONSOLE is not set |
| 595 | # CONFIG_NETPOLL is not set | 553 | # CONFIG_NETPOLL is not set |
| 596 | # CONFIG_NET_POLL_CONTROLLER is not set | 554 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 597 | |||
| 598 | # | ||
| 599 | # ISDN subsystem | ||
| 600 | # | ||
| 601 | # CONFIG_ISDN is not set | 555 | # CONFIG_ISDN is not set |
| 602 | |||
| 603 | # | ||
| 604 | # Telephony Support | ||
| 605 | # | ||
| 606 | # CONFIG_PHONE is not set | 556 | # CONFIG_PHONE is not set |
| 607 | 557 | ||
| 608 | # | 558 | # |
| @@ -640,10 +590,6 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 | |||
| 640 | CONFIG_UNIX98_PTYS=y | 590 | CONFIG_UNIX98_PTYS=y |
| 641 | CONFIG_LEGACY_PTYS=y | 591 | CONFIG_LEGACY_PTYS=y |
| 642 | CONFIG_LEGACY_PTY_COUNT=256 | 592 | CONFIG_LEGACY_PTY_COUNT=256 |
| 643 | |||
| 644 | # | ||
| 645 | # IPMI | ||
| 646 | # | ||
| 647 | # CONFIG_IPMI_HANDLER is not set | 593 | # CONFIG_IPMI_HANDLER is not set |
| 648 | # CONFIG_WATCHDOG is not set | 594 | # CONFIG_WATCHDOG is not set |
| 649 | # CONFIG_HW_RANDOM is not set | 595 | # CONFIG_HW_RANDOM is not set |
| @@ -654,10 +600,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 654 | # CONFIG_AGP is not set | 600 | # CONFIG_AGP is not set |
| 655 | # CONFIG_DRM is not set | 601 | # CONFIG_DRM is not set |
| 656 | # CONFIG_RAW_DRIVER is not set | 602 | # CONFIG_RAW_DRIVER is not set |
| 657 | |||
| 658 | # | ||
| 659 | # TPM devices | ||
| 660 | # | ||
| 661 | # CONFIG_TCG_TPM is not set | 603 | # CONFIG_TCG_TPM is not set |
| 662 | CONFIG_DEVPORT=y | 604 | CONFIG_DEVPORT=y |
| 663 | # CONFIG_I2C is not set | 605 | # CONFIG_I2C is not set |
| @@ -667,11 +609,8 @@ CONFIG_DEVPORT=y | |||
| 667 | # | 609 | # |
| 668 | # CONFIG_SPI is not set | 610 | # CONFIG_SPI is not set |
| 669 | # CONFIG_SPI_MASTER is not set | 611 | # CONFIG_SPI_MASTER is not set |
| 670 | |||
| 671 | # | ||
| 672 | # Dallas's 1-wire bus | ||
| 673 | # | ||
| 674 | # CONFIG_W1 is not set | 612 | # CONFIG_W1 is not set |
| 613 | # CONFIG_POWER_SUPPLY is not set | ||
| 675 | # CONFIG_HWMON is not set | 614 | # CONFIG_HWMON is not set |
| 676 | 615 | ||
| 677 | # | 616 | # |
| @@ -696,6 +635,7 @@ CONFIG_DEVPORT=y | |||
| 696 | # | 635 | # |
| 697 | # CONFIG_DISPLAY_SUPPORT is not set | 636 | # CONFIG_DISPLAY_SUPPORT is not set |
| 698 | # CONFIG_VGASTATE is not set | 637 | # CONFIG_VGASTATE is not set |
| 638 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 699 | # CONFIG_FB is not set | 639 | # CONFIG_FB is not set |
| 700 | # CONFIG_FB_IBM_GXT4500 is not set | 640 | # CONFIG_FB_IBM_GXT4500 is not set |
| 701 | 641 | ||
| @@ -703,10 +643,7 @@ CONFIG_DEVPORT=y | |||
| 703 | # Sound | 643 | # Sound |
| 704 | # | 644 | # |
| 705 | # CONFIG_SOUND is not set | 645 | # CONFIG_SOUND is not set |
| 706 | 646 | CONFIG_USB_SUPPORT=y | |
| 707 | # | ||
| 708 | # USB support | ||
| 709 | # | ||
| 710 | CONFIG_USB_ARCH_HAS_HCD=y | 647 | CONFIG_USB_ARCH_HAS_HCD=y |
| 711 | CONFIG_USB_ARCH_HAS_OHCI=y | 648 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 712 | CONFIG_USB_ARCH_HAS_EHCI=y | 649 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -721,33 +658,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 721 | # | 658 | # |
| 722 | # CONFIG_USB_GADGET is not set | 659 | # CONFIG_USB_GADGET is not set |
| 723 | # CONFIG_MMC is not set | 660 | # CONFIG_MMC is not set |
| 724 | |||
| 725 | # | ||
| 726 | # LED devices | ||
| 727 | # | ||
| 728 | # CONFIG_NEW_LEDS is not set | 661 | # CONFIG_NEW_LEDS is not set |
| 729 | |||
| 730 | # | ||
| 731 | # LED drivers | ||
| 732 | # | ||
| 733 | |||
| 734 | # | ||
| 735 | # LED Triggers | ||
| 736 | # | ||
| 737 | |||
| 738 | # | ||
| 739 | # InfiniBand support | ||
| 740 | # | ||
| 741 | # CONFIG_INFINIBAND is not set | 662 | # CONFIG_INFINIBAND is not set |
| 742 | 663 | # CONFIG_EDAC is not set | |
| 743 | # | ||
| 744 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 745 | # | ||
| 746 | |||
| 747 | # | ||
| 748 | # Real Time Clock | ||
| 749 | # | ||
| 750 | CONFIG_RTC_LIB=y | ||
| 751 | # CONFIG_RTC_CLASS is not set | 664 | # CONFIG_RTC_CLASS is not set |
| 752 | 665 | ||
| 753 | # | 666 | # |
| @@ -764,6 +677,11 @@ CONFIG_RTC_LIB=y | |||
| 764 | # | 677 | # |
| 765 | 678 | ||
| 766 | # | 679 | # |
| 680 | # Userspace I/O | ||
| 681 | # | ||
| 682 | # CONFIG_UIO is not set | ||
| 683 | |||
| 684 | # | ||
| 767 | # File systems | 685 | # File systems |
| 768 | # | 686 | # |
| 769 | CONFIG_EXT2_FS=y | 687 | CONFIG_EXT2_FS=y |
| @@ -846,7 +764,6 @@ CONFIG_RAMFS=y | |||
| 846 | # CONFIG_NCP_FS is not set | 764 | # CONFIG_NCP_FS is not set |
| 847 | # CONFIG_CODA_FS is not set | 765 | # CONFIG_CODA_FS is not set |
| 848 | # CONFIG_AFS_FS is not set | 766 | # CONFIG_AFS_FS is not set |
| 849 | # CONFIG_9P_FS is not set | ||
| 850 | 767 | ||
| 851 | # | 768 | # |
| 852 | # Partition Types | 769 | # Partition Types |
| @@ -872,6 +789,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 872 | # CONFIG_CRC16 is not set | 789 | # CONFIG_CRC16 is not set |
| 873 | # CONFIG_CRC_ITU_T is not set | 790 | # CONFIG_CRC_ITU_T is not set |
| 874 | # CONFIG_CRC32 is not set | 791 | # CONFIG_CRC32 is not set |
| 792 | # CONFIG_CRC7 is not set | ||
| 875 | # CONFIG_LIBCRC32C is not set | 793 | # CONFIG_LIBCRC32C is not set |
| 876 | CONFIG_PLIST=y | 794 | CONFIG_PLIST=y |
| 877 | CONFIG_HAS_IOMEM=y | 795 | CONFIG_HAS_IOMEM=y |
| @@ -895,6 +813,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 895 | CONFIG_DEBUG_KERNEL=y | 813 | CONFIG_DEBUG_KERNEL=y |
| 896 | # CONFIG_DEBUG_SHIRQ is not set | 814 | # CONFIG_DEBUG_SHIRQ is not set |
| 897 | CONFIG_DETECT_SOFTLOCKUP=y | 815 | CONFIG_DETECT_SOFTLOCKUP=y |
| 816 | CONFIG_SCHED_DEBUG=y | ||
| 898 | # CONFIG_SCHEDSTATS is not set | 817 | # CONFIG_SCHEDSTATS is not set |
| 899 | # CONFIG_TIMER_STATS is not set | 818 | # CONFIG_TIMER_STATS is not set |
| 900 | # CONFIG_DEBUG_SLAB is not set | 819 | # CONFIG_DEBUG_SLAB is not set |
| @@ -925,8 +844,4 @@ CONFIG_FORCED_INLINING=y | |||
| 925 | # | 844 | # |
| 926 | # CONFIG_KEYS is not set | 845 | # CONFIG_KEYS is not set |
| 927 | # CONFIG_SECURITY is not set | 846 | # CONFIG_SECURITY is not set |
| 928 | |||
| 929 | # | ||
| 930 | # Cryptographic options | ||
| 931 | # | ||
| 932 | # CONFIG_CRYPTO is not set | 847 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index eb3d9ad655ea..96b538bc676b 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
| @@ -1,9 +1,22 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 13:27:35 2007 | 4 | # Thu Aug 30 16:38:16 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_POWER4_ONLY=y | ||
| 12 | CONFIG_POWER4=y | ||
| 13 | CONFIG_PPC_FPU=y | ||
| 14 | # CONFIG_ALTIVEC is not set | ||
| 15 | CONFIG_PPC_STD_MMU=y | ||
| 16 | CONFIG_PPC_MM_SLICES=y | ||
| 17 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 18 | CONFIG_SMP=y | ||
| 19 | CONFIG_NR_CPUS=4 | ||
| 7 | CONFIG_64BIT=y | 20 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 21 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 22 | CONFIG_MMU=y |
| @@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 28 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 29 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 30 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 31 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 32 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 33 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 34 | CONFIG_COMPAT=y |
| @@ -22,49 +36,32 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 25 | CONFIG_PPC_UDBG_16550=y | 40 | CONFIG_PPC_UDBG_16550=y |
| 26 | CONFIG_GENERIC_TBSYNC=y | 41 | CONFIG_GENERIC_TBSYNC=y |
| 27 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 44 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | |||
| 31 | # | ||
| 32 | # Processor support | ||
| 33 | # | ||
| 34 | CONFIG_POWER4_ONLY=y | ||
| 35 | CONFIG_POWER4=y | ||
| 36 | CONFIG_PPC_FPU=y | ||
| 37 | # CONFIG_PPC_DCR_NATIVE is not set | 45 | # CONFIG_PPC_DCR_NATIVE is not set |
| 38 | # CONFIG_PPC_DCR_MMIO is not set | 46 | # CONFIG_PPC_DCR_MMIO is not set |
| 39 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | 47 | # CONFIG_PPC_OF_PLATFORM_PCI is not set |
| 40 | # CONFIG_ALTIVEC is not set | ||
| 41 | CONFIG_PPC_STD_MMU=y | ||
| 42 | CONFIG_PPC_MM_SLICES=y | ||
| 43 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 44 | CONFIG_SMP=y | ||
| 45 | CONFIG_NR_CPUS=4 | ||
| 46 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 47 | 49 | ||
| 48 | # | 50 | # |
| 49 | # Code maturity level options | 51 | # General setup |
| 50 | # | 52 | # |
| 51 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 52 | CONFIG_LOCK_KERNEL=y | 54 | CONFIG_LOCK_KERNEL=y |
| 53 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 54 | |||
| 55 | # | ||
| 56 | # General setup | ||
| 57 | # | ||
| 58 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 59 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 60 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 61 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 62 | # CONFIG_IPC_NS is not set | ||
| 63 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 64 | CONFIG_POSIX_MQUEUE=y | 61 | CONFIG_POSIX_MQUEUE=y |
| 65 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 66 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 67 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 68 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 69 | CONFIG_IKCONFIG=y | 66 | CONFIG_IKCONFIG=y |
| 70 | CONFIG_IKCONFIG_PROC=y | 67 | CONFIG_IKCONFIG_PROC=y |
| @@ -99,10 +96,6 @@ CONFIG_SLAB=y | |||
| 99 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
| 100 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
| 101 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
| 102 | |||
| 103 | # | ||
| 104 | # Loadable module support | ||
| 105 | # | ||
| 106 | CONFIG_MODULES=y | 99 | CONFIG_MODULES=y |
| 107 | CONFIG_MODULE_UNLOAD=y | 100 | CONFIG_MODULE_UNLOAD=y |
| 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 101 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -110,12 +103,9 @@ CONFIG_MODVERSIONS=y | |||
| 110 | CONFIG_MODULE_SRCVERSION_ALL=y | 103 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 111 | CONFIG_KMOD=y | 104 | CONFIG_KMOD=y |
| 112 | CONFIG_STOP_MACHINE=y | 105 | CONFIG_STOP_MACHINE=y |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 106 | CONFIG_BLOCK=y |
| 118 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 108 | # CONFIG_BLK_DEV_BSG is not set | ||
| 119 | 109 | ||
| 120 | # | 110 | # |
| 121 | # IO Schedulers | 111 | # IO Schedulers |
| @@ -135,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 125 | # |
| 136 | CONFIG_PPC_MULTIPLATFORM=y | 126 | CONFIG_PPC_MULTIPLATFORM=y |
| 137 | # CONFIG_EMBEDDED6xx is not set | 127 | # CONFIG_EMBEDDED6xx is not set |
| 138 | # CONFIG_APUS is not set | 128 | # CONFIG_PPC_82xx is not set |
| 129 | # CONFIG_PPC_83xx is not set | ||
| 130 | # CONFIG_PPC_86xx is not set | ||
| 139 | # CONFIG_PPC_PSERIES is not set | 131 | # CONFIG_PPC_PSERIES is not set |
| 140 | # CONFIG_PPC_ISERIES is not set | 132 | # CONFIG_PPC_ISERIES is not set |
| 141 | # CONFIG_PPC_MPC52xx is not set | 133 | # CONFIG_PPC_MPC52xx is not set |
| @@ -167,6 +159,7 @@ CONFIG_PPC_970_NAP=y | |||
| 167 | # CONFIG_GENERIC_IOMAP is not set | 159 | # CONFIG_GENERIC_IOMAP is not set |
| 168 | # CONFIG_CPU_FREQ is not set | 160 | # CONFIG_CPU_FREQ is not set |
| 169 | # CONFIG_CPM2 is not set | 161 | # CONFIG_CPM2 is not set |
| 162 | # CONFIG_FSL_ULI1575 is not set | ||
| 170 | 163 | ||
| 171 | # | 164 | # |
| 172 | # Kernel options | 165 | # Kernel options |
| @@ -203,6 +196,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 203 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 196 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 204 | CONFIG_RESOURCES_64BIT=y | 197 | CONFIG_RESOURCES_64BIT=y |
| 205 | CONFIG_ZONE_DMA_FLAG=1 | 198 | CONFIG_ZONE_DMA_FLAG=1 |
| 199 | CONFIG_BOUNCE=y | ||
| 206 | # CONFIG_PPC_HAS_HASH_64K is not set | 200 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 207 | # CONFIG_PPC_64K_PAGES is not set | 201 | # CONFIG_PPC_64K_PAGES is not set |
| 208 | # CONFIG_SCHED_SMT is not set | 202 | # CONFIG_SCHED_SMT is not set |
| @@ -221,6 +215,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 221 | # CONFIG_PPC_INDIRECT_PCI is not set | 215 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 222 | CONFIG_PCI=y | 216 | CONFIG_PCI=y |
| 223 | CONFIG_PCI_DOMAINS=y | 217 | CONFIG_PCI_DOMAINS=y |
| 218 | CONFIG_PCI_SYSCALL=y | ||
| 224 | # CONFIG_PCIEPORTBUS is not set | 219 | # CONFIG_PCIEPORTBUS is not set |
| 225 | CONFIG_ARCH_SUPPORTS_MSI=y | 220 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 226 | CONFIG_PCI_MSI=y | 221 | CONFIG_PCI_MSI=y |
| @@ -318,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 318 | # CONFIG_MAC80211 is not set | 313 | # CONFIG_MAC80211 is not set |
| 319 | # CONFIG_IEEE80211 is not set | 314 | # CONFIG_IEEE80211 is not set |
| 320 | # CONFIG_RFKILL is not set | 315 | # CONFIG_RFKILL is not set |
| 316 | # CONFIG_NET_9P is not set | ||
| 321 | 317 | ||
| 322 | # | 318 | # |
| 323 | # Device Drivers | 319 | # Device Drivers |
| @@ -332,28 +328,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 332 | # CONFIG_DEBUG_DRIVER is not set | 328 | # CONFIG_DEBUG_DRIVER is not set |
| 333 | # CONFIG_DEBUG_DEVRES is not set | 329 | # CONFIG_DEBUG_DEVRES is not set |
| 334 | # CONFIG_SYS_HYPERVISOR is not set | 330 | # CONFIG_SYS_HYPERVISOR is not set |
| 335 | |||
| 336 | # | ||
| 337 | # Connector - unified userspace <-> kernelspace linker | ||
| 338 | # | ||
| 339 | # CONFIG_CONNECTOR is not set | 331 | # CONFIG_CONNECTOR is not set |
| 340 | # CONFIG_MTD is not set | 332 | # CONFIG_MTD is not set |
| 341 | 333 | CONFIG_OF_DEVICE=y | |
| 342 | # | ||
| 343 | # Parallel port support | ||
| 344 | # | ||
| 345 | # CONFIG_PARPORT is not set | 334 | # CONFIG_PARPORT is not set |
| 346 | 335 | CONFIG_BLK_DEV=y | |
| 347 | # | ||
| 348 | # Plug and Play support | ||
| 349 | # | ||
| 350 | # CONFIG_PNPACPI is not set | ||
| 351 | |||
| 352 | # | ||
| 353 | # Block devices | ||
| 354 | # | ||
| 355 | # CONFIG_BLK_DEV_FD is not set | 336 | # CONFIG_BLK_DEV_FD is not set |
| 356 | # CONFIG_BLK_CPQ_DA is not set | ||
| 357 | # CONFIG_BLK_CPQ_CISS_DA is not set | 337 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 358 | # CONFIG_BLK_DEV_DAC960 is not set | 338 | # CONFIG_BLK_DEV_DAC960 is not set |
| 359 | # CONFIG_BLK_DEV_UMEM is not set | 339 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -368,14 +348,11 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
| 368 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 348 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 369 | # CONFIG_CDROM_PKTCDVD is not set | 349 | # CONFIG_CDROM_PKTCDVD is not set |
| 370 | # CONFIG_ATA_OVER_ETH is not set | 350 | # CONFIG_ATA_OVER_ETH is not set |
| 371 | 351 | CONFIG_MISC_DEVICES=y | |
| 372 | # | ||
| 373 | # Misc devices | ||
| 374 | # | ||
| 375 | # CONFIG_PHANTOM is not set | 352 | # CONFIG_PHANTOM is not set |
| 353 | # CONFIG_EEPROM_93CX6 is not set | ||
| 376 | # CONFIG_SGI_IOC4 is not set | 354 | # CONFIG_SGI_IOC4 is not set |
| 377 | # CONFIG_TIFM_CORE is not set | 355 | # CONFIG_TIFM_CORE is not set |
| 378 | # CONFIG_BLINK is not set | ||
| 379 | CONFIG_IDE=y | 356 | CONFIG_IDE=y |
| 380 | CONFIG_BLK_DEV_IDE=y | 357 | CONFIG_BLK_DEV_IDE=y |
| 381 | 358 | ||
| @@ -439,12 +416,9 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 439 | # | 416 | # |
| 440 | # CONFIG_RAID_ATTRS is not set | 417 | # CONFIG_RAID_ATTRS is not set |
| 441 | # CONFIG_SCSI is not set | 418 | # CONFIG_SCSI is not set |
| 419 | # CONFIG_SCSI_DMA is not set | ||
| 442 | # CONFIG_SCSI_NETLINK is not set | 420 | # CONFIG_SCSI_NETLINK is not set |
| 443 | # CONFIG_ATA is not set | 421 | # CONFIG_ATA is not set |
| 444 | |||
| 445 | # | ||
| 446 | # Multi-device support (RAID and LVM) | ||
| 447 | # | ||
| 448 | # CONFIG_MD is not set | 422 | # CONFIG_MD is not set |
| 449 | 423 | ||
| 450 | # | 424 | # |
| @@ -457,37 +431,23 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 457 | # | 431 | # |
| 458 | # CONFIG_FIREWIRE is not set | 432 | # CONFIG_FIREWIRE is not set |
| 459 | # CONFIG_IEEE1394 is not set | 433 | # CONFIG_IEEE1394 is not set |
| 460 | |||
| 461 | # | ||
| 462 | # I2O device support | ||
| 463 | # | ||
| 464 | # CONFIG_I2O is not set | 434 | # CONFIG_I2O is not set |
| 465 | # CONFIG_MACINTOSH_DRIVERS is not set | 435 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 466 | |||
| 467 | # | ||
| 468 | # Network device support | ||
| 469 | # | ||
| 470 | CONFIG_NETDEVICES=y | 436 | CONFIG_NETDEVICES=y |
| 437 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 471 | # CONFIG_DUMMY is not set | 438 | # CONFIG_DUMMY is not set |
| 472 | # CONFIG_BONDING is not set | 439 | # CONFIG_BONDING is not set |
| 440 | # CONFIG_MACVLAN is not set | ||
| 473 | # CONFIG_EQUALIZER is not set | 441 | # CONFIG_EQUALIZER is not set |
| 474 | # CONFIG_TUN is not set | 442 | # CONFIG_TUN is not set |
| 475 | # CONFIG_ARCNET is not set | 443 | # CONFIG_ARCNET is not set |
| 476 | # CONFIG_PHYLIB is not set | 444 | # CONFIG_PHYLIB is not set |
| 477 | |||
| 478 | # | ||
| 479 | # Ethernet (10 or 100Mbit) | ||
| 480 | # | ||
| 481 | CONFIG_NET_ETHERNET=y | 445 | CONFIG_NET_ETHERNET=y |
| 482 | CONFIG_MII=y | 446 | CONFIG_MII=y |
| 483 | # CONFIG_HAPPYMEAL is not set | 447 | # CONFIG_HAPPYMEAL is not set |
| 484 | # CONFIG_SUNGEM is not set | 448 | # CONFIG_SUNGEM is not set |
| 485 | # CONFIG_CASSINI is not set | 449 | # CONFIG_CASSINI is not set |
| 486 | # CONFIG_NET_VENDOR_3COM is not set | 450 | # CONFIG_NET_VENDOR_3COM is not set |
| 487 | |||
| 488 | # | ||
| 489 | # Tulip family network device support | ||
| 490 | # | ||
| 491 | # CONFIG_NET_TULIP is not set | 451 | # CONFIG_NET_TULIP is not set |
| 492 | # CONFIG_HP100 is not set | 452 | # CONFIG_HP100 is not set |
| 493 | CONFIG_NET_PCI=y | 453 | CONFIG_NET_PCI=y |
| @@ -523,7 +483,6 @@ CONFIG_E1000=y | |||
| 523 | # CONFIG_SIS190 is not set | 483 | # CONFIG_SIS190 is not set |
| 524 | # CONFIG_SKGE is not set | 484 | # CONFIG_SKGE is not set |
| 525 | # CONFIG_SKY2 is not set | 485 | # CONFIG_SKY2 is not set |
| 526 | # CONFIG_SK98LIN is not set | ||
| 527 | # CONFIG_VIA_VELOCITY is not set | 486 | # CONFIG_VIA_VELOCITY is not set |
| 528 | CONFIG_TIGON3=y | 487 | CONFIG_TIGON3=y |
| 529 | # CONFIG_BNX2 is not set | 488 | # CONFIG_BNX2 is not set |
| @@ -564,15 +523,7 @@ CONFIG_USB_PEGASUS=y | |||
| 564 | # CONFIG_NETCONSOLE is not set | 523 | # CONFIG_NETCONSOLE is not set |
| 565 | # CONFIG_NETPOLL is not set | 524 | # CONFIG_NETPOLL is not set |
| 566 | # CONFIG_NET_POLL_CONTROLLER is not set | 525 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 567 | |||
| 568 | # | ||
| 569 | # ISDN subsystem | ||
| 570 | # | ||
| 571 | # CONFIG_ISDN is not set | 526 | # CONFIG_ISDN is not set |
| 572 | |||
| 573 | # | ||
| 574 | # Telephony Support | ||
| 575 | # | ||
| 576 | # CONFIG_PHONE is not set | 527 | # CONFIG_PHONE is not set |
| 577 | 528 | ||
| 578 | # | 529 | # |
| @@ -641,10 +592,6 @@ CONFIG_LEGACY_PTYS=y | |||
| 641 | CONFIG_LEGACY_PTY_COUNT=256 | 592 | CONFIG_LEGACY_PTY_COUNT=256 |
| 642 | CONFIG_HVC_DRIVER=y | 593 | CONFIG_HVC_DRIVER=y |
| 643 | CONFIG_HVC_RTAS=y | 594 | CONFIG_HVC_RTAS=y |
| 644 | |||
| 645 | # | ||
| 646 | # IPMI | ||
| 647 | # | ||
| 648 | # CONFIG_IPMI_HANDLER is not set | 595 | # CONFIG_IPMI_HANDLER is not set |
| 649 | # CONFIG_WATCHDOG is not set | 596 | # CONFIG_WATCHDOG is not set |
| 650 | # CONFIG_HW_RANDOM is not set | 597 | # CONFIG_HW_RANDOM is not set |
| @@ -656,10 +603,6 @@ CONFIG_GEN_RTC=y | |||
| 656 | # CONFIG_DRM is not set | 603 | # CONFIG_DRM is not set |
| 657 | # CONFIG_RAW_DRIVER is not set | 604 | # CONFIG_RAW_DRIVER is not set |
| 658 | # CONFIG_HANGCHECK_TIMER is not set | 605 | # CONFIG_HANGCHECK_TIMER is not set |
| 659 | |||
| 660 | # | ||
| 661 | # TPM devices | ||
| 662 | # | ||
| 663 | # CONFIG_TCG_TPM is not set | 606 | # CONFIG_TCG_TPM is not set |
| 664 | CONFIG_DEVPORT=y | 607 | CONFIG_DEVPORT=y |
| 665 | CONFIG_I2C=y | 608 | CONFIG_I2C=y |
| @@ -693,6 +636,7 @@ CONFIG_I2C_AMD8111=y | |||
| 693 | # CONFIG_I2C_SIS5595 is not set | 636 | # CONFIG_I2C_SIS5595 is not set |
| 694 | # CONFIG_I2C_SIS630 is not set | 637 | # CONFIG_I2C_SIS630 is not set |
| 695 | # CONFIG_I2C_SIS96X is not set | 638 | # CONFIG_I2C_SIS96X is not set |
| 639 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 696 | # CONFIG_I2C_STUB is not set | 640 | # CONFIG_I2C_STUB is not set |
| 697 | # CONFIG_I2C_TINY_USB is not set | 641 | # CONFIG_I2C_TINY_USB is not set |
| 698 | # CONFIG_I2C_VIA is not set | 642 | # CONFIG_I2C_VIA is not set |
| @@ -704,11 +648,13 @@ CONFIG_I2C_AMD8111=y | |||
| 704 | # | 648 | # |
| 705 | # CONFIG_SENSORS_DS1337 is not set | 649 | # CONFIG_SENSORS_DS1337 is not set |
| 706 | # CONFIG_SENSORS_DS1374 is not set | 650 | # CONFIG_SENSORS_DS1374 is not set |
| 651 | # CONFIG_DS1682 is not set | ||
| 707 | # CONFIG_SENSORS_EEPROM is not set | 652 | # CONFIG_SENSORS_EEPROM is not set |
| 708 | # CONFIG_SENSORS_PCF8574 is not set | 653 | # CONFIG_SENSORS_PCF8574 is not set |
| 709 | # CONFIG_SENSORS_PCA9539 is not set | 654 | # CONFIG_SENSORS_PCA9539 is not set |
| 710 | # CONFIG_SENSORS_PCF8591 is not set | 655 | # CONFIG_SENSORS_PCF8591 is not set |
| 711 | # CONFIG_SENSORS_MAX6875 is not set | 656 | # CONFIG_SENSORS_MAX6875 is not set |
| 657 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 712 | # CONFIG_I2C_DEBUG_CORE is not set | 658 | # CONFIG_I2C_DEBUG_CORE is not set |
| 713 | # CONFIG_I2C_DEBUG_ALGO is not set | 659 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 714 | # CONFIG_I2C_DEBUG_BUS is not set | 660 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -719,11 +665,8 @@ CONFIG_I2C_AMD8111=y | |||
| 719 | # | 665 | # |
| 720 | # CONFIG_SPI is not set | 666 | # CONFIG_SPI is not set |
| 721 | # CONFIG_SPI_MASTER is not set | 667 | # CONFIG_SPI_MASTER is not set |
| 722 | |||
| 723 | # | ||
| 724 | # Dallas's 1-wire bus | ||
| 725 | # | ||
| 726 | # CONFIG_W1 is not set | 668 | # CONFIG_W1 is not set |
| 669 | # CONFIG_POWER_SUPPLY is not set | ||
| 727 | # CONFIG_HWMON is not set | 670 | # CONFIG_HWMON is not set |
| 728 | 671 | ||
| 729 | # | 672 | # |
| @@ -748,6 +691,7 @@ CONFIG_I2C_AMD8111=y | |||
| 748 | # | 691 | # |
| 749 | # CONFIG_DISPLAY_SUPPORT is not set | 692 | # CONFIG_DISPLAY_SUPPORT is not set |
| 750 | # CONFIG_VGASTATE is not set | 693 | # CONFIG_VGASTATE is not set |
| 694 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 751 | # CONFIG_FB is not set | 695 | # CONFIG_FB is not set |
| 752 | # CONFIG_FB_IBM_GXT4500 is not set | 696 | # CONFIG_FB_IBM_GXT4500 is not set |
| 753 | 697 | ||
| @@ -761,10 +705,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 761 | # Sound | 705 | # Sound |
| 762 | # | 706 | # |
| 763 | # CONFIG_SOUND is not set | 707 | # CONFIG_SOUND is not set |
| 764 | 708 | CONFIG_HID_SUPPORT=y | |
| 765 | # | ||
| 766 | # HID Devices | ||
| 767 | # | ||
| 768 | CONFIG_HID=y | 709 | CONFIG_HID=y |
| 769 | # CONFIG_HID_DEBUG is not set | 710 | # CONFIG_HID_DEBUG is not set |
| 770 | 711 | ||
| @@ -775,10 +716,7 @@ CONFIG_USB_HID=y | |||
| 775 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 716 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 776 | # CONFIG_HID_FF is not set | 717 | # CONFIG_HID_FF is not set |
| 777 | # CONFIG_USB_HIDDEV is not set | 718 | # CONFIG_USB_HIDDEV is not set |
| 778 | 719 | CONFIG_USB_SUPPORT=y | |
| 779 | # | ||
| 780 | # USB support | ||
| 781 | # | ||
| 782 | CONFIG_USB_ARCH_HAS_HCD=y | 720 | CONFIG_USB_ARCH_HAS_HCD=y |
| 783 | CONFIG_USB_ARCH_HAS_OHCI=y | 721 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 784 | CONFIG_USB_ARCH_HAS_EHCI=y | 722 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -800,7 +738,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 800 | CONFIG_USB_EHCI_SPLIT_ISO=y | 738 | CONFIG_USB_EHCI_SPLIT_ISO=y |
| 801 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 739 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 802 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 740 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 803 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 804 | # CONFIG_USB_ISP116X_HCD is not set | 741 | # CONFIG_USB_ISP116X_HCD is not set |
| 805 | CONFIG_USB_OHCI_HCD=y | 742 | CONFIG_USB_OHCI_HCD=y |
| 806 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 743 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| @@ -809,6 +746,7 @@ CONFIG_USB_OHCI_HCD=y | |||
| 809 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 746 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 810 | CONFIG_USB_UHCI_HCD=y | 747 | CONFIG_USB_UHCI_HCD=y |
| 811 | # CONFIG_USB_SL811_HCD is not set | 748 | # CONFIG_USB_SL811_HCD is not set |
| 749 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 812 | 750 | ||
| 813 | # | 751 | # |
| 814 | # USB Device Class drivers | 752 | # USB Device Class drivers |
| @@ -880,6 +818,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 880 | # CONFIG_USB_SERIAL_MOS7840 is not set | 818 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 881 | # CONFIG_USB_SERIAL_NAVMAN is not set | 819 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 882 | # CONFIG_USB_SERIAL_PL2303 is not set | 820 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 821 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
| 883 | # CONFIG_USB_SERIAL_HP4X is not set | 822 | # CONFIG_USB_SERIAL_HP4X is not set |
| 884 | # CONFIG_USB_SERIAL_SAFE is not set | 823 | # CONFIG_USB_SERIAL_SAFE is not set |
| 885 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 824 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -924,32 +863,9 @@ CONFIG_USB_EZUSB=y | |||
| 924 | # | 863 | # |
| 925 | # CONFIG_USB_GADGET is not set | 864 | # CONFIG_USB_GADGET is not set |
| 926 | # CONFIG_MMC is not set | 865 | # CONFIG_MMC is not set |
| 927 | |||
| 928 | # | ||
| 929 | # LED devices | ||
| 930 | # | ||
| 931 | # CONFIG_NEW_LEDS is not set | 866 | # CONFIG_NEW_LEDS is not set |
| 932 | |||
| 933 | # | ||
| 934 | # LED drivers | ||
| 935 | # | ||
| 936 | |||
| 937 | # | ||
| 938 | # LED Triggers | ||
| 939 | # | ||
| 940 | |||
| 941 | # | ||
| 942 | # InfiniBand support | ||
| 943 | # | ||
| 944 | # CONFIG_INFINIBAND is not set | 867 | # CONFIG_INFINIBAND is not set |
| 945 | 868 | # CONFIG_EDAC is not set | |
| 946 | # | ||
| 947 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 948 | # | ||
| 949 | |||
| 950 | # | ||
| 951 | # Real Time Clock | ||
| 952 | # | ||
| 953 | # CONFIG_RTC_CLASS is not set | 869 | # CONFIG_RTC_CLASS is not set |
| 954 | 870 | ||
| 955 | # | 871 | # |
| @@ -966,6 +882,11 @@ CONFIG_USB_EZUSB=y | |||
| 966 | # | 882 | # |
| 967 | 883 | ||
| 968 | # | 884 | # |
| 885 | # Userspace I/O | ||
| 886 | # | ||
| 887 | # CONFIG_UIO is not set | ||
| 888 | |||
| 889 | # | ||
| 969 | # File systems | 890 | # File systems |
| 970 | # | 891 | # |
| 971 | CONFIG_EXT2_FS=y | 892 | CONFIG_EXT2_FS=y |
| @@ -1064,7 +985,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 1064 | # CONFIG_NCP_FS is not set | 985 | # CONFIG_NCP_FS is not set |
| 1065 | # CONFIG_CODA_FS is not set | 986 | # CONFIG_CODA_FS is not set |
| 1066 | # CONFIG_AFS_FS is not set | 987 | # CONFIG_AFS_FS is not set |
| 1067 | # CONFIG_9P_FS is not set | ||
| 1068 | 988 | ||
| 1069 | # | 989 | # |
| 1070 | # Partition Types | 990 | # Partition Types |
| @@ -1146,6 +1066,7 @@ CONFIG_CRC_CCITT=y | |||
| 1146 | # CONFIG_CRC16 is not set | 1066 | # CONFIG_CRC16 is not set |
| 1147 | # CONFIG_CRC_ITU_T is not set | 1067 | # CONFIG_CRC_ITU_T is not set |
| 1148 | CONFIG_CRC32=y | 1068 | CONFIG_CRC32=y |
| 1069 | # CONFIG_CRC7 is not set | ||
| 1149 | # CONFIG_LIBCRC32C is not set | 1070 | # CONFIG_LIBCRC32C is not set |
| 1150 | CONFIG_ZLIB_INFLATE=y | 1071 | CONFIG_ZLIB_INFLATE=y |
| 1151 | CONFIG_PLIST=y | 1072 | CONFIG_PLIST=y |
| @@ -1171,6 +1092,7 @@ CONFIG_DEBUG_FS=y | |||
| 1171 | CONFIG_DEBUG_KERNEL=y | 1092 | CONFIG_DEBUG_KERNEL=y |
| 1172 | # CONFIG_DEBUG_SHIRQ is not set | 1093 | # CONFIG_DEBUG_SHIRQ is not set |
| 1173 | CONFIG_DETECT_SOFTLOCKUP=y | 1094 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1095 | CONFIG_SCHED_DEBUG=y | ||
| 1174 | # CONFIG_SCHEDSTATS is not set | 1096 | # CONFIG_SCHEDSTATS is not set |
| 1175 | # CONFIG_TIMER_STATS is not set | 1097 | # CONFIG_TIMER_STATS is not set |
| 1176 | CONFIG_DEBUG_SLAB=y | 1098 | CONFIG_DEBUG_SLAB=y |
| @@ -1205,10 +1127,6 @@ CONFIG_BOOTX_TEXT=y | |||
| 1205 | # | 1127 | # |
| 1206 | # CONFIG_KEYS is not set | 1128 | # CONFIG_KEYS is not set |
| 1207 | # CONFIG_SECURITY is not set | 1129 | # CONFIG_SECURITY is not set |
| 1208 | |||
| 1209 | # | ||
| 1210 | # Cryptographic options | ||
| 1211 | # | ||
| 1212 | CONFIG_CRYPTO=y | 1130 | CONFIG_CRYPTO=y |
| 1213 | CONFIG_CRYPTO_ALGAPI=y | 1131 | CONFIG_CRYPTO_ALGAPI=y |
| 1214 | CONFIG_CRYPTO_BLKCIPHER=y | 1132 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1246,7 +1164,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1246 | # CONFIG_CRYPTO_CRC32C is not set | 1164 | # CONFIG_CRYPTO_CRC32C is not set |
| 1247 | # CONFIG_CRYPTO_CAMELLIA is not set | 1165 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1248 | # CONFIG_CRYPTO_TEST is not set | 1166 | # CONFIG_CRYPTO_TEST is not set |
| 1249 | 1167 | # CONFIG_CRYPTO_HW is not set | |
| 1250 | # | ||
| 1251 | # Hardware crypto devices | ||
| 1252 | # | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 174a290ee7a9..05814a3b0e33 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
| @@ -1,9 +1,24 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:54 2007 | 4 | # Tue Aug 28 21:24:39 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_PPC_STD_MMU=y | ||
| 19 | CONFIG_PPC_STD_MMU_32=y | ||
| 20 | # CONFIG_PPC_MM_SLICES is not set | ||
| 21 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 23 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 24 | CONFIG_MMU=y |
| @@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 35 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 40 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 41 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 44 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | CONFIG_CLASSIC32=y | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 45 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 46 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | # CONFIG_ALTIVEC is not set | ||
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 48 | ||
| 52 | # | 49 | # |
| 53 | # Code maturity level options | 50 | # General setup |
| 54 | # | 51 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 52 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 53 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 55 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 56 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 57 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 58 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 59 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 60 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 61 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 62 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 63 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 64 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 65 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 66 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -101,19 +93,12 @@ CONFIG_SLAB=y | |||
| 101 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 102 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 103 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 104 | |||
| 105 | # | ||
| 106 | # Loadable module support | ||
| 107 | # | ||
| 108 | # CONFIG_MODULES is not set | 96 | # CONFIG_MODULES is not set |
| 109 | |||
| 110 | # | ||
| 111 | # Block layer | ||
| 112 | # | ||
| 113 | CONFIG_BLOCK=y | 97 | CONFIG_BLOCK=y |
| 114 | CONFIG_LBD=y | 98 | CONFIG_LBD=y |
| 115 | # CONFIG_BLK_DEV_IO_TRACE is not set | 99 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 116 | # CONFIG_LSF is not set | 100 | # CONFIG_LSF is not set |
| 101 | # CONFIG_BLK_DEV_BSG is not set | ||
| 117 | 102 | ||
| 118 | # | 103 | # |
| 119 | # IO Schedulers | 104 | # IO Schedulers |
| @@ -133,7 +118,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 133 | # | 118 | # |
| 134 | # CONFIG_PPC_MULTIPLATFORM is not set | 119 | # CONFIG_PPC_MULTIPLATFORM is not set |
| 135 | CONFIG_EMBEDDED6xx=y | 120 | CONFIG_EMBEDDED6xx=y |
| 136 | # CONFIG_APUS is not set | 121 | # CONFIG_PPC_82xx is not set |
| 122 | # CONFIG_PPC_83xx is not set | ||
| 123 | # CONFIG_PPC_86xx is not set | ||
| 137 | # CONFIG_PPC_MPC52xx is not set | 124 | # CONFIG_PPC_MPC52xx is not set |
| 138 | # CONFIG_PPC_MPC5200 is not set | 125 | # CONFIG_PPC_MPC5200 is not set |
| 139 | # CONFIG_PPC_CELL is not set | 126 | # CONFIG_PPC_CELL is not set |
| @@ -154,8 +141,8 @@ CONFIG_MPIC_WEIRD=y | |||
| 154 | # CONFIG_PPC_INDIRECT_IO is not set | 141 | # CONFIG_PPC_INDIRECT_IO is not set |
| 155 | # CONFIG_GENERIC_IOMAP is not set | 142 | # CONFIG_GENERIC_IOMAP is not set |
| 156 | # CONFIG_CPU_FREQ is not set | 143 | # CONFIG_CPU_FREQ is not set |
| 157 | # CONFIG_TAU is not set | ||
| 158 | # CONFIG_CPM2 is not set | 144 | # CONFIG_CPM2 is not set |
| 145 | # CONFIG_FSL_ULI1575 is not set | ||
| 159 | 146 | ||
| 160 | # | 147 | # |
| 161 | # Kernel options | 148 | # Kernel options |
| @@ -184,6 +171,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 184 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 171 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 185 | # CONFIG_RESOURCES_64BIT is not set | 172 | # CONFIG_RESOURCES_64BIT is not set |
| 186 | CONFIG_ZONE_DMA_FLAG=1 | 173 | CONFIG_ZONE_DMA_FLAG=1 |
| 174 | CONFIG_BOUNCE=y | ||
| 175 | CONFIG_VIRT_TO_BUS=y | ||
| 187 | CONFIG_PROC_DEVICETREE=y | 176 | CONFIG_PROC_DEVICETREE=y |
| 188 | # CONFIG_CMDLINE_BOOL is not set | 177 | # CONFIG_CMDLINE_BOOL is not set |
| 189 | # CONFIG_PM is not set | 178 | # CONFIG_PM is not set |
| @@ -199,6 +188,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 199 | # CONFIG_PPC_INDIRECT_PCI is not set | 188 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 200 | CONFIG_PCI=y | 189 | CONFIG_PCI=y |
| 201 | CONFIG_PCI_DOMAINS=y | 190 | CONFIG_PCI_DOMAINS=y |
| 191 | CONFIG_PCI_SYSCALL=y | ||
| 202 | # CONFIG_PCIEPORTBUS is not set | 192 | # CONFIG_PCIEPORTBUS is not set |
| 203 | CONFIG_ARCH_SUPPORTS_MSI=y | 193 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 204 | # CONFIG_PCI_MSI is not set | 194 | # CONFIG_PCI_MSI is not set |
| @@ -308,6 +298,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 308 | # CONFIG_MAC80211 is not set | 298 | # CONFIG_MAC80211 is not set |
| 309 | # CONFIG_IEEE80211 is not set | 299 | # CONFIG_IEEE80211 is not set |
| 310 | # CONFIG_RFKILL is not set | 300 | # CONFIG_RFKILL is not set |
| 301 | # CONFIG_NET_9P is not set | ||
| 311 | 302 | ||
| 312 | # | 303 | # |
| 313 | # Device Drivers | 304 | # Device Drivers |
| @@ -320,26 +311,11 @@ CONFIG_STANDALONE=y | |||
| 320 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 311 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 321 | # CONFIG_FW_LOADER is not set | 312 | # CONFIG_FW_LOADER is not set |
| 322 | # CONFIG_SYS_HYPERVISOR is not set | 313 | # CONFIG_SYS_HYPERVISOR is not set |
| 323 | |||
| 324 | # | ||
| 325 | # Connector - unified userspace <-> kernelspace linker | ||
| 326 | # | ||
| 327 | # CONFIG_CONNECTOR is not set | 314 | # CONFIG_CONNECTOR is not set |
| 328 | # CONFIG_MTD is not set | 315 | # CONFIG_MTD is not set |
| 329 | 316 | CONFIG_OF_DEVICE=y | |
| 330 | # | ||
| 331 | # Parallel port support | ||
| 332 | # | ||
| 333 | # CONFIG_PARPORT is not set | 317 | # CONFIG_PARPORT is not set |
| 334 | 318 | CONFIG_BLK_DEV=y | |
| 335 | # | ||
| 336 | # Plug and Play support | ||
| 337 | # | ||
| 338 | # CONFIG_PNPACPI is not set | ||
| 339 | |||
| 340 | # | ||
| 341 | # Block devices | ||
| 342 | # | ||
| 343 | # CONFIG_BLK_DEV_FD is not set | 319 | # CONFIG_BLK_DEV_FD is not set |
| 344 | # CONFIG_BLK_CPQ_DA is not set | 320 | # CONFIG_BLK_CPQ_DA is not set |
| 345 | # CONFIG_BLK_CPQ_CISS_DA is not set | 321 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -356,14 +332,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 356 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 332 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 357 | # CONFIG_CDROM_PKTCDVD is not set | 333 | # CONFIG_CDROM_PKTCDVD is not set |
| 358 | # CONFIG_ATA_OVER_ETH is not set | 334 | # CONFIG_ATA_OVER_ETH is not set |
| 359 | 335 | CONFIG_MISC_DEVICES=y | |
| 360 | # | ||
| 361 | # Misc devices | ||
| 362 | # | ||
| 363 | # CONFIG_PHANTOM is not set | 336 | # CONFIG_PHANTOM is not set |
| 337 | # CONFIG_EEPROM_93CX6 is not set | ||
| 364 | # CONFIG_SGI_IOC4 is not set | 338 | # CONFIG_SGI_IOC4 is not set |
| 365 | # CONFIG_TIFM_CORE is not set | 339 | # CONFIG_TIFM_CORE is not set |
| 366 | # CONFIG_BLINK is not set | ||
| 367 | # CONFIG_IDE is not set | 340 | # CONFIG_IDE is not set |
| 368 | 341 | ||
| 369 | # | 342 | # |
| @@ -371,6 +344,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 371 | # | 344 | # |
| 372 | # CONFIG_RAID_ATTRS is not set | 345 | # CONFIG_RAID_ATTRS is not set |
| 373 | CONFIG_SCSI=y | 346 | CONFIG_SCSI=y |
| 347 | CONFIG_SCSI_DMA=y | ||
| 374 | # CONFIG_SCSI_TGT is not set | 348 | # CONFIG_SCSI_TGT is not set |
| 375 | # CONFIG_SCSI_NETLINK is not set | 349 | # CONFIG_SCSI_NETLINK is not set |
| 376 | CONFIG_SCSI_PROC_FS=y | 350 | CONFIG_SCSI_PROC_FS=y |
| @@ -399,12 +373,8 @@ CONFIG_BLK_DEV_SD=y | |||
| 399 | # CONFIG_SCSI_SPI_ATTRS is not set | 373 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 400 | # CONFIG_SCSI_FC_ATTRS is not set | 374 | # CONFIG_SCSI_FC_ATTRS is not set |
| 401 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 375 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 402 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 403 | # CONFIG_SCSI_SAS_LIBSAS is not set | 376 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 404 | 377 | CONFIG_SCSI_LOWLEVEL=y | |
| 405 | # | ||
| 406 | # SCSI low-level drivers | ||
| 407 | # | ||
| 408 | # CONFIG_ISCSI_TCP is not set | 378 | # CONFIG_ISCSI_TCP is not set |
| 409 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 379 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 410 | # CONFIG_SCSI_3W_9XXX is not set | 380 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -495,10 +465,6 @@ CONFIG_SATA_MV=y | |||
| 495 | # CONFIG_PATA_VIA is not set | 465 | # CONFIG_PATA_VIA is not set |
| 496 | # CONFIG_PATA_WINBOND is not set | 466 | # CONFIG_PATA_WINBOND is not set |
| 497 | # CONFIG_PATA_PLATFORM is not set | 467 | # CONFIG_PATA_PLATFORM is not set |
| 498 | |||
| 499 | # | ||
| 500 | # Multi-device support (RAID and LVM) | ||
| 501 | # | ||
| 502 | # CONFIG_MD is not set | 468 | # CONFIG_MD is not set |
| 503 | 469 | ||
| 504 | # | 470 | # |
| @@ -514,19 +480,13 @@ CONFIG_SATA_MV=y | |||
| 514 | # | 480 | # |
| 515 | # CONFIG_FIREWIRE is not set | 481 | # CONFIG_FIREWIRE is not set |
| 516 | # CONFIG_IEEE1394 is not set | 482 | # CONFIG_IEEE1394 is not set |
| 517 | |||
| 518 | # | ||
| 519 | # I2O device support | ||
| 520 | # | ||
| 521 | # CONFIG_I2O is not set | 483 | # CONFIG_I2O is not set |
| 522 | # CONFIG_MACINTOSH_DRIVERS is not set | 484 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 523 | |||
| 524 | # | ||
| 525 | # Network device support | ||
| 526 | # | ||
| 527 | CONFIG_NETDEVICES=y | 485 | CONFIG_NETDEVICES=y |
| 486 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 528 | # CONFIG_DUMMY is not set | 487 | # CONFIG_DUMMY is not set |
| 529 | # CONFIG_BONDING is not set | 488 | # CONFIG_BONDING is not set |
| 489 | # CONFIG_MACVLAN is not set | ||
| 530 | # CONFIG_EQUALIZER is not set | 490 | # CONFIG_EQUALIZER is not set |
| 531 | # CONFIG_TUN is not set | 491 | # CONFIG_TUN is not set |
| 532 | # CONFIG_ARCNET is not set | 492 | # CONFIG_ARCNET is not set |
| @@ -543,21 +503,14 @@ CONFIG_PHYLIB=y | |||
| 543 | # CONFIG_VITESSE_PHY is not set | 503 | # CONFIG_VITESSE_PHY is not set |
| 544 | # CONFIG_SMSC_PHY is not set | 504 | # CONFIG_SMSC_PHY is not set |
| 545 | # CONFIG_BROADCOM_PHY is not set | 505 | # CONFIG_BROADCOM_PHY is not set |
| 506 | # CONFIG_ICPLUS_PHY is not set | ||
| 546 | # CONFIG_FIXED_PHY is not set | 507 | # CONFIG_FIXED_PHY is not set |
| 547 | |||
| 548 | # | ||
| 549 | # Ethernet (10 or 100Mbit) | ||
| 550 | # | ||
| 551 | CONFIG_NET_ETHERNET=y | 508 | CONFIG_NET_ETHERNET=y |
| 552 | CONFIG_MII=y | 509 | CONFIG_MII=y |
| 553 | # CONFIG_HAPPYMEAL is not set | 510 | # CONFIG_HAPPYMEAL is not set |
| 554 | # CONFIG_SUNGEM is not set | 511 | # CONFIG_SUNGEM is not set |
| 555 | # CONFIG_CASSINI is not set | 512 | # CONFIG_CASSINI is not set |
| 556 | # CONFIG_NET_VENDOR_3COM is not set | 513 | # CONFIG_NET_VENDOR_3COM is not set |
| 557 | |||
| 558 | # | ||
| 559 | # Tulip family network device support | ||
| 560 | # | ||
| 561 | # CONFIG_NET_TULIP is not set | 514 | # CONFIG_NET_TULIP is not set |
| 562 | # CONFIG_HP100 is not set | 515 | # CONFIG_HP100 is not set |
| 563 | CONFIG_NET_PCI=y | 516 | CONFIG_NET_PCI=y |
| @@ -595,7 +548,6 @@ CONFIG_NETDEV_1000=y | |||
| 595 | # CONFIG_SIS190 is not set | 548 | # CONFIG_SIS190 is not set |
| 596 | # CONFIG_SKGE is not set | 549 | # CONFIG_SKGE is not set |
| 597 | # CONFIG_SKY2 is not set | 550 | # CONFIG_SKY2 is not set |
| 598 | # CONFIG_SK98LIN is not set | ||
| 599 | # CONFIG_VIA_VELOCITY is not set | 551 | # CONFIG_VIA_VELOCITY is not set |
| 600 | # CONFIG_TIGON3 is not set | 552 | # CONFIG_TIGON3 is not set |
| 601 | # CONFIG_BNX2 is not set | 553 | # CONFIG_BNX2 is not set |
| @@ -627,15 +579,7 @@ CONFIG_NETDEV_10000=y | |||
| 627 | # CONFIG_NETCONSOLE is not set | 579 | # CONFIG_NETCONSOLE is not set |
| 628 | # CONFIG_NETPOLL is not set | 580 | # CONFIG_NETPOLL is not set |
| 629 | # CONFIG_NET_POLL_CONTROLLER is not set | 581 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 630 | |||
| 631 | # | ||
| 632 | # ISDN subsystem | ||
| 633 | # | ||
| 634 | # CONFIG_ISDN is not set | 582 | # CONFIG_ISDN is not set |
| 635 | |||
| 636 | # | ||
| 637 | # Telephony Support | ||
| 638 | # | ||
| 639 | # CONFIG_PHONE is not set | 583 | # CONFIG_PHONE is not set |
| 640 | 584 | ||
| 641 | # | 585 | # |
| @@ -697,10 +641,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 697 | CONFIG_UNIX98_PTYS=y | 641 | CONFIG_UNIX98_PTYS=y |
| 698 | CONFIG_LEGACY_PTYS=y | 642 | CONFIG_LEGACY_PTYS=y |
| 699 | CONFIG_LEGACY_PTY_COUNT=256 | 643 | CONFIG_LEGACY_PTY_COUNT=256 |
| 700 | |||
| 701 | # | ||
| 702 | # IPMI | ||
| 703 | # | ||
| 704 | # CONFIG_IPMI_HANDLER is not set | 644 | # CONFIG_IPMI_HANDLER is not set |
| 705 | # CONFIG_WATCHDOG is not set | 645 | # CONFIG_WATCHDOG is not set |
| 706 | # CONFIG_HW_RANDOM is not set | 646 | # CONFIG_HW_RANDOM is not set |
| @@ -712,10 +652,6 @@ CONFIG_GEN_RTC=y | |||
| 712 | # CONFIG_AGP is not set | 652 | # CONFIG_AGP is not set |
| 713 | # CONFIG_DRM is not set | 653 | # CONFIG_DRM is not set |
| 714 | # CONFIG_RAW_DRIVER is not set | 654 | # CONFIG_RAW_DRIVER is not set |
| 715 | |||
| 716 | # | ||
| 717 | # TPM devices | ||
| 718 | # | ||
| 719 | # CONFIG_TCG_TPM is not set | 655 | # CONFIG_TCG_TPM is not set |
| 720 | CONFIG_DEVPORT=y | 656 | CONFIG_DEVPORT=y |
| 721 | # CONFIG_I2C is not set | 657 | # CONFIG_I2C is not set |
| @@ -725,20 +661,24 @@ CONFIG_DEVPORT=y | |||
| 725 | # | 661 | # |
| 726 | # CONFIG_SPI is not set | 662 | # CONFIG_SPI is not set |
| 727 | # CONFIG_SPI_MASTER is not set | 663 | # CONFIG_SPI_MASTER is not set |
| 728 | |||
| 729 | # | ||
| 730 | # Dallas's 1-wire bus | ||
| 731 | # | ||
| 732 | # CONFIG_W1 is not set | 664 | # CONFIG_W1 is not set |
| 665 | # CONFIG_POWER_SUPPLY is not set | ||
| 733 | CONFIG_HWMON=y | 666 | CONFIG_HWMON=y |
| 734 | # CONFIG_HWMON_VID is not set | 667 | # CONFIG_HWMON_VID is not set |
| 735 | # CONFIG_SENSORS_ABITUGURU is not set | 668 | # CONFIG_SENSORS_ABITUGURU is not set |
| 669 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 736 | # CONFIG_SENSORS_F71805F is not set | 670 | # CONFIG_SENSORS_F71805F is not set |
| 671 | # CONFIG_SENSORS_IT87 is not set | ||
| 672 | # CONFIG_SENSORS_PC87360 is not set | ||
| 737 | # CONFIG_SENSORS_PC87427 is not set | 673 | # CONFIG_SENSORS_PC87427 is not set |
| 674 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 738 | # CONFIG_SENSORS_SMSC47M1 is not set | 675 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 739 | # CONFIG_SENSORS_SMSC47B397 is not set | 676 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 677 | # CONFIG_SENSORS_VIA686A is not set | ||
| 740 | # CONFIG_SENSORS_VT1211 is not set | 678 | # CONFIG_SENSORS_VT1211 is not set |
| 679 | # CONFIG_SENSORS_VT8231 is not set | ||
| 741 | # CONFIG_SENSORS_W83627HF is not set | 680 | # CONFIG_SENSORS_W83627HF is not set |
| 681 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 742 | # CONFIG_HWMON_DEBUG_CHIP is not set | 682 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 743 | 683 | ||
| 744 | # | 684 | # |
| @@ -763,6 +703,7 @@ CONFIG_DAB=y | |||
| 763 | # | 703 | # |
| 764 | # CONFIG_DISPLAY_SUPPORT is not set | 704 | # CONFIG_DISPLAY_SUPPORT is not set |
| 765 | # CONFIG_VGASTATE is not set | 705 | # CONFIG_VGASTATE is not set |
| 706 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 766 | # CONFIG_FB is not set | 707 | # CONFIG_FB is not set |
| 767 | # CONFIG_FB_IBM_GXT4500 is not set | 708 | # CONFIG_FB_IBM_GXT4500 is not set |
| 768 | 709 | ||
| @@ -770,16 +711,10 @@ CONFIG_DAB=y | |||
| 770 | # Sound | 711 | # Sound |
| 771 | # | 712 | # |
| 772 | # CONFIG_SOUND is not set | 713 | # CONFIG_SOUND is not set |
| 773 | 714 | CONFIG_HID_SUPPORT=y | |
| 774 | # | ||
| 775 | # HID Devices | ||
| 776 | # | ||
| 777 | CONFIG_HID=y | 715 | CONFIG_HID=y |
| 778 | # CONFIG_HID_DEBUG is not set | 716 | # CONFIG_HID_DEBUG is not set |
| 779 | 717 | CONFIG_USB_SUPPORT=y | |
| 780 | # | ||
| 781 | # USB support | ||
| 782 | # | ||
| 783 | CONFIG_USB_ARCH_HAS_HCD=y | 718 | CONFIG_USB_ARCH_HAS_HCD=y |
| 784 | CONFIG_USB_ARCH_HAS_OHCI=y | 719 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 785 | CONFIG_USB_ARCH_HAS_EHCI=y | 720 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -794,32 +729,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 794 | # | 729 | # |
| 795 | # CONFIG_USB_GADGET is not set | 730 | # CONFIG_USB_GADGET is not set |
| 796 | # CONFIG_MMC is not set | 731 | # CONFIG_MMC is not set |
| 797 | |||
| 798 | # | ||
| 799 | # LED devices | ||
| 800 | # | ||
| 801 | # CONFIG_NEW_LEDS is not set | 732 | # CONFIG_NEW_LEDS is not set |
| 802 | |||
| 803 | # | ||
| 804 | # LED drivers | ||
| 805 | # | ||
| 806 | |||
| 807 | # | ||
| 808 | # LED Triggers | ||
| 809 | # | ||
| 810 | |||
| 811 | # | ||
| 812 | # InfiniBand support | ||
| 813 | # | ||
| 814 | # CONFIG_INFINIBAND is not set | 733 | # CONFIG_INFINIBAND is not set |
| 815 | 734 | # CONFIG_EDAC is not set | |
| 816 | # | ||
| 817 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 818 | # | ||
| 819 | |||
| 820 | # | ||
| 821 | # Real Time Clock | ||
| 822 | # | ||
| 823 | # CONFIG_RTC_CLASS is not set | 735 | # CONFIG_RTC_CLASS is not set |
| 824 | 736 | ||
| 825 | # | 737 | # |
| @@ -836,6 +748,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 836 | # | 748 | # |
| 837 | 749 | ||
| 838 | # | 750 | # |
| 751 | # Userspace I/O | ||
| 752 | # | ||
| 753 | # CONFIG_UIO is not set | ||
| 754 | |||
| 755 | # | ||
| 839 | # File systems | 756 | # File systems |
| 840 | # | 757 | # |
| 841 | CONFIG_EXT2_FS=y | 758 | CONFIG_EXT2_FS=y |
| @@ -928,7 +845,6 @@ CONFIG_SUNRPC=y | |||
| 928 | # CONFIG_NCP_FS is not set | 845 | # CONFIG_NCP_FS is not set |
| 929 | # CONFIG_CODA_FS is not set | 846 | # CONFIG_CODA_FS is not set |
| 930 | # CONFIG_AFS_FS is not set | 847 | # CONFIG_AFS_FS is not set |
| 931 | # CONFIG_9P_FS is not set | ||
| 932 | 848 | ||
| 933 | # | 849 | # |
| 934 | # Partition Types | 850 | # Partition Types |
| @@ -971,6 +887,7 @@ CONFIG_BITREVERSE=y | |||
| 971 | # CONFIG_CRC16 is not set | 887 | # CONFIG_CRC16 is not set |
| 972 | # CONFIG_CRC_ITU_T is not set | 888 | # CONFIG_CRC_ITU_T is not set |
| 973 | CONFIG_CRC32=y | 889 | CONFIG_CRC32=y |
| 890 | # CONFIG_CRC7 is not set | ||
| 974 | # CONFIG_LIBCRC32C is not set | 891 | # CONFIG_LIBCRC32C is not set |
| 975 | CONFIG_PLIST=y | 892 | CONFIG_PLIST=y |
| 976 | CONFIG_HAS_IOMEM=y | 893 | CONFIG_HAS_IOMEM=y |
| @@ -993,7 +910,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 993 | # CONFIG_HEADERS_CHECK is not set | 910 | # CONFIG_HEADERS_CHECK is not set |
| 994 | # CONFIG_DEBUG_KERNEL is not set | 911 | # CONFIG_DEBUG_KERNEL is not set |
| 995 | # CONFIG_DEBUG_BUGVERBOSE is not set | 912 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 996 | # CONFIG_BOOTX_TEXT is not set | ||
| 997 | # CONFIG_PPC_EARLY_DEBUG is not set | 913 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 998 | 914 | ||
| 999 | # | 915 | # |
| @@ -1001,8 +917,4 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1001 | # | 917 | # |
| 1002 | # CONFIG_KEYS is not set | 918 | # CONFIG_KEYS is not set |
| 1003 | # CONFIG_SECURITY is not set | 919 | # CONFIG_SECURITY is not set |
| 1004 | |||
| 1005 | # | ||
| 1006 | # Cryptographic options | ||
| 1007 | # | ||
| 1008 | # CONFIG_CRYPTO is not set | 920 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 4a429294e4da..4b68032588ff 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
| @@ -1,9 +1,24 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:55 2007 | 4 | # Tue Aug 28 21:24:39 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_PPC_STD_MMU=y | ||
| 19 | CONFIG_PPC_STD_MMU_32=y | ||
| 20 | # CONFIG_PPC_MM_SLICES is not set | ||
| 21 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 23 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 24 | CONFIG_MMU=y |
| @@ -14,59 +29,36 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 35 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 40 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 41 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 44 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | CONFIG_PPC_82xx=y | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 45 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 46 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | CONFIG_PPC_STD_MMU=y | ||
| 46 | CONFIG_PPC_STD_MMU_32=y | ||
| 47 | # CONFIG_PPC_MM_SLICES is not set | ||
| 48 | # CONFIG_SMP is not set | ||
| 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 50 | 48 | ||
| 51 | # | 49 | # |
| 52 | # Code maturity level options | 50 | # General setup |
| 53 | # | 51 | # |
| 54 | # CONFIG_EXPERIMENTAL is not set | 52 | # CONFIG_EXPERIMENTAL is not set |
| 55 | CONFIG_BROKEN_ON_SMP=y | 53 | CONFIG_BROKEN_ON_SMP=y |
| 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 57 | |||
| 58 | # | ||
| 59 | # General setup | ||
| 60 | # | ||
| 61 | CONFIG_LOCALVERSION="powerpc8272" | 55 | CONFIG_LOCALVERSION="powerpc8272" |
| 62 | CONFIG_LOCALVERSION_AUTO=y | 56 | CONFIG_LOCALVERSION_AUTO=y |
| 63 | CONFIG_SWAP=y | 57 | CONFIG_SWAP=y |
| 64 | CONFIG_SYSVIPC=y | 58 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 66 | CONFIG_SYSVIPC_SYSCTL=y | 59 | CONFIG_SYSVIPC_SYSCTL=y |
| 67 | # CONFIG_BSD_PROCESS_ACCT is not set | 60 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 68 | # CONFIG_TASKSTATS is not set | 61 | # CONFIG_TASKSTATS is not set |
| 69 | # CONFIG_UTS_NS is not set | ||
| 70 | # CONFIG_AUDIT is not set | 62 | # CONFIG_AUDIT is not set |
| 71 | CONFIG_IKCONFIG=y | 63 | CONFIG_IKCONFIG=y |
| 72 | CONFIG_IKCONFIG_PROC=y | 64 | CONFIG_IKCONFIG_PROC=y |
| @@ -99,15 +91,7 @@ CONFIG_SLAB=y | |||
| 99 | CONFIG_RT_MUTEXES=y | 91 | CONFIG_RT_MUTEXES=y |
| 100 | # CONFIG_TINY_SHMEM is not set | 92 | # CONFIG_TINY_SHMEM is not set |
| 101 | CONFIG_BASE_SMALL=0 | 93 | CONFIG_BASE_SMALL=0 |
| 102 | |||
| 103 | # | ||
| 104 | # Loadable module support | ||
| 105 | # | ||
| 106 | # CONFIG_MODULES is not set | 94 | # CONFIG_MODULES is not set |
| 107 | |||
| 108 | # | ||
| 109 | # Block layer | ||
| 110 | # | ||
| 111 | CONFIG_BLOCK=y | 95 | CONFIG_BLOCK=y |
| 112 | # CONFIG_LBD is not set | 96 | # CONFIG_LBD is not set |
| 113 | # CONFIG_BLK_DEV_IO_TRACE is not set | 97 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| @@ -129,6 +113,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 129 | # | 113 | # |
| 130 | # Platform support | 114 | # Platform support |
| 131 | # | 115 | # |
| 116 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 117 | # CONFIG_EMBEDDED6xx is not set | ||
| 118 | CONFIG_PPC_82xx=y | ||
| 119 | # CONFIG_PPC_83xx is not set | ||
| 120 | # CONFIG_PPC_86xx is not set | ||
| 132 | # CONFIG_PPC_MPC52xx is not set | 121 | # CONFIG_PPC_MPC52xx is not set |
| 133 | # CONFIG_PPC_MPC5200 is not set | 122 | # CONFIG_PPC_MPC5200 is not set |
| 134 | # CONFIG_PPC_CELL is not set | 123 | # CONFIG_PPC_CELL is not set |
| @@ -148,6 +137,7 @@ CONFIG_8272=y | |||
| 148 | # CONFIG_GENERIC_IOMAP is not set | 137 | # CONFIG_GENERIC_IOMAP is not set |
| 149 | # CONFIG_CPU_FREQ is not set | 138 | # CONFIG_CPU_FREQ is not set |
| 150 | CONFIG_CPM2=y | 139 | CONFIG_CPM2=y |
| 140 | # CONFIG_FSL_ULI1575 is not set | ||
| 151 | 141 | ||
| 152 | # | 142 | # |
| 153 | # Kernel options | 143 | # Kernel options |
| @@ -172,6 +162,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 162 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 173 | # CONFIG_RESOURCES_64BIT is not set | 163 | # CONFIG_RESOURCES_64BIT is not set |
| 174 | CONFIG_ZONE_DMA_FLAG=1 | 164 | CONFIG_ZONE_DMA_FLAG=1 |
| 165 | CONFIG_BOUNCE=y | ||
| 166 | CONFIG_VIRT_TO_BUS=y | ||
| 175 | CONFIG_PROC_DEVICETREE=y | 167 | CONFIG_PROC_DEVICETREE=y |
| 176 | # CONFIG_CMDLINE_BOOL is not set | 168 | # CONFIG_CMDLINE_BOOL is not set |
| 177 | # CONFIG_PM is not set | 169 | # CONFIG_PM is not set |
| @@ -186,6 +178,7 @@ CONFIG_ZONE_DMA=y | |||
| 186 | CONFIG_FSL_SOC=y | 178 | CONFIG_FSL_SOC=y |
| 187 | # CONFIG_PCI is not set | 179 | # CONFIG_PCI is not set |
| 188 | # CONFIG_PCI_DOMAINS is not set | 180 | # CONFIG_PCI_DOMAINS is not set |
| 181 | # CONFIG_PCI_SYSCALL is not set | ||
| 189 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 182 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 190 | 183 | ||
| 191 | # | 184 | # |
| @@ -319,26 +312,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 319 | # CONFIG_DEBUG_DRIVER is not set | 312 | # CONFIG_DEBUG_DRIVER is not set |
| 320 | # CONFIG_DEBUG_DEVRES is not set | 313 | # CONFIG_DEBUG_DEVRES is not set |
| 321 | # CONFIG_SYS_HYPERVISOR is not set | 314 | # CONFIG_SYS_HYPERVISOR is not set |
| 322 | |||
| 323 | # | ||
| 324 | # Connector - unified userspace <-> kernelspace linker | ||
| 325 | # | ||
| 326 | # CONFIG_CONNECTOR is not set | 315 | # CONFIG_CONNECTOR is not set |
| 327 | # CONFIG_MTD is not set | 316 | # CONFIG_MTD is not set |
| 328 | 317 | CONFIG_OF_DEVICE=y | |
| 329 | # | ||
| 330 | # Parallel port support | ||
| 331 | # | ||
| 332 | # CONFIG_PARPORT is not set | 318 | # CONFIG_PARPORT is not set |
| 333 | 319 | CONFIG_BLK_DEV=y | |
| 334 | # | ||
| 335 | # Plug and Play support | ||
| 336 | # | ||
| 337 | # CONFIG_PNPACPI is not set | ||
| 338 | |||
| 339 | # | ||
| 340 | # Block devices | ||
| 341 | # | ||
| 342 | # CONFIG_BLK_DEV_FD is not set | 320 | # CONFIG_BLK_DEV_FD is not set |
| 343 | # CONFIG_BLK_DEV_COW_COMMON is not set | 321 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 344 | CONFIG_BLK_DEV_LOOP=y | 322 | CONFIG_BLK_DEV_LOOP=y |
| @@ -347,11 +325,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 347 | # CONFIG_BLK_DEV_RAM is not set | 325 | # CONFIG_BLK_DEV_RAM is not set |
| 348 | # CONFIG_CDROM_PKTCDVD is not set | 326 | # CONFIG_CDROM_PKTCDVD is not set |
| 349 | # CONFIG_ATA_OVER_ETH is not set | 327 | # CONFIG_ATA_OVER_ETH is not set |
| 350 | 328 | CONFIG_MISC_DEVICES=y | |
| 351 | # | 329 | # CONFIG_EEPROM_93CX6 is not set |
| 352 | # Misc devices | ||
| 353 | # | ||
| 354 | # CONFIG_BLINK is not set | ||
| 355 | CONFIG_IDE=y | 330 | CONFIG_IDE=y |
| 356 | CONFIG_IDE_MAX_HWIFS=4 | 331 | CONFIG_IDE_MAX_HWIFS=4 |
| 357 | CONFIG_BLK_DEV_IDE=y | 332 | CONFIG_BLK_DEV_IDE=y |
| @@ -381,19 +356,13 @@ CONFIG_IDE_PROC_FS=y | |||
| 381 | # | 356 | # |
| 382 | # CONFIG_RAID_ATTRS is not set | 357 | # CONFIG_RAID_ATTRS is not set |
| 383 | # CONFIG_SCSI is not set | 358 | # CONFIG_SCSI is not set |
| 359 | # CONFIG_SCSI_DMA is not set | ||
| 384 | # CONFIG_SCSI_NETLINK is not set | 360 | # CONFIG_SCSI_NETLINK is not set |
| 385 | # CONFIG_ATA is not set | 361 | # CONFIG_ATA is not set |
| 386 | |||
| 387 | # | ||
| 388 | # Multi-device support (RAID and LVM) | ||
| 389 | # | ||
| 390 | # CONFIG_MD is not set | 362 | # CONFIG_MD is not set |
| 391 | # CONFIG_MACINTOSH_DRIVERS is not set | 363 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 392 | |||
| 393 | # | ||
| 394 | # Network device support | ||
| 395 | # | ||
| 396 | CONFIG_NETDEVICES=y | 364 | CONFIG_NETDEVICES=y |
| 365 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 397 | # CONFIG_DUMMY is not set | 366 | # CONFIG_DUMMY is not set |
| 398 | # CONFIG_BONDING is not set | 367 | # CONFIG_BONDING is not set |
| 399 | # CONFIG_EQUALIZER is not set | 368 | # CONFIG_EQUALIZER is not set |
| @@ -411,11 +380,8 @@ CONFIG_DAVICOM_PHY=y | |||
| 411 | # CONFIG_VITESSE_PHY is not set | 380 | # CONFIG_VITESSE_PHY is not set |
| 412 | # CONFIG_SMSC_PHY is not set | 381 | # CONFIG_SMSC_PHY is not set |
| 413 | # CONFIG_BROADCOM_PHY is not set | 382 | # CONFIG_BROADCOM_PHY is not set |
| 383 | # CONFIG_ICPLUS_PHY is not set | ||
| 414 | # CONFIG_FIXED_PHY is not set | 384 | # CONFIG_FIXED_PHY is not set |
| 415 | |||
| 416 | # | ||
| 417 | # Ethernet (10 or 100Mbit) | ||
| 418 | # | ||
| 419 | CONFIG_NET_ETHERNET=y | 385 | CONFIG_NET_ETHERNET=y |
| 420 | CONFIG_MII=y | 386 | CONFIG_MII=y |
| 421 | CONFIG_FS_ENET=y | 387 | CONFIG_FS_ENET=y |
| @@ -440,15 +406,7 @@ CONFIG_PPP_DEFLATE=y | |||
| 440 | CONFIG_SLHC=y | 406 | CONFIG_SLHC=y |
| 441 | # CONFIG_NETPOLL is not set | 407 | # CONFIG_NETPOLL is not set |
| 442 | # CONFIG_NET_POLL_CONTROLLER is not set | 408 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 443 | |||
| 444 | # | ||
| 445 | # ISDN subsystem | ||
| 446 | # | ||
| 447 | # CONFIG_ISDN is not set | 409 | # CONFIG_ISDN is not set |
| 448 | |||
| 449 | # | ||
| 450 | # Telephony Support | ||
| 451 | # | ||
| 452 | # CONFIG_PHONE is not set | 410 | # CONFIG_PHONE is not set |
| 453 | 411 | ||
| 454 | # | 412 | # |
| @@ -533,10 +491,6 @@ CONFIG_SERIAL_CPM_SCC4=y | |||
| 533 | CONFIG_UNIX98_PTYS=y | 491 | CONFIG_UNIX98_PTYS=y |
| 534 | CONFIG_LEGACY_PTYS=y | 492 | CONFIG_LEGACY_PTYS=y |
| 535 | CONFIG_LEGACY_PTY_COUNT=256 | 493 | CONFIG_LEGACY_PTY_COUNT=256 |
| 536 | |||
| 537 | # | ||
| 538 | # IPMI | ||
| 539 | # | ||
| 540 | # CONFIG_IPMI_HANDLER is not set | 494 | # CONFIG_IPMI_HANDLER is not set |
| 541 | # CONFIG_WATCHDOG is not set | 495 | # CONFIG_WATCHDOG is not set |
| 542 | CONFIG_HW_RANDOM=y | 496 | CONFIG_HW_RANDOM=y |
| @@ -544,10 +498,6 @@ CONFIG_HW_RANDOM=y | |||
| 544 | # CONFIG_GEN_RTC is not set | 498 | # CONFIG_GEN_RTC is not set |
| 545 | # CONFIG_R3964 is not set | 499 | # CONFIG_R3964 is not set |
| 546 | # CONFIG_RAW_DRIVER is not set | 500 | # CONFIG_RAW_DRIVER is not set |
| 547 | |||
| 548 | # | ||
| 549 | # TPM devices | ||
| 550 | # | ||
| 551 | # CONFIG_I2C is not set | 501 | # CONFIG_I2C is not set |
| 552 | 502 | ||
| 553 | # | 503 | # |
| @@ -555,11 +505,8 @@ CONFIG_HW_RANDOM=y | |||
| 555 | # | 505 | # |
| 556 | # CONFIG_SPI is not set | 506 | # CONFIG_SPI is not set |
| 557 | # CONFIG_SPI_MASTER is not set | 507 | # CONFIG_SPI_MASTER is not set |
| 558 | |||
| 559 | # | ||
| 560 | # Dallas's 1-wire bus | ||
| 561 | # | ||
| 562 | # CONFIG_W1 is not set | 508 | # CONFIG_W1 is not set |
| 509 | # CONFIG_POWER_SUPPLY is not set | ||
| 563 | # CONFIG_HWMON is not set | 510 | # CONFIG_HWMON is not set |
| 564 | 511 | ||
| 565 | # | 512 | # |
| @@ -584,6 +531,7 @@ CONFIG_DAB=y | |||
| 584 | # | 531 | # |
| 585 | # CONFIG_DISPLAY_SUPPORT is not set | 532 | # CONFIG_DISPLAY_SUPPORT is not set |
| 586 | # CONFIG_VGASTATE is not set | 533 | # CONFIG_VGASTATE is not set |
| 534 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 587 | # CONFIG_FB is not set | 535 | # CONFIG_FB is not set |
| 588 | # CONFIG_FB_IBM_GXT4500 is not set | 536 | # CONFIG_FB_IBM_GXT4500 is not set |
| 589 | 537 | ||
| @@ -591,16 +539,10 @@ CONFIG_DAB=y | |||
| 591 | # Sound | 539 | # Sound |
| 592 | # | 540 | # |
| 593 | # CONFIG_SOUND is not set | 541 | # CONFIG_SOUND is not set |
| 594 | 542 | CONFIG_HID_SUPPORT=y | |
| 595 | # | ||
| 596 | # HID Devices | ||
| 597 | # | ||
| 598 | CONFIG_HID=y | 543 | CONFIG_HID=y |
| 599 | # CONFIG_HID_DEBUG is not set | 544 | # CONFIG_HID_DEBUG is not set |
| 600 | 545 | CONFIG_USB_SUPPORT=y | |
| 601 | # | ||
| 602 | # USB support | ||
| 603 | # | ||
| 604 | # CONFIG_USB_ARCH_HAS_HCD is not set | 546 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 605 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 547 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 606 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 548 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -614,41 +556,29 @@ CONFIG_HID=y | |||
| 614 | # | 556 | # |
| 615 | CONFIG_USB_GADGET=y | 557 | CONFIG_USB_GADGET=y |
| 616 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 558 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 559 | CONFIG_USB_GADGET_SELECTED=y | ||
| 560 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 617 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 561 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
| 618 | # CONFIG_USB_GADGET_NET2280 is not set | 562 | # CONFIG_USB_GADGET_NET2280 is not set |
| 619 | # CONFIG_USB_GADGET_PXA2XX is not set | 563 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 564 | CONFIG_USB_GADGET_M66592=y | ||
| 565 | CONFIG_USB_M66592=y | ||
| 620 | # CONFIG_USB_GADGET_GOKU is not set | 566 | # CONFIG_USB_GADGET_GOKU is not set |
| 621 | # CONFIG_USB_GADGET_LH7A40X is not set | 567 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 622 | # CONFIG_USB_GADGET_OMAP is not set | 568 | # CONFIG_USB_GADGET_OMAP is not set |
| 569 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 623 | # CONFIG_USB_GADGET_AT91 is not set | 570 | # CONFIG_USB_GADGET_AT91 is not set |
| 624 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 571 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
| 625 | # CONFIG_USB_GADGET_DUALSPEED is not set | 572 | CONFIG_USB_GADGET_DUALSPEED=y |
| 573 | # CONFIG_USB_ZERO is not set | ||
| 574 | CONFIG_USB_ETH=y | ||
| 575 | # CONFIG_USB_GADGETFS is not set | ||
| 576 | # CONFIG_USB_FILE_STORAGE is not set | ||
| 577 | # CONFIG_USB_G_SERIAL is not set | ||
| 578 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 626 | # CONFIG_MMC is not set | 579 | # CONFIG_MMC is not set |
| 627 | |||
| 628 | # | ||
| 629 | # LED devices | ||
| 630 | # | ||
| 631 | # CONFIG_NEW_LEDS is not set | 580 | # CONFIG_NEW_LEDS is not set |
| 632 | 581 | # CONFIG_RTC_CLASS is not set | |
| 633 | # | ||
| 634 | # LED drivers | ||
| 635 | # | ||
| 636 | |||
| 637 | # | ||
| 638 | # LED Triggers | ||
| 639 | # | ||
| 640 | |||
| 641 | # | ||
| 642 | # InfiniBand support | ||
| 643 | # | ||
| 644 | |||
| 645 | # | ||
| 646 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 647 | # | ||
| 648 | |||
| 649 | # | ||
| 650 | # Real Time Clock | ||
| 651 | # | ||
| 652 | 582 | ||
| 653 | # | 583 | # |
| 654 | # DMA Engine support | 584 | # DMA Engine support |
| @@ -664,6 +594,11 @@ CONFIG_USB_GADGET=y | |||
| 664 | # | 594 | # |
| 665 | 595 | ||
| 666 | # | 596 | # |
| 597 | # Userspace I/O | ||
| 598 | # | ||
| 599 | # CONFIG_UIO is not set | ||
| 600 | |||
| 601 | # | ||
| 667 | # File systems | 602 | # File systems |
| 668 | # | 603 | # |
| 669 | CONFIG_EXT2_FS=y | 604 | CONFIG_EXT2_FS=y |
| @@ -826,6 +761,7 @@ CONFIG_CRC_CCITT=y | |||
| 826 | # CONFIG_CRC16 is not set | 761 | # CONFIG_CRC16 is not set |
| 827 | # CONFIG_CRC_ITU_T is not set | 762 | # CONFIG_CRC_ITU_T is not set |
| 828 | CONFIG_CRC32=y | 763 | CONFIG_CRC32=y |
| 764 | # CONFIG_CRC7 is not set | ||
| 829 | # CONFIG_LIBCRC32C is not set | 765 | # CONFIG_LIBCRC32C is not set |
| 830 | CONFIG_ZLIB_INFLATE=y | 766 | CONFIG_ZLIB_INFLATE=y |
| 831 | CONFIG_ZLIB_DEFLATE=y | 767 | CONFIG_ZLIB_DEFLATE=y |
| @@ -846,6 +782,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 846 | CONFIG_DEBUG_KERNEL=y | 782 | CONFIG_DEBUG_KERNEL=y |
| 847 | # CONFIG_DEBUG_SHIRQ is not set | 783 | # CONFIG_DEBUG_SHIRQ is not set |
| 848 | CONFIG_DETECT_SOFTLOCKUP=y | 784 | CONFIG_DETECT_SOFTLOCKUP=y |
| 785 | CONFIG_SCHED_DEBUG=y | ||
| 849 | # CONFIG_SCHEDSTATS is not set | 786 | # CONFIG_SCHEDSTATS is not set |
| 850 | # CONFIG_TIMER_STATS is not set | 787 | # CONFIG_TIMER_STATS is not set |
| 851 | # CONFIG_DEBUG_SLAB is not set | 788 | # CONFIG_DEBUG_SLAB is not set |
| @@ -868,7 +805,6 @@ CONFIG_FORCED_INLINING=y | |||
| 868 | # CONFIG_DEBUGGER is not set | 805 | # CONFIG_DEBUGGER is not set |
| 869 | # CONFIG_KGDB_CONSOLE is not set | 806 | # CONFIG_KGDB_CONSOLE is not set |
| 870 | CONFIG_BDI_SWITCH=y | 807 | CONFIG_BDI_SWITCH=y |
| 871 | # CONFIG_BOOTX_TEXT is not set | ||
| 872 | # CONFIG_PPC_EARLY_DEBUG is not set | 808 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 873 | 809 | ||
| 874 | # | 810 | # |
| @@ -876,10 +812,6 @@ CONFIG_BDI_SWITCH=y | |||
| 876 | # | 812 | # |
| 877 | # CONFIG_KEYS is not set | 813 | # CONFIG_KEYS is not set |
| 878 | # CONFIG_SECURITY is not set | 814 | # CONFIG_SECURITY is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Cryptographic options | ||
| 882 | # | ||
| 883 | CONFIG_CRYPTO=y | 815 | CONFIG_CRYPTO=y |
| 884 | CONFIG_CRYPTO_ALGAPI=y | 816 | CONFIG_CRYPTO_ALGAPI=y |
| 885 | CONFIG_CRYPTO_BLKCIPHER=y | 817 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -913,7 +845,4 @@ CONFIG_CRYPTO_DES=y | |||
| 913 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 845 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 914 | # CONFIG_CRYPTO_CRC32C is not set | 846 | # CONFIG_CRYPTO_CRC32C is not set |
| 915 | # CONFIG_CRYPTO_CAMELLIA is not set | 847 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 916 | 848 | CONFIG_CRYPTO_HW=y | |
| 917 | # | ||
| 918 | # Hardware crypto devices | ||
| 919 | # | ||
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig index b7d3dffc981a..f387dac69d09 100644 --- a/arch/powerpc/configs/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/mpc8313_rdb_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:55 2007 | 4 | # Tue Aug 28 21:24:39 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -158,6 +149,7 @@ CONFIG_PPC_MPC831x=y | |||
| 158 | # CONFIG_GENERIC_IOMAP is not set | 149 | # CONFIG_GENERIC_IOMAP is not set |
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | # CONFIG_CPM2 is not set | 151 | # CONFIG_CPM2 is not set |
| 152 | # CONFIG_FSL_ULI1575 is not set | ||
| 161 | 153 | ||
| 162 | # | 154 | # |
| 163 | # Kernel options | 155 | # Kernel options |
| @@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 186 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 178 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 187 | # CONFIG_RESOURCES_64BIT is not set | 179 | # CONFIG_RESOURCES_64BIT is not set |
| 188 | CONFIG_ZONE_DMA_FLAG=1 | 180 | CONFIG_ZONE_DMA_FLAG=1 |
| 181 | CONFIG_BOUNCE=y | ||
| 182 | CONFIG_VIRT_TO_BUS=y | ||
| 189 | CONFIG_PROC_DEVICETREE=y | 183 | CONFIG_PROC_DEVICETREE=y |
| 190 | # CONFIG_CMDLINE_BOOL is not set | 184 | # CONFIG_CMDLINE_BOOL is not set |
| 191 | # CONFIG_PM is not set | 185 | # CONFIG_PM is not set |
| @@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y | |||
| 200 | CONFIG_ZONE_DMA=y | 194 | CONFIG_ZONE_DMA=y |
| 201 | CONFIG_GENERIC_ISA_DMA=y | 195 | CONFIG_GENERIC_ISA_DMA=y |
| 202 | CONFIG_PPC_INDIRECT_PCI=y | 196 | CONFIG_PPC_INDIRECT_PCI=y |
| 203 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 204 | CONFIG_FSL_SOC=y | 197 | CONFIG_FSL_SOC=y |
| 205 | CONFIG_PCI=y | 198 | CONFIG_PCI=y |
| 206 | CONFIG_PCI_DOMAINS=y | 199 | CONFIG_PCI_DOMAINS=y |
| 200 | CONFIG_PCI_SYSCALL=y | ||
| 207 | # CONFIG_PCIEPORTBUS is not set | 201 | # CONFIG_PCIEPORTBUS is not set |
| 208 | CONFIG_ARCH_SUPPORTS_MSI=y | 202 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 209 | # CONFIG_PCI_MSI is not set | 203 | # CONFIG_PCI_MSI is not set |
| @@ -314,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 314 | # CONFIG_MAC80211 is not set | 308 | # CONFIG_MAC80211 is not set |
| 315 | # CONFIG_IEEE80211 is not set | 309 | # CONFIG_IEEE80211 is not set |
| 316 | # CONFIG_RFKILL is not set | 310 | # CONFIG_RFKILL is not set |
| 311 | # CONFIG_NET_9P is not set | ||
| 317 | 312 | ||
| 318 | # | 313 | # |
| 319 | # Device Drivers | 314 | # Device Drivers |
| @@ -328,10 +323,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 328 | # CONFIG_DEBUG_DRIVER is not set | 323 | # CONFIG_DEBUG_DRIVER is not set |
| 329 | # CONFIG_DEBUG_DEVRES is not set | 324 | # CONFIG_DEBUG_DEVRES is not set |
| 330 | # CONFIG_SYS_HYPERVISOR is not set | 325 | # CONFIG_SYS_HYPERVISOR is not set |
| 331 | |||
| 332 | # | ||
| 333 | # Connector - unified userspace <-> kernelspace linker | ||
| 334 | # | ||
| 335 | # CONFIG_CONNECTOR is not set | 326 | # CONFIG_CONNECTOR is not set |
| 336 | CONFIG_MTD=y | 327 | CONFIG_MTD=y |
| 337 | # CONFIG_MTD_DEBUG is not set | 328 | # CONFIG_MTD_DEBUG is not set |
| @@ -411,20 +402,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 411 | # UBI - Unsorted block images | 402 | # UBI - Unsorted block images |
| 412 | # | 403 | # |
| 413 | # CONFIG_MTD_UBI is not set | 404 | # CONFIG_MTD_UBI is not set |
| 414 | 405 | CONFIG_OF_DEVICE=y | |
| 415 | # | ||
| 416 | # Parallel port support | ||
| 417 | # | ||
| 418 | # CONFIG_PARPORT is not set | 406 | # CONFIG_PARPORT is not set |
| 419 | 407 | CONFIG_BLK_DEV=y | |
| 420 | # | ||
| 421 | # Plug and Play support | ||
| 422 | # | ||
| 423 | # CONFIG_PNPACPI is not set | ||
| 424 | |||
| 425 | # | ||
| 426 | # Block devices | ||
| 427 | # | ||
| 428 | # CONFIG_BLK_DEV_FD is not set | 408 | # CONFIG_BLK_DEV_FD is not set |
| 429 | # CONFIG_BLK_CPQ_DA is not set | 409 | # CONFIG_BLK_CPQ_DA is not set |
| 430 | # CONFIG_BLK_CPQ_CISS_DA is not set | 410 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -442,14 +422,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 442 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 422 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 443 | # CONFIG_CDROM_PKTCDVD is not set | 423 | # CONFIG_CDROM_PKTCDVD is not set |
| 444 | # CONFIG_ATA_OVER_ETH is not set | 424 | # CONFIG_ATA_OVER_ETH is not set |
| 445 | 425 | CONFIG_MISC_DEVICES=y | |
| 446 | # | ||
| 447 | # Misc devices | ||
| 448 | # | ||
| 449 | # CONFIG_PHANTOM is not set | 426 | # CONFIG_PHANTOM is not set |
| 427 | # CONFIG_EEPROM_93CX6 is not set | ||
| 450 | # CONFIG_SGI_IOC4 is not set | 428 | # CONFIG_SGI_IOC4 is not set |
| 451 | # CONFIG_TIFM_CORE is not set | 429 | # CONFIG_TIFM_CORE is not set |
| 452 | # CONFIG_BLINK is not set | ||
| 453 | # CONFIG_IDE is not set | 430 | # CONFIG_IDE is not set |
| 454 | 431 | ||
| 455 | # | 432 | # |
| @@ -457,6 +434,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 457 | # | 434 | # |
| 458 | # CONFIG_RAID_ATTRS is not set | 435 | # CONFIG_RAID_ATTRS is not set |
| 459 | CONFIG_SCSI=y | 436 | CONFIG_SCSI=y |
| 437 | CONFIG_SCSI_DMA=y | ||
| 460 | # CONFIG_SCSI_TGT is not set | 438 | # CONFIG_SCSI_TGT is not set |
| 461 | # CONFIG_SCSI_NETLINK is not set | 439 | # CONFIG_SCSI_NETLINK is not set |
| 462 | CONFIG_SCSI_PROC_FS=y | 440 | CONFIG_SCSI_PROC_FS=y |
| @@ -486,12 +464,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 486 | CONFIG_SCSI_SPI_ATTRS=y | 464 | CONFIG_SCSI_SPI_ATTRS=y |
| 487 | # CONFIG_SCSI_FC_ATTRS is not set | 465 | # CONFIG_SCSI_FC_ATTRS is not set |
| 488 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 466 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 489 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 490 | # CONFIG_SCSI_SAS_LIBSAS is not set | 467 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 491 | 468 | CONFIG_SCSI_LOWLEVEL=y | |
| 492 | # | ||
| 493 | # SCSI low-level drivers | ||
| 494 | # | ||
| 495 | # CONFIG_ISCSI_TCP is not set | 469 | # CONFIG_ISCSI_TCP is not set |
| 496 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 470 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 497 | # CONFIG_SCSI_3W_9XXX is not set | 471 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -527,10 +501,6 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 527 | # CONFIG_SCSI_DEBUG is not set | 501 | # CONFIG_SCSI_DEBUG is not set |
| 528 | # CONFIG_SCSI_SRP is not set | 502 | # CONFIG_SCSI_SRP is not set |
| 529 | # CONFIG_ATA is not set | 503 | # CONFIG_ATA is not set |
| 530 | |||
| 531 | # | ||
| 532 | # Multi-device support (RAID and LVM) | ||
| 533 | # | ||
| 534 | CONFIG_MD=y | 504 | CONFIG_MD=y |
| 535 | CONFIG_BLK_DEV_MD=y | 505 | CONFIG_BLK_DEV_MD=y |
| 536 | CONFIG_MD_LINEAR=y | 506 | CONFIG_MD_LINEAR=y |
| @@ -555,19 +525,13 @@ CONFIG_MD_RAID1=y | |||
| 555 | # | 525 | # |
| 556 | # CONFIG_FIREWIRE is not set | 526 | # CONFIG_FIREWIRE is not set |
| 557 | # CONFIG_IEEE1394 is not set | 527 | # CONFIG_IEEE1394 is not set |
| 558 | |||
| 559 | # | ||
| 560 | # I2O device support | ||
| 561 | # | ||
| 562 | # CONFIG_I2O is not set | 528 | # CONFIG_I2O is not set |
| 563 | # CONFIG_MACINTOSH_DRIVERS is not set | 529 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 564 | |||
| 565 | # | ||
| 566 | # Network device support | ||
| 567 | # | ||
| 568 | CONFIG_NETDEVICES=y | 530 | CONFIG_NETDEVICES=y |
| 531 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 569 | # CONFIG_DUMMY is not set | 532 | # CONFIG_DUMMY is not set |
| 570 | # CONFIG_BONDING is not set | 533 | # CONFIG_BONDING is not set |
| 534 | # CONFIG_MACVLAN is not set | ||
| 571 | # CONFIG_EQUALIZER is not set | 535 | # CONFIG_EQUALIZER is not set |
| 572 | # CONFIG_TUN is not set | 536 | # CONFIG_TUN is not set |
| 573 | # CONFIG_ARCNET is not set | 537 | # CONFIG_ARCNET is not set |
| @@ -584,21 +548,14 @@ CONFIG_CICADA_PHY=y | |||
| 584 | # CONFIG_VITESSE_PHY is not set | 548 | # CONFIG_VITESSE_PHY is not set |
| 585 | # CONFIG_SMSC_PHY is not set | 549 | # CONFIG_SMSC_PHY is not set |
| 586 | # CONFIG_BROADCOM_PHY is not set | 550 | # CONFIG_BROADCOM_PHY is not set |
| 551 | # CONFIG_ICPLUS_PHY is not set | ||
| 587 | # CONFIG_FIXED_PHY is not set | 552 | # CONFIG_FIXED_PHY is not set |
| 588 | |||
| 589 | # | ||
| 590 | # Ethernet (10 or 100Mbit) | ||
| 591 | # | ||
| 592 | CONFIG_NET_ETHERNET=y | 553 | CONFIG_NET_ETHERNET=y |
| 593 | CONFIG_MII=y | 554 | CONFIG_MII=y |
| 594 | # CONFIG_HAPPYMEAL is not set | 555 | # CONFIG_HAPPYMEAL is not set |
| 595 | # CONFIG_SUNGEM is not set | 556 | # CONFIG_SUNGEM is not set |
| 596 | # CONFIG_CASSINI is not set | 557 | # CONFIG_CASSINI is not set |
| 597 | # CONFIG_NET_VENDOR_3COM is not set | 558 | # CONFIG_NET_VENDOR_3COM is not set |
| 598 | |||
| 599 | # | ||
| 600 | # Tulip family network device support | ||
| 601 | # | ||
| 602 | # CONFIG_NET_TULIP is not set | 559 | # CONFIG_NET_TULIP is not set |
| 603 | # CONFIG_HP100 is not set | 560 | # CONFIG_HP100 is not set |
| 604 | CONFIG_NET_PCI=y | 561 | CONFIG_NET_PCI=y |
| @@ -632,7 +589,6 @@ CONFIG_NETDEV_1000=y | |||
| 632 | # CONFIG_SIS190 is not set | 589 | # CONFIG_SIS190 is not set |
| 633 | # CONFIG_SKGE is not set | 590 | # CONFIG_SKGE is not set |
| 634 | # CONFIG_SKY2 is not set | 591 | # CONFIG_SKY2 is not set |
| 635 | # CONFIG_SK98LIN is not set | ||
| 636 | # CONFIG_VIA_VELOCITY is not set | 592 | # CONFIG_VIA_VELOCITY is not set |
| 637 | # CONFIG_TIGON3 is not set | 593 | # CONFIG_TIGON3 is not set |
| 638 | # CONFIG_BNX2 is not set | 594 | # CONFIG_BNX2 is not set |
| @@ -675,15 +631,7 @@ CONFIG_NETDEV_10000=y | |||
| 675 | # CONFIG_NETCONSOLE is not set | 631 | # CONFIG_NETCONSOLE is not set |
| 676 | # CONFIG_NETPOLL is not set | 632 | # CONFIG_NETPOLL is not set |
| 677 | # CONFIG_NET_POLL_CONTROLLER is not set | 633 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 678 | |||
| 679 | # | ||
| 680 | # ISDN subsystem | ||
| 681 | # | ||
| 682 | # CONFIG_ISDN is not set | 634 | # CONFIG_ISDN is not set |
| 683 | |||
| 684 | # | ||
| 685 | # Telephony Support | ||
| 686 | # | ||
| 687 | # CONFIG_PHONE is not set | 635 | # CONFIG_PHONE is not set |
| 688 | 636 | ||
| 689 | # | 637 | # |
| @@ -745,10 +693,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 745 | CONFIG_UNIX98_PTYS=y | 693 | CONFIG_UNIX98_PTYS=y |
| 746 | CONFIG_LEGACY_PTYS=y | 694 | CONFIG_LEGACY_PTYS=y |
| 747 | CONFIG_LEGACY_PTY_COUNT=256 | 695 | CONFIG_LEGACY_PTY_COUNT=256 |
| 748 | |||
| 749 | # | ||
| 750 | # IPMI | ||
| 751 | # | ||
| 752 | # CONFIG_IPMI_HANDLER is not set | 696 | # CONFIG_IPMI_HANDLER is not set |
| 753 | CONFIG_WATCHDOG=y | 697 | CONFIG_WATCHDOG=y |
| 754 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 698 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -777,10 +721,6 @@ CONFIG_HW_RANDOM=y | |||
| 777 | # CONFIG_AGP is not set | 721 | # CONFIG_AGP is not set |
| 778 | # CONFIG_DRM is not set | 722 | # CONFIG_DRM is not set |
| 779 | # CONFIG_RAW_DRIVER is not set | 723 | # CONFIG_RAW_DRIVER is not set |
| 780 | |||
| 781 | # | ||
| 782 | # TPM devices | ||
| 783 | # | ||
| 784 | # CONFIG_TCG_TPM is not set | 724 | # CONFIG_TCG_TPM is not set |
| 785 | CONFIG_DEVPORT=y | 725 | CONFIG_DEVPORT=y |
| 786 | CONFIG_I2C=y | 726 | CONFIG_I2C=y |
| @@ -815,6 +755,7 @@ CONFIG_I2C_MPC=y | |||
| 815 | # CONFIG_I2C_SIS5595 is not set | 755 | # CONFIG_I2C_SIS5595 is not set |
| 816 | # CONFIG_I2C_SIS630 is not set | 756 | # CONFIG_I2C_SIS630 is not set |
| 817 | # CONFIG_I2C_SIS96X is not set | 757 | # CONFIG_I2C_SIS96X is not set |
| 758 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 818 | # CONFIG_I2C_STUB is not set | 759 | # CONFIG_I2C_STUB is not set |
| 819 | # CONFIG_I2C_TINY_USB is not set | 760 | # CONFIG_I2C_TINY_USB is not set |
| 820 | # CONFIG_I2C_VIA is not set | 761 | # CONFIG_I2C_VIA is not set |
| @@ -826,12 +767,14 @@ CONFIG_I2C_MPC=y | |||
| 826 | # | 767 | # |
| 827 | # CONFIG_SENSORS_DS1337 is not set | 768 | # CONFIG_SENSORS_DS1337 is not set |
| 828 | # CONFIG_SENSORS_DS1374 is not set | 769 | # CONFIG_SENSORS_DS1374 is not set |
| 770 | # CONFIG_DS1682 is not set | ||
| 829 | # CONFIG_SENSORS_EEPROM is not set | 771 | # CONFIG_SENSORS_EEPROM is not set |
| 830 | # CONFIG_SENSORS_PCF8574 is not set | 772 | # CONFIG_SENSORS_PCF8574 is not set |
| 831 | # CONFIG_SENSORS_PCA9539 is not set | 773 | # CONFIG_SENSORS_PCA9539 is not set |
| 832 | # CONFIG_SENSORS_PCF8591 is not set | 774 | # CONFIG_SENSORS_PCF8591 is not set |
| 833 | # CONFIG_SENSORS_M41T00 is not set | 775 | # CONFIG_SENSORS_M41T00 is not set |
| 834 | # CONFIG_SENSORS_MAX6875 is not set | 776 | # CONFIG_SENSORS_MAX6875 is not set |
| 777 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 835 | # CONFIG_I2C_DEBUG_CORE is not set | 778 | # CONFIG_I2C_DEBUG_CORE is not set |
| 836 | # CONFIG_I2C_DEBUG_ALGO is not set | 779 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 837 | # CONFIG_I2C_DEBUG_BUS is not set | 780 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -855,14 +798,13 @@ CONFIG_SPI_MPC83xx=y | |||
| 855 | # | 798 | # |
| 856 | # CONFIG_SPI_AT25 is not set | 799 | # CONFIG_SPI_AT25 is not set |
| 857 | # CONFIG_SPI_SPIDEV is not set | 800 | # CONFIG_SPI_SPIDEV is not set |
| 858 | 801 | # CONFIG_SPI_TLE62X0 is not set | |
| 859 | # | ||
| 860 | # Dallas's 1-wire bus | ||
| 861 | # | ||
| 862 | # CONFIG_W1 is not set | 802 | # CONFIG_W1 is not set |
| 803 | # CONFIG_POWER_SUPPLY is not set | ||
| 863 | CONFIG_HWMON=y | 804 | CONFIG_HWMON=y |
| 864 | # CONFIG_HWMON_VID is not set | 805 | # CONFIG_HWMON_VID is not set |
| 865 | # CONFIG_SENSORS_ABITUGURU is not set | 806 | # CONFIG_SENSORS_ABITUGURU is not set |
| 807 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 866 | # CONFIG_SENSORS_AD7418 is not set | 808 | # CONFIG_SENSORS_AD7418 is not set |
| 867 | # CONFIG_SENSORS_ADM1021 is not set | 809 | # CONFIG_SENSORS_ADM1021 is not set |
| 868 | # CONFIG_SENSORS_ADM1025 is not set | 810 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -890,14 +832,17 @@ CONFIG_HWMON=y | |||
| 890 | # CONFIG_SENSORS_LM87 is not set | 832 | # CONFIG_SENSORS_LM87 is not set |
| 891 | # CONFIG_SENSORS_LM90 is not set | 833 | # CONFIG_SENSORS_LM90 is not set |
| 892 | # CONFIG_SENSORS_LM92 is not set | 834 | # CONFIG_SENSORS_LM92 is not set |
| 835 | # CONFIG_SENSORS_LM93 is not set | ||
| 893 | # CONFIG_SENSORS_MAX1619 is not set | 836 | # CONFIG_SENSORS_MAX1619 is not set |
| 894 | # CONFIG_SENSORS_MAX6650 is not set | 837 | # CONFIG_SENSORS_MAX6650 is not set |
| 895 | # CONFIG_SENSORS_PC87360 is not set | 838 | # CONFIG_SENSORS_PC87360 is not set |
| 896 | # CONFIG_SENSORS_PC87427 is not set | 839 | # CONFIG_SENSORS_PC87427 is not set |
| 897 | # CONFIG_SENSORS_SIS5595 is not set | 840 | # CONFIG_SENSORS_SIS5595 is not set |
| 841 | # CONFIG_SENSORS_DME1737 is not set | ||
| 898 | # CONFIG_SENSORS_SMSC47M1 is not set | 842 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 899 | # CONFIG_SENSORS_SMSC47M192 is not set | 843 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 900 | # CONFIG_SENSORS_SMSC47B397 is not set | 844 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 845 | # CONFIG_SENSORS_THMC50 is not set | ||
| 901 | # CONFIG_SENSORS_VIA686A is not set | 846 | # CONFIG_SENSORS_VIA686A is not set |
| 902 | # CONFIG_SENSORS_VT1211 is not set | 847 | # CONFIG_SENSORS_VT1211 is not set |
| 903 | # CONFIG_SENSORS_VT8231 is not set | 848 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -933,6 +878,7 @@ CONFIG_DAB=y | |||
| 933 | # | 878 | # |
| 934 | # CONFIG_DISPLAY_SUPPORT is not set | 879 | # CONFIG_DISPLAY_SUPPORT is not set |
| 935 | # CONFIG_VGASTATE is not set | 880 | # CONFIG_VGASTATE is not set |
| 881 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 936 | # CONFIG_FB is not set | 882 | # CONFIG_FB is not set |
| 937 | # CONFIG_FB_IBM_GXT4500 is not set | 883 | # CONFIG_FB_IBM_GXT4500 is not set |
| 938 | 884 | ||
| @@ -940,10 +886,7 @@ CONFIG_DAB=y | |||
| 940 | # Sound | 886 | # Sound |
| 941 | # | 887 | # |
| 942 | # CONFIG_SOUND is not set | 888 | # CONFIG_SOUND is not set |
| 943 | 889 | CONFIG_HID_SUPPORT=y | |
| 944 | # | ||
| 945 | # HID Devices | ||
| 946 | # | ||
| 947 | CONFIG_HID=y | 890 | CONFIG_HID=y |
| 948 | # CONFIG_HID_DEBUG is not set | 891 | # CONFIG_HID_DEBUG is not set |
| 949 | 892 | ||
| @@ -957,10 +900,7 @@ CONFIG_HID=y | |||
| 957 | # | 900 | # |
| 958 | # CONFIG_USB_KBD is not set | 901 | # CONFIG_USB_KBD is not set |
| 959 | # CONFIG_USB_MOUSE is not set | 902 | # CONFIG_USB_MOUSE is not set |
| 960 | 903 | CONFIG_USB_SUPPORT=y | |
| 961 | # | ||
| 962 | # USB support | ||
| 963 | # | ||
| 964 | CONFIG_USB_ARCH_HAS_HCD=y | 904 | CONFIG_USB_ARCH_HAS_HCD=y |
| 965 | CONFIG_USB_ARCH_HAS_OHCI=y | 905 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 966 | CONFIG_USB_ARCH_HAS_EHCI=y | 906 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -980,9 +920,9 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 980 | # | 920 | # |
| 981 | CONFIG_USB_EHCI_HCD=y | 921 | CONFIG_USB_EHCI_HCD=y |
| 982 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 922 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 983 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 923 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 984 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 924 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 985 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | 925 | CONFIG_USB_EHCI_FSL=y |
| 986 | # CONFIG_USB_ISP116X_HCD is not set | 926 | # CONFIG_USB_ISP116X_HCD is not set |
| 987 | CONFIG_USB_OHCI_HCD=y | 927 | CONFIG_USB_OHCI_HCD=y |
| 988 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 928 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -994,6 +934,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 994 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 934 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 995 | CONFIG_USB_UHCI_HCD=y | 935 | CONFIG_USB_UHCI_HCD=y |
| 996 | # CONFIG_USB_SL811_HCD is not set | 936 | # CONFIG_USB_SL811_HCD is not set |
| 937 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 997 | 938 | ||
| 998 | # | 939 | # |
| 999 | # USB Device Class drivers | 940 | # USB Device Class drivers |
| @@ -1069,15 +1010,19 @@ CONFIG_USB_MON=y | |||
| 1069 | # USB Gadget Support | 1010 | # USB Gadget Support |
| 1070 | # | 1011 | # |
| 1071 | CONFIG_USB_GADGET=y | 1012 | CONFIG_USB_GADGET=y |
| 1013 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 1072 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1014 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 1073 | CONFIG_USB_GADGET_SELECTED=y | 1015 | CONFIG_USB_GADGET_SELECTED=y |
| 1016 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 1074 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 1017 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
| 1075 | CONFIG_USB_GADGET_NET2280=y | 1018 | CONFIG_USB_GADGET_NET2280=y |
| 1076 | CONFIG_USB_NET2280=y | 1019 | CONFIG_USB_NET2280=y |
| 1077 | # CONFIG_USB_GADGET_PXA2XX is not set | 1020 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1021 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 1078 | # CONFIG_USB_GADGET_GOKU is not set | 1022 | # CONFIG_USB_GADGET_GOKU is not set |
| 1079 | # CONFIG_USB_GADGET_LH7A40X is not set | 1023 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1080 | # CONFIG_USB_GADGET_OMAP is not set | 1024 | # CONFIG_USB_GADGET_OMAP is not set |
| 1025 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 1081 | # CONFIG_USB_GADGET_AT91 is not set | 1026 | # CONFIG_USB_GADGET_AT91 is not set |
| 1082 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 1027 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
| 1083 | CONFIG_USB_GADGET_DUALSPEED=y | 1028 | CONFIG_USB_GADGET_DUALSPEED=y |
| @@ -1089,32 +1034,9 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1089 | # CONFIG_USB_G_SERIAL is not set | 1034 | # CONFIG_USB_G_SERIAL is not set |
| 1090 | # CONFIG_USB_MIDI_GADGET is not set | 1035 | # CONFIG_USB_MIDI_GADGET is not set |
| 1091 | # CONFIG_MMC is not set | 1036 | # CONFIG_MMC is not set |
| 1092 | |||
| 1093 | # | ||
| 1094 | # LED devices | ||
| 1095 | # | ||
| 1096 | # CONFIG_NEW_LEDS is not set | 1037 | # CONFIG_NEW_LEDS is not set |
| 1097 | |||
| 1098 | # | ||
| 1099 | # LED drivers | ||
| 1100 | # | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # LED Triggers | ||
| 1104 | # | ||
| 1105 | |||
| 1106 | # | ||
| 1107 | # InfiniBand support | ||
| 1108 | # | ||
| 1109 | # CONFIG_INFINIBAND is not set | 1038 | # CONFIG_INFINIBAND is not set |
| 1110 | 1039 | # CONFIG_EDAC is not set | |
| 1111 | # | ||
| 1112 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1113 | # | ||
| 1114 | |||
| 1115 | # | ||
| 1116 | # Real Time Clock | ||
| 1117 | # | ||
| 1118 | CONFIG_RTC_LIB=y | 1040 | CONFIG_RTC_LIB=y |
| 1119 | CONFIG_RTC_CLASS=y | 1041 | CONFIG_RTC_CLASS=y |
| 1120 | CONFIG_RTC_HCTOSYS=y | 1042 | CONFIG_RTC_HCTOSYS=y |
| @@ -1141,6 +1063,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1141 | # CONFIG_RTC_DRV_X1205 is not set | 1063 | # CONFIG_RTC_DRV_X1205 is not set |
| 1142 | # CONFIG_RTC_DRV_PCF8563 is not set | 1064 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1143 | # CONFIG_RTC_DRV_PCF8583 is not set | 1065 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1066 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1144 | 1067 | ||
| 1145 | # | 1068 | # |
| 1146 | # SPI RTC drivers | 1069 | # SPI RTC drivers |
| @@ -1151,9 +1074,12 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1151 | # | 1074 | # |
| 1152 | # Platform RTC drivers | 1075 | # Platform RTC drivers |
| 1153 | # | 1076 | # |
| 1077 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1154 | # CONFIG_RTC_DRV_DS1553 is not set | 1078 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1079 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1155 | # CONFIG_RTC_DRV_DS1742 is not set | 1080 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1156 | # CONFIG_RTC_DRV_M48T86 is not set | 1081 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1082 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1157 | # CONFIG_RTC_DRV_V3020 is not set | 1083 | # CONFIG_RTC_DRV_V3020 is not set |
| 1158 | 1084 | ||
| 1159 | # | 1085 | # |
| @@ -1176,6 +1102,11 @@ CONFIG_NET_DMA=y | |||
| 1176 | CONFIG_INTEL_IOATDMA=y | 1102 | CONFIG_INTEL_IOATDMA=y |
| 1177 | 1103 | ||
| 1178 | # | 1104 | # |
| 1105 | # Userspace I/O | ||
| 1106 | # | ||
| 1107 | # CONFIG_UIO is not set | ||
| 1108 | |||
| 1109 | # | ||
| 1179 | # File systems | 1110 | # File systems |
| 1180 | # | 1111 | # |
| 1181 | CONFIG_EXT2_FS=y | 1112 | CONFIG_EXT2_FS=y |
| @@ -1272,7 +1203,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 1272 | # CONFIG_NCP_FS is not set | 1203 | # CONFIG_NCP_FS is not set |
| 1273 | # CONFIG_CODA_FS is not set | 1204 | # CONFIG_CODA_FS is not set |
| 1274 | # CONFIG_AFS_FS is not set | 1205 | # CONFIG_AFS_FS is not set |
| 1275 | # CONFIG_9P_FS is not set | ||
| 1276 | 1206 | ||
| 1277 | # | 1207 | # |
| 1278 | # Partition Types | 1208 | # Partition Types |
| @@ -1315,6 +1245,7 @@ CONFIG_BITREVERSE=y | |||
| 1315 | # CONFIG_CRC16 is not set | 1245 | # CONFIG_CRC16 is not set |
| 1316 | # CONFIG_CRC_ITU_T is not set | 1246 | # CONFIG_CRC_ITU_T is not set |
| 1317 | CONFIG_CRC32=y | 1247 | CONFIG_CRC32=y |
| 1248 | # CONFIG_CRC7 is not set | ||
| 1318 | # CONFIG_LIBCRC32C is not set | 1249 | # CONFIG_LIBCRC32C is not set |
| 1319 | CONFIG_PLIST=y | 1250 | CONFIG_PLIST=y |
| 1320 | CONFIG_HAS_IOMEM=y | 1251 | CONFIG_HAS_IOMEM=y |
| @@ -1338,6 +1269,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1338 | CONFIG_DEBUG_KERNEL=y | 1269 | CONFIG_DEBUG_KERNEL=y |
| 1339 | # CONFIG_DEBUG_SHIRQ is not set | 1270 | # CONFIG_DEBUG_SHIRQ is not set |
| 1340 | CONFIG_DETECT_SOFTLOCKUP=y | 1271 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1272 | CONFIG_SCHED_DEBUG=y | ||
| 1341 | # CONFIG_SCHEDSTATS is not set | 1273 | # CONFIG_SCHEDSTATS is not set |
| 1342 | # CONFIG_TIMER_STATS is not set | 1274 | # CONFIG_TIMER_STATS is not set |
| 1343 | # CONFIG_DEBUG_SLAB is not set | 1275 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1360,7 +1292,6 @@ CONFIG_FORCED_INLINING=y | |||
| 1360 | # CONFIG_DEBUG_PAGEALLOC is not set | 1292 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1361 | # CONFIG_DEBUGGER is not set | 1293 | # CONFIG_DEBUGGER is not set |
| 1362 | # CONFIG_BDI_SWITCH is not set | 1294 | # CONFIG_BDI_SWITCH is not set |
| 1363 | # CONFIG_BOOTX_TEXT is not set | ||
| 1364 | # CONFIG_PPC_EARLY_DEBUG is not set | 1295 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1365 | 1296 | ||
| 1366 | # | 1297 | # |
| @@ -1368,10 +1299,6 @@ CONFIG_FORCED_INLINING=y | |||
| 1368 | # | 1299 | # |
| 1369 | # CONFIG_KEYS is not set | 1300 | # CONFIG_KEYS is not set |
| 1370 | # CONFIG_SECURITY is not set | 1301 | # CONFIG_SECURITY is not set |
| 1371 | |||
| 1372 | # | ||
| 1373 | # Cryptographic options | ||
| 1374 | # | ||
| 1375 | CONFIG_CRYPTO=y | 1302 | CONFIG_CRYPTO=y |
| 1376 | CONFIG_CRYPTO_ALGAPI=y | 1303 | CONFIG_CRYPTO_ALGAPI=y |
| 1377 | CONFIG_CRYPTO_BLKCIPHER=y | 1304 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1409,7 +1336,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1409 | # CONFIG_CRYPTO_CRC32C is not set | 1336 | # CONFIG_CRYPTO_CRC32C is not set |
| 1410 | # CONFIG_CRYPTO_CAMELLIA is not set | 1337 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1411 | # CONFIG_CRYPTO_TEST is not set | 1338 | # CONFIG_CRYPTO_TEST is not set |
| 1412 | 1339 | CONFIG_CRYPTO_HW=y | |
| 1413 | # | ||
| 1414 | # Hardware crypto devices | ||
| 1415 | # | ||
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig index 75ce78139a11..fc6695302cc8 100644 --- a/arch/powerpc/configs/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/mpc832x_mds_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:55 2007 | 4 | # Tue Aug 28 21:24:40 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -159,6 +150,7 @@ CONFIG_PPC_MPC832x=y | |||
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | CONFIG_QUICC_ENGINE=y | 151 | CONFIG_QUICC_ENGINE=y |
| 161 | # CONFIG_CPM2 is not set | 152 | # CONFIG_CPM2 is not set |
| 153 | # CONFIG_FSL_ULI1575 is not set | ||
| 162 | 154 | ||
| 163 | # | 155 | # |
| 164 | # Kernel options | 156 | # Kernel options |
| @@ -188,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 180 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 189 | # CONFIG_RESOURCES_64BIT is not set | 181 | # CONFIG_RESOURCES_64BIT is not set |
| 190 | CONFIG_ZONE_DMA_FLAG=1 | 182 | CONFIG_ZONE_DMA_FLAG=1 |
| 183 | CONFIG_BOUNCE=y | ||
| 184 | CONFIG_VIRT_TO_BUS=y | ||
| 191 | CONFIG_PROC_DEVICETREE=y | 185 | CONFIG_PROC_DEVICETREE=y |
| 192 | # CONFIG_CMDLINE_BOOL is not set | 186 | # CONFIG_CMDLINE_BOOL is not set |
| 193 | # CONFIG_PM is not set | 187 | # CONFIG_PM is not set |
| @@ -202,10 +196,10 @@ CONFIG_ISA_DMA_API=y | |||
| 202 | CONFIG_ZONE_DMA=y | 196 | CONFIG_ZONE_DMA=y |
| 203 | CONFIG_GENERIC_ISA_DMA=y | 197 | CONFIG_GENERIC_ISA_DMA=y |
| 204 | CONFIG_PPC_INDIRECT_PCI=y | 198 | CONFIG_PPC_INDIRECT_PCI=y |
| 205 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 206 | CONFIG_FSL_SOC=y | 199 | CONFIG_FSL_SOC=y |
| 207 | CONFIG_PCI=y | 200 | CONFIG_PCI=y |
| 208 | CONFIG_PCI_DOMAINS=y | 201 | CONFIG_PCI_DOMAINS=y |
| 202 | CONFIG_PCI_SYSCALL=y | ||
| 209 | # CONFIG_PCIEPORTBUS is not set | 203 | # CONFIG_PCIEPORTBUS is not set |
| 210 | CONFIG_ARCH_SUPPORTS_MSI=y | 204 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 211 | # CONFIG_PCI_MSI is not set | 205 | # CONFIG_PCI_MSI is not set |
| @@ -315,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 315 | # CONFIG_MAC80211 is not set | 309 | # CONFIG_MAC80211 is not set |
| 316 | # CONFIG_IEEE80211 is not set | 310 | # CONFIG_IEEE80211 is not set |
| 317 | # CONFIG_RFKILL is not set | 311 | # CONFIG_RFKILL is not set |
| 312 | # CONFIG_NET_9P is not set | ||
| 318 | 313 | ||
| 319 | # | 314 | # |
| 320 | # Device Drivers | 315 | # Device Drivers |
| @@ -327,26 +322,11 @@ CONFIG_STANDALONE=y | |||
| 327 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 322 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 328 | # CONFIG_FW_LOADER is not set | 323 | # CONFIG_FW_LOADER is not set |
| 329 | # CONFIG_SYS_HYPERVISOR is not set | 324 | # CONFIG_SYS_HYPERVISOR is not set |
| 330 | |||
| 331 | # | ||
| 332 | # Connector - unified userspace <-> kernelspace linker | ||
| 333 | # | ||
| 334 | # CONFIG_CONNECTOR is not set | 325 | # CONFIG_CONNECTOR is not set |
| 335 | # CONFIG_MTD is not set | 326 | # CONFIG_MTD is not set |
| 336 | 327 | CONFIG_OF_DEVICE=y | |
| 337 | # | ||
| 338 | # Parallel port support | ||
| 339 | # | ||
| 340 | # CONFIG_PARPORT is not set | 328 | # CONFIG_PARPORT is not set |
| 341 | 329 | CONFIG_BLK_DEV=y | |
| 342 | # | ||
| 343 | # Plug and Play support | ||
| 344 | # | ||
| 345 | # CONFIG_PNPACPI is not set | ||
| 346 | |||
| 347 | # | ||
| 348 | # Block devices | ||
| 349 | # | ||
| 350 | # CONFIG_BLK_DEV_FD is not set | 330 | # CONFIG_BLK_DEV_FD is not set |
| 351 | # CONFIG_BLK_CPQ_DA is not set | 331 | # CONFIG_BLK_CPQ_DA is not set |
| 352 | # CONFIG_BLK_CPQ_CISS_DA is not set | 332 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -363,14 +343,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 363 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 343 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 364 | # CONFIG_CDROM_PKTCDVD is not set | 344 | # CONFIG_CDROM_PKTCDVD is not set |
| 365 | # CONFIG_ATA_OVER_ETH is not set | 345 | # CONFIG_ATA_OVER_ETH is not set |
| 366 | 346 | CONFIG_MISC_DEVICES=y | |
| 367 | # | ||
| 368 | # Misc devices | ||
| 369 | # | ||
| 370 | # CONFIG_PHANTOM is not set | 347 | # CONFIG_PHANTOM is not set |
| 348 | # CONFIG_EEPROM_93CX6 is not set | ||
| 371 | # CONFIG_SGI_IOC4 is not set | 349 | # CONFIG_SGI_IOC4 is not set |
| 372 | # CONFIG_TIFM_CORE is not set | 350 | # CONFIG_TIFM_CORE is not set |
| 373 | # CONFIG_BLINK is not set | ||
| 374 | # CONFIG_IDE is not set | 351 | # CONFIG_IDE is not set |
| 375 | 352 | ||
| 376 | # | 353 | # |
| @@ -378,6 +355,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 378 | # | 355 | # |
| 379 | # CONFIG_RAID_ATTRS is not set | 356 | # CONFIG_RAID_ATTRS is not set |
| 380 | CONFIG_SCSI=y | 357 | CONFIG_SCSI=y |
| 358 | CONFIG_SCSI_DMA=y | ||
| 381 | # CONFIG_SCSI_TGT is not set | 359 | # CONFIG_SCSI_TGT is not set |
| 382 | # CONFIG_SCSI_NETLINK is not set | 360 | # CONFIG_SCSI_NETLINK is not set |
| 383 | CONFIG_SCSI_PROC_FS=y | 361 | CONFIG_SCSI_PROC_FS=y |
| @@ -407,12 +385,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 407 | # CONFIG_SCSI_SPI_ATTRS is not set | 385 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 408 | # CONFIG_SCSI_FC_ATTRS is not set | 386 | # CONFIG_SCSI_FC_ATTRS is not set |
| 409 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 387 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 410 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 411 | # CONFIG_SCSI_SAS_LIBSAS is not set | 388 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 412 | 389 | CONFIG_SCSI_LOWLEVEL=y | |
| 413 | # | ||
| 414 | # SCSI low-level drivers | ||
| 415 | # | ||
| 416 | # CONFIG_ISCSI_TCP is not set | 390 | # CONFIG_ISCSI_TCP is not set |
| 417 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 391 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 418 | # CONFIG_SCSI_3W_9XXX is not set | 392 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -448,10 +422,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 448 | # CONFIG_SCSI_DEBUG is not set | 422 | # CONFIG_SCSI_DEBUG is not set |
| 449 | # CONFIG_SCSI_SRP is not set | 423 | # CONFIG_SCSI_SRP is not set |
| 450 | # CONFIG_ATA is not set | 424 | # CONFIG_ATA is not set |
| 451 | |||
| 452 | # | ||
| 453 | # Multi-device support (RAID and LVM) | ||
| 454 | # | ||
| 455 | # CONFIG_MD is not set | 425 | # CONFIG_MD is not set |
| 456 | 426 | ||
| 457 | # | 427 | # |
| @@ -467,19 +437,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 467 | # | 437 | # |
| 468 | # CONFIG_FIREWIRE is not set | 438 | # CONFIG_FIREWIRE is not set |
| 469 | # CONFIG_IEEE1394 is not set | 439 | # CONFIG_IEEE1394 is not set |
| 470 | |||
| 471 | # | ||
| 472 | # I2O device support | ||
| 473 | # | ||
| 474 | # CONFIG_I2O is not set | 440 | # CONFIG_I2O is not set |
| 475 | # CONFIG_MACINTOSH_DRIVERS is not set | 441 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 476 | |||
| 477 | # | ||
| 478 | # Network device support | ||
| 479 | # | ||
| 480 | CONFIG_NETDEVICES=y | 442 | CONFIG_NETDEVICES=y |
| 443 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 481 | # CONFIG_DUMMY is not set | 444 | # CONFIG_DUMMY is not set |
| 482 | # CONFIG_BONDING is not set | 445 | # CONFIG_BONDING is not set |
| 446 | # CONFIG_MACVLAN is not set | ||
| 483 | # CONFIG_EQUALIZER is not set | 447 | # CONFIG_EQUALIZER is not set |
| 484 | # CONFIG_TUN is not set | 448 | # CONFIG_TUN is not set |
| 485 | # CONFIG_ARCNET is not set | 449 | # CONFIG_ARCNET is not set |
| @@ -496,21 +460,14 @@ CONFIG_DAVICOM_PHY=y | |||
| 496 | # CONFIG_VITESSE_PHY is not set | 460 | # CONFIG_VITESSE_PHY is not set |
| 497 | # CONFIG_SMSC_PHY is not set | 461 | # CONFIG_SMSC_PHY is not set |
| 498 | # CONFIG_BROADCOM_PHY is not set | 462 | # CONFIG_BROADCOM_PHY is not set |
| 463 | # CONFIG_ICPLUS_PHY is not set | ||
| 499 | # CONFIG_FIXED_PHY is not set | 464 | # CONFIG_FIXED_PHY is not set |
| 500 | |||
| 501 | # | ||
| 502 | # Ethernet (10 or 100Mbit) | ||
| 503 | # | ||
| 504 | CONFIG_NET_ETHERNET=y | 465 | CONFIG_NET_ETHERNET=y |
| 505 | CONFIG_MII=y | 466 | CONFIG_MII=y |
| 506 | # CONFIG_HAPPYMEAL is not set | 467 | # CONFIG_HAPPYMEAL is not set |
| 507 | # CONFIG_SUNGEM is not set | 468 | # CONFIG_SUNGEM is not set |
| 508 | # CONFIG_CASSINI is not set | 469 | # CONFIG_CASSINI is not set |
| 509 | # CONFIG_NET_VENDOR_3COM is not set | 470 | # CONFIG_NET_VENDOR_3COM is not set |
| 510 | |||
| 511 | # | ||
| 512 | # Tulip family network device support | ||
| 513 | # | ||
| 514 | # CONFIG_NET_TULIP is not set | 471 | # CONFIG_NET_TULIP is not set |
| 515 | # CONFIG_HP100 is not set | 472 | # CONFIG_HP100 is not set |
| 516 | # CONFIG_NET_PCI is not set | 473 | # CONFIG_NET_PCI is not set |
| @@ -525,7 +482,6 @@ CONFIG_NETDEV_1000=y | |||
| 525 | # CONFIG_SIS190 is not set | 482 | # CONFIG_SIS190 is not set |
| 526 | # CONFIG_SKGE is not set | 483 | # CONFIG_SKGE is not set |
| 527 | # CONFIG_SKY2 is not set | 484 | # CONFIG_SKY2 is not set |
| 528 | # CONFIG_SK98LIN is not set | ||
| 529 | # CONFIG_VIA_VELOCITY is not set | 485 | # CONFIG_VIA_VELOCITY is not set |
| 530 | # CONFIG_TIGON3 is not set | 486 | # CONFIG_TIGON3 is not set |
| 531 | # CONFIG_BNX2 is not set | 487 | # CONFIG_BNX2 is not set |
| @@ -562,15 +518,7 @@ CONFIG_NETDEV_10000=y | |||
| 562 | # CONFIG_NETCONSOLE is not set | 518 | # CONFIG_NETCONSOLE is not set |
| 563 | # CONFIG_NETPOLL is not set | 519 | # CONFIG_NETPOLL is not set |
| 564 | # CONFIG_NET_POLL_CONTROLLER is not set | 520 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 565 | |||
| 566 | # | ||
| 567 | # ISDN subsystem | ||
| 568 | # | ||
| 569 | # CONFIG_ISDN is not set | 521 | # CONFIG_ISDN is not set |
| 570 | |||
| 571 | # | ||
| 572 | # Telephony Support | ||
| 573 | # | ||
| 574 | # CONFIG_PHONE is not set | 522 | # CONFIG_PHONE is not set |
| 575 | 523 | ||
| 576 | # | 524 | # |
| @@ -632,10 +580,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 632 | CONFIG_UNIX98_PTYS=y | 580 | CONFIG_UNIX98_PTYS=y |
| 633 | CONFIG_LEGACY_PTYS=y | 581 | CONFIG_LEGACY_PTYS=y |
| 634 | CONFIG_LEGACY_PTY_COUNT=256 | 582 | CONFIG_LEGACY_PTY_COUNT=256 |
| 635 | |||
| 636 | # | ||
| 637 | # IPMI | ||
| 638 | # | ||
| 639 | # CONFIG_IPMI_HANDLER is not set | 583 | # CONFIG_IPMI_HANDLER is not set |
| 640 | CONFIG_WATCHDOG=y | 584 | CONFIG_WATCHDOG=y |
| 641 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 585 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -660,10 +604,6 @@ CONFIG_GEN_RTC=y | |||
| 660 | # CONFIG_AGP is not set | 604 | # CONFIG_AGP is not set |
| 661 | # CONFIG_DRM is not set | 605 | # CONFIG_DRM is not set |
| 662 | # CONFIG_RAW_DRIVER is not set | 606 | # CONFIG_RAW_DRIVER is not set |
| 663 | |||
| 664 | # | ||
| 665 | # TPM devices | ||
| 666 | # | ||
| 667 | # CONFIG_TCG_TPM is not set | 607 | # CONFIG_TCG_TPM is not set |
| 668 | CONFIG_DEVPORT=y | 608 | CONFIG_DEVPORT=y |
| 669 | CONFIG_I2C=y | 609 | CONFIG_I2C=y |
| @@ -698,6 +638,7 @@ CONFIG_I2C_MPC=y | |||
| 698 | # CONFIG_I2C_SIS5595 is not set | 638 | # CONFIG_I2C_SIS5595 is not set |
| 699 | # CONFIG_I2C_SIS630 is not set | 639 | # CONFIG_I2C_SIS630 is not set |
| 700 | # CONFIG_I2C_SIS96X is not set | 640 | # CONFIG_I2C_SIS96X is not set |
| 641 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 701 | # CONFIG_I2C_STUB is not set | 642 | # CONFIG_I2C_STUB is not set |
| 702 | # CONFIG_I2C_VIA is not set | 643 | # CONFIG_I2C_VIA is not set |
| 703 | # CONFIG_I2C_VIAPRO is not set | 644 | # CONFIG_I2C_VIAPRO is not set |
| @@ -708,12 +649,14 @@ CONFIG_I2C_MPC=y | |||
| 708 | # | 649 | # |
| 709 | # CONFIG_SENSORS_DS1337 is not set | 650 | # CONFIG_SENSORS_DS1337 is not set |
| 710 | # CONFIG_SENSORS_DS1374 is not set | 651 | # CONFIG_SENSORS_DS1374 is not set |
| 652 | # CONFIG_DS1682 is not set | ||
| 711 | # CONFIG_SENSORS_EEPROM is not set | 653 | # CONFIG_SENSORS_EEPROM is not set |
| 712 | # CONFIG_SENSORS_PCF8574 is not set | 654 | # CONFIG_SENSORS_PCF8574 is not set |
| 713 | # CONFIG_SENSORS_PCA9539 is not set | 655 | # CONFIG_SENSORS_PCA9539 is not set |
| 714 | # CONFIG_SENSORS_PCF8591 is not set | 656 | # CONFIG_SENSORS_PCF8591 is not set |
| 715 | # CONFIG_SENSORS_M41T00 is not set | 657 | # CONFIG_SENSORS_M41T00 is not set |
| 716 | # CONFIG_SENSORS_MAX6875 is not set | 658 | # CONFIG_SENSORS_MAX6875 is not set |
| 659 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 717 | # CONFIG_I2C_DEBUG_CORE is not set | 660 | # CONFIG_I2C_DEBUG_CORE is not set |
| 718 | # CONFIG_I2C_DEBUG_ALGO is not set | 661 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 719 | # CONFIG_I2C_DEBUG_BUS is not set | 662 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -724,14 +667,12 @@ CONFIG_I2C_MPC=y | |||
| 724 | # | 667 | # |
| 725 | # CONFIG_SPI is not set | 668 | # CONFIG_SPI is not set |
| 726 | # CONFIG_SPI_MASTER is not set | 669 | # CONFIG_SPI_MASTER is not set |
| 727 | |||
| 728 | # | ||
| 729 | # Dallas's 1-wire bus | ||
| 730 | # | ||
| 731 | # CONFIG_W1 is not set | 670 | # CONFIG_W1 is not set |
| 671 | # CONFIG_POWER_SUPPLY is not set | ||
| 732 | CONFIG_HWMON=y | 672 | CONFIG_HWMON=y |
| 733 | # CONFIG_HWMON_VID is not set | 673 | # CONFIG_HWMON_VID is not set |
| 734 | # CONFIG_SENSORS_ABITUGURU is not set | 674 | # CONFIG_SENSORS_ABITUGURU is not set |
| 675 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 735 | # CONFIG_SENSORS_AD7418 is not set | 676 | # CONFIG_SENSORS_AD7418 is not set |
| 736 | # CONFIG_SENSORS_ADM1021 is not set | 677 | # CONFIG_SENSORS_ADM1021 is not set |
| 737 | # CONFIG_SENSORS_ADM1025 is not set | 678 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -758,14 +699,17 @@ CONFIG_HWMON=y | |||
| 758 | # CONFIG_SENSORS_LM87 is not set | 699 | # CONFIG_SENSORS_LM87 is not set |
| 759 | # CONFIG_SENSORS_LM90 is not set | 700 | # CONFIG_SENSORS_LM90 is not set |
| 760 | # CONFIG_SENSORS_LM92 is not set | 701 | # CONFIG_SENSORS_LM92 is not set |
| 702 | # CONFIG_SENSORS_LM93 is not set | ||
| 761 | # CONFIG_SENSORS_MAX1619 is not set | 703 | # CONFIG_SENSORS_MAX1619 is not set |
| 762 | # CONFIG_SENSORS_MAX6650 is not set | 704 | # CONFIG_SENSORS_MAX6650 is not set |
| 763 | # CONFIG_SENSORS_PC87360 is not set | 705 | # CONFIG_SENSORS_PC87360 is not set |
| 764 | # CONFIG_SENSORS_PC87427 is not set | 706 | # CONFIG_SENSORS_PC87427 is not set |
| 765 | # CONFIG_SENSORS_SIS5595 is not set | 707 | # CONFIG_SENSORS_SIS5595 is not set |
| 708 | # CONFIG_SENSORS_DME1737 is not set | ||
| 766 | # CONFIG_SENSORS_SMSC47M1 is not set | 709 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 767 | # CONFIG_SENSORS_SMSC47M192 is not set | 710 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 768 | # CONFIG_SENSORS_SMSC47B397 is not set | 711 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 712 | # CONFIG_SENSORS_THMC50 is not set | ||
| 769 | # CONFIG_SENSORS_VIA686A is not set | 713 | # CONFIG_SENSORS_VIA686A is not set |
| 770 | # CONFIG_SENSORS_VT1211 is not set | 714 | # CONFIG_SENSORS_VT1211 is not set |
| 771 | # CONFIG_SENSORS_VT8231 is not set | 715 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -800,6 +744,7 @@ CONFIG_DAB=y | |||
| 800 | # | 744 | # |
| 801 | # CONFIG_DISPLAY_SUPPORT is not set | 745 | # CONFIG_DISPLAY_SUPPORT is not set |
| 802 | # CONFIG_VGASTATE is not set | 746 | # CONFIG_VGASTATE is not set |
| 747 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 803 | # CONFIG_FB is not set | 748 | # CONFIG_FB is not set |
| 804 | # CONFIG_FB_IBM_GXT4500 is not set | 749 | # CONFIG_FB_IBM_GXT4500 is not set |
| 805 | 750 | ||
| @@ -807,16 +752,10 @@ CONFIG_DAB=y | |||
| 807 | # Sound | 752 | # Sound |
| 808 | # | 753 | # |
| 809 | # CONFIG_SOUND is not set | 754 | # CONFIG_SOUND is not set |
| 810 | 755 | CONFIG_HID_SUPPORT=y | |
| 811 | # | ||
| 812 | # HID Devices | ||
| 813 | # | ||
| 814 | CONFIG_HID=y | 756 | CONFIG_HID=y |
| 815 | # CONFIG_HID_DEBUG is not set | 757 | # CONFIG_HID_DEBUG is not set |
| 816 | 758 | CONFIG_USB_SUPPORT=y | |
| 817 | # | ||
| 818 | # USB support | ||
| 819 | # | ||
| 820 | CONFIG_USB_ARCH_HAS_HCD=y | 759 | CONFIG_USB_ARCH_HAS_HCD=y |
| 821 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 822 | CONFIG_USB_ARCH_HAS_EHCI=y | 761 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -831,32 +770,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 831 | # | 770 | # |
| 832 | # CONFIG_USB_GADGET is not set | 771 | # CONFIG_USB_GADGET is not set |
| 833 | # CONFIG_MMC is not set | 772 | # CONFIG_MMC is not set |
| 834 | |||
| 835 | # | ||
| 836 | # LED devices | ||
| 837 | # | ||
| 838 | # CONFIG_NEW_LEDS is not set | 773 | # CONFIG_NEW_LEDS is not set |
| 839 | |||
| 840 | # | ||
| 841 | # LED drivers | ||
| 842 | # | ||
| 843 | |||
| 844 | # | ||
| 845 | # LED Triggers | ||
| 846 | # | ||
| 847 | |||
| 848 | # | ||
| 849 | # InfiniBand support | ||
| 850 | # | ||
| 851 | # CONFIG_INFINIBAND is not set | 774 | # CONFIG_INFINIBAND is not set |
| 852 | 775 | # CONFIG_EDAC is not set | |
| 853 | # | ||
| 854 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 855 | # | ||
| 856 | |||
| 857 | # | ||
| 858 | # Real Time Clock | ||
| 859 | # | ||
| 860 | # CONFIG_RTC_CLASS is not set | 776 | # CONFIG_RTC_CLASS is not set |
| 861 | 777 | ||
| 862 | # | 778 | # |
| @@ -873,6 +789,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 873 | # | 789 | # |
| 874 | 790 | ||
| 875 | # | 791 | # |
| 792 | # Userspace I/O | ||
| 793 | # | ||
| 794 | # CONFIG_UIO is not set | ||
| 795 | |||
| 796 | # | ||
| 876 | # File systems | 797 | # File systems |
| 877 | # | 798 | # |
| 878 | CONFIG_EXT2_FS=y | 799 | CONFIG_EXT2_FS=y |
| @@ -968,7 +889,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 968 | # CONFIG_NCP_FS is not set | 889 | # CONFIG_NCP_FS is not set |
| 969 | # CONFIG_CODA_FS is not set | 890 | # CONFIG_CODA_FS is not set |
| 970 | # CONFIG_AFS_FS is not set | 891 | # CONFIG_AFS_FS is not set |
| 971 | # CONFIG_9P_FS is not set | ||
| 972 | 892 | ||
| 973 | # | 893 | # |
| 974 | # Partition Types | 894 | # Partition Types |
| @@ -1009,6 +929,7 @@ CONFIG_BITREVERSE=y | |||
| 1009 | # CONFIG_CRC16 is not set | 929 | # CONFIG_CRC16 is not set |
| 1010 | # CONFIG_CRC_ITU_T is not set | 930 | # CONFIG_CRC_ITU_T is not set |
| 1011 | CONFIG_CRC32=y | 931 | CONFIG_CRC32=y |
| 932 | # CONFIG_CRC7 is not set | ||
| 1012 | # CONFIG_LIBCRC32C is not set | 933 | # CONFIG_LIBCRC32C is not set |
| 1013 | CONFIG_PLIST=y | 934 | CONFIG_PLIST=y |
| 1014 | CONFIG_HAS_IOMEM=y | 935 | CONFIG_HAS_IOMEM=y |
| @@ -1031,7 +952,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1031 | # CONFIG_HEADERS_CHECK is not set | 952 | # CONFIG_HEADERS_CHECK is not set |
| 1032 | # CONFIG_DEBUG_KERNEL is not set | 953 | # CONFIG_DEBUG_KERNEL is not set |
| 1033 | # CONFIG_DEBUG_BUGVERBOSE is not set | 954 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1034 | # CONFIG_BOOTX_TEXT is not set | ||
| 1035 | # CONFIG_PPC_EARLY_DEBUG is not set | 955 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1036 | 956 | ||
| 1037 | # | 957 | # |
| @@ -1039,10 +959,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1039 | # | 959 | # |
| 1040 | # CONFIG_KEYS is not set | 960 | # CONFIG_KEYS is not set |
| 1041 | # CONFIG_SECURITY is not set | 961 | # CONFIG_SECURITY is not set |
| 1042 | |||
| 1043 | # | ||
| 1044 | # Cryptographic options | ||
| 1045 | # | ||
| 1046 | CONFIG_CRYPTO=y | 962 | CONFIG_CRYPTO=y |
| 1047 | CONFIG_CRYPTO_ALGAPI=y | 963 | CONFIG_CRYPTO_ALGAPI=y |
| 1048 | CONFIG_CRYPTO_BLKCIPHER=y | 964 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1080,7 +996,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1080 | # CONFIG_CRYPTO_CRC32C is not set | 996 | # CONFIG_CRYPTO_CRC32C is not set |
| 1081 | # CONFIG_CRYPTO_CAMELLIA is not set | 997 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1082 | # CONFIG_CRYPTO_TEST is not set | 998 | # CONFIG_CRYPTO_TEST is not set |
| 1083 | 999 | CONFIG_CRYPTO_HW=y | |
| 1084 | # | ||
| 1085 | # Hardware crypto devices | ||
| 1086 | # | ||
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig index 6a83b66dd99e..6d1c3e842051 100644 --- a/arch/powerpc/configs/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/mpc832x_rdb_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:56 2007 | 4 | # Tue Aug 28 21:27:19 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -159,6 +150,7 @@ CONFIG_PPC_MPC832x=y | |||
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | CONFIG_QUICC_ENGINE=y | 151 | CONFIG_QUICC_ENGINE=y |
| 161 | # CONFIG_CPM2 is not set | 152 | # CONFIG_CPM2 is not set |
| 153 | # CONFIG_FSL_ULI1575 is not set | ||
| 162 | 154 | ||
| 163 | # | 155 | # |
| 164 | # Kernel options | 156 | # Kernel options |
| @@ -188,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 180 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 189 | # CONFIG_RESOURCES_64BIT is not set | 181 | # CONFIG_RESOURCES_64BIT is not set |
| 190 | CONFIG_ZONE_DMA_FLAG=1 | 182 | CONFIG_ZONE_DMA_FLAG=1 |
| 183 | CONFIG_BOUNCE=y | ||
| 184 | CONFIG_VIRT_TO_BUS=y | ||
| 191 | CONFIG_PROC_DEVICETREE=y | 185 | CONFIG_PROC_DEVICETREE=y |
| 192 | # CONFIG_CMDLINE_BOOL is not set | 186 | # CONFIG_CMDLINE_BOOL is not set |
| 193 | # CONFIG_PM is not set | 187 | # CONFIG_PM is not set |
| @@ -202,10 +196,10 @@ CONFIG_ISA_DMA_API=y | |||
| 202 | CONFIG_ZONE_DMA=y | 196 | CONFIG_ZONE_DMA=y |
| 203 | CONFIG_GENERIC_ISA_DMA=y | 197 | CONFIG_GENERIC_ISA_DMA=y |
| 204 | CONFIG_PPC_INDIRECT_PCI=y | 198 | CONFIG_PPC_INDIRECT_PCI=y |
| 205 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 206 | CONFIG_FSL_SOC=y | 199 | CONFIG_FSL_SOC=y |
| 207 | CONFIG_PCI=y | 200 | CONFIG_PCI=y |
| 208 | CONFIG_PCI_DOMAINS=y | 201 | CONFIG_PCI_DOMAINS=y |
| 202 | CONFIG_PCI_SYSCALL=y | ||
| 209 | # CONFIG_PCIEPORTBUS is not set | 203 | # CONFIG_PCIEPORTBUS is not set |
| 210 | CONFIG_ARCH_SUPPORTS_MSI=y | 204 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 211 | # CONFIG_PCI_MSI is not set | 205 | # CONFIG_PCI_MSI is not set |
| @@ -315,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 315 | # CONFIG_MAC80211 is not set | 309 | # CONFIG_MAC80211 is not set |
| 316 | # CONFIG_IEEE80211 is not set | 310 | # CONFIG_IEEE80211 is not set |
| 317 | # CONFIG_RFKILL is not set | 311 | # CONFIG_RFKILL is not set |
| 312 | # CONFIG_NET_9P is not set | ||
| 318 | 313 | ||
| 319 | # | 314 | # |
| 320 | # Device Drivers | 315 | # Device Drivers |
| @@ -327,26 +322,11 @@ CONFIG_STANDALONE=y | |||
| 327 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 322 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 328 | # CONFIG_FW_LOADER is not set | 323 | # CONFIG_FW_LOADER is not set |
| 329 | # CONFIG_SYS_HYPERVISOR is not set | 324 | # CONFIG_SYS_HYPERVISOR is not set |
| 330 | |||
| 331 | # | ||
| 332 | # Connector - unified userspace <-> kernelspace linker | ||
| 333 | # | ||
| 334 | # CONFIG_CONNECTOR is not set | 325 | # CONFIG_CONNECTOR is not set |
| 335 | # CONFIG_MTD is not set | 326 | # CONFIG_MTD is not set |
| 336 | 327 | CONFIG_OF_DEVICE=y | |
| 337 | # | ||
| 338 | # Parallel port support | ||
| 339 | # | ||
| 340 | # CONFIG_PARPORT is not set | 328 | # CONFIG_PARPORT is not set |
| 341 | 329 | CONFIG_BLK_DEV=y | |
| 342 | # | ||
| 343 | # Plug and Play support | ||
| 344 | # | ||
| 345 | # CONFIG_PNPACPI is not set | ||
| 346 | |||
| 347 | # | ||
| 348 | # Block devices | ||
| 349 | # | ||
| 350 | # CONFIG_BLK_DEV_FD is not set | 330 | # CONFIG_BLK_DEV_FD is not set |
| 351 | # CONFIG_BLK_CPQ_DA is not set | 331 | # CONFIG_BLK_CPQ_DA is not set |
| 352 | # CONFIG_BLK_CPQ_CISS_DA is not set | 332 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -364,14 +344,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 364 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 344 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 365 | # CONFIG_CDROM_PKTCDVD is not set | 345 | # CONFIG_CDROM_PKTCDVD is not set |
| 366 | # CONFIG_ATA_OVER_ETH is not set | 346 | # CONFIG_ATA_OVER_ETH is not set |
| 367 | 347 | CONFIG_MISC_DEVICES=y | |
| 368 | # | ||
| 369 | # Misc devices | ||
| 370 | # | ||
| 371 | # CONFIG_PHANTOM is not set | 348 | # CONFIG_PHANTOM is not set |
| 349 | # CONFIG_EEPROM_93CX6 is not set | ||
| 372 | # CONFIG_SGI_IOC4 is not set | 350 | # CONFIG_SGI_IOC4 is not set |
| 373 | # CONFIG_TIFM_CORE is not set | 351 | # CONFIG_TIFM_CORE is not set |
| 374 | # CONFIG_BLINK is not set | ||
| 375 | # CONFIG_IDE is not set | 352 | # CONFIG_IDE is not set |
| 376 | 353 | ||
| 377 | # | 354 | # |
| @@ -379,6 +356,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 379 | # | 356 | # |
| 380 | # CONFIG_RAID_ATTRS is not set | 357 | # CONFIG_RAID_ATTRS is not set |
| 381 | CONFIG_SCSI=y | 358 | CONFIG_SCSI=y |
| 359 | CONFIG_SCSI_DMA=y | ||
| 382 | # CONFIG_SCSI_TGT is not set | 360 | # CONFIG_SCSI_TGT is not set |
| 383 | # CONFIG_SCSI_NETLINK is not set | 361 | # CONFIG_SCSI_NETLINK is not set |
| 384 | CONFIG_SCSI_PROC_FS=y | 362 | CONFIG_SCSI_PROC_FS=y |
| @@ -408,12 +386,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 408 | # CONFIG_SCSI_SPI_ATTRS is not set | 386 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 409 | # CONFIG_SCSI_FC_ATTRS is not set | 387 | # CONFIG_SCSI_FC_ATTRS is not set |
| 410 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 388 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 411 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 412 | # CONFIG_SCSI_SAS_LIBSAS is not set | 389 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 413 | 390 | CONFIG_SCSI_LOWLEVEL=y | |
| 414 | # | ||
| 415 | # SCSI low-level drivers | ||
| 416 | # | ||
| 417 | # CONFIG_ISCSI_TCP is not set | 391 | # CONFIG_ISCSI_TCP is not set |
| 418 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 392 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 419 | # CONFIG_SCSI_3W_9XXX is not set | 393 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -449,10 +423,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 449 | # CONFIG_SCSI_DEBUG is not set | 423 | # CONFIG_SCSI_DEBUG is not set |
| 450 | # CONFIG_SCSI_SRP is not set | 424 | # CONFIG_SCSI_SRP is not set |
| 451 | # CONFIG_ATA is not set | 425 | # CONFIG_ATA is not set |
| 452 | |||
| 453 | # | ||
| 454 | # Multi-device support (RAID and LVM) | ||
| 455 | # | ||
| 456 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
| 457 | 427 | ||
| 458 | # | 428 | # |
| @@ -468,19 +438,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 468 | # | 438 | # |
| 469 | # CONFIG_FIREWIRE is not set | 439 | # CONFIG_FIREWIRE is not set |
| 470 | # CONFIG_IEEE1394 is not set | 440 | # CONFIG_IEEE1394 is not set |
| 471 | |||
| 472 | # | ||
| 473 | # I2O device support | ||
| 474 | # | ||
| 475 | # CONFIG_I2O is not set | 441 | # CONFIG_I2O is not set |
| 476 | # CONFIG_MACINTOSH_DRIVERS is not set | 442 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 477 | |||
| 478 | # | ||
| 479 | # Network device support | ||
| 480 | # | ||
| 481 | CONFIG_NETDEVICES=y | 443 | CONFIG_NETDEVICES=y |
| 444 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 482 | # CONFIG_DUMMY is not set | 445 | # CONFIG_DUMMY is not set |
| 483 | # CONFIG_BONDING is not set | 446 | # CONFIG_BONDING is not set |
| 447 | # CONFIG_MACVLAN is not set | ||
| 484 | # CONFIG_EQUALIZER is not set | 448 | # CONFIG_EQUALIZER is not set |
| 485 | # CONFIG_TUN is not set | 449 | # CONFIG_TUN is not set |
| 486 | # CONFIG_ARCNET is not set | 450 | # CONFIG_ARCNET is not set |
| @@ -497,21 +461,14 @@ CONFIG_PHYLIB=y | |||
| 497 | # CONFIG_VITESSE_PHY is not set | 461 | # CONFIG_VITESSE_PHY is not set |
| 498 | # CONFIG_SMSC_PHY is not set | 462 | # CONFIG_SMSC_PHY is not set |
| 499 | # CONFIG_BROADCOM_PHY is not set | 463 | # CONFIG_BROADCOM_PHY is not set |
| 464 | CONFIG_ICPLUS_PHY=y | ||
| 500 | # CONFIG_FIXED_PHY is not set | 465 | # CONFIG_FIXED_PHY is not set |
| 501 | |||
| 502 | # | ||
| 503 | # Ethernet (10 or 100Mbit) | ||
| 504 | # | ||
| 505 | CONFIG_NET_ETHERNET=y | 466 | CONFIG_NET_ETHERNET=y |
| 506 | CONFIG_MII=y | 467 | CONFIG_MII=y |
| 507 | # CONFIG_HAPPYMEAL is not set | 468 | # CONFIG_HAPPYMEAL is not set |
| 508 | # CONFIG_SUNGEM is not set | 469 | # CONFIG_SUNGEM is not set |
| 509 | # CONFIG_CASSINI is not set | 470 | # CONFIG_CASSINI is not set |
| 510 | # CONFIG_NET_VENDOR_3COM is not set | 471 | # CONFIG_NET_VENDOR_3COM is not set |
| 511 | |||
| 512 | # | ||
| 513 | # Tulip family network device support | ||
| 514 | # | ||
| 515 | # CONFIG_NET_TULIP is not set | 472 | # CONFIG_NET_TULIP is not set |
| 516 | # CONFIG_HP100 is not set | 473 | # CONFIG_HP100 is not set |
| 517 | # CONFIG_NET_PCI is not set | 474 | # CONFIG_NET_PCI is not set |
| @@ -528,7 +485,6 @@ CONFIG_E1000=y | |||
| 528 | # CONFIG_SIS190 is not set | 485 | # CONFIG_SIS190 is not set |
| 529 | # CONFIG_SKGE is not set | 486 | # CONFIG_SKGE is not set |
| 530 | # CONFIG_SKY2 is not set | 487 | # CONFIG_SKY2 is not set |
| 531 | # CONFIG_SK98LIN is not set | ||
| 532 | # CONFIG_VIA_VELOCITY is not set | 488 | # CONFIG_VIA_VELOCITY is not set |
| 533 | # CONFIG_TIGON3 is not set | 489 | # CONFIG_TIGON3 is not set |
| 534 | # CONFIG_BNX2 is not set | 490 | # CONFIG_BNX2 is not set |
| @@ -575,15 +531,7 @@ CONFIG_NETDEV_10000=y | |||
| 575 | # CONFIG_NETCONSOLE is not set | 531 | # CONFIG_NETCONSOLE is not set |
| 576 | # CONFIG_NETPOLL is not set | 532 | # CONFIG_NETPOLL is not set |
| 577 | # CONFIG_NET_POLL_CONTROLLER is not set | 533 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 578 | |||
| 579 | # | ||
| 580 | # ISDN subsystem | ||
| 581 | # | ||
| 582 | # CONFIG_ISDN is not set | 534 | # CONFIG_ISDN is not set |
| 583 | |||
| 584 | # | ||
| 585 | # Telephony Support | ||
| 586 | # | ||
| 587 | # CONFIG_PHONE is not set | 535 | # CONFIG_PHONE is not set |
| 588 | 536 | ||
| 589 | # | 537 | # |
| @@ -645,10 +593,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 645 | CONFIG_UNIX98_PTYS=y | 593 | CONFIG_UNIX98_PTYS=y |
| 646 | CONFIG_LEGACY_PTYS=y | 594 | CONFIG_LEGACY_PTYS=y |
| 647 | CONFIG_LEGACY_PTY_COUNT=256 | 595 | CONFIG_LEGACY_PTY_COUNT=256 |
| 648 | |||
| 649 | # | ||
| 650 | # IPMI | ||
| 651 | # | ||
| 652 | # CONFIG_IPMI_HANDLER is not set | 596 | # CONFIG_IPMI_HANDLER is not set |
| 653 | CONFIG_WATCHDOG=y | 597 | CONFIG_WATCHDOG=y |
| 654 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 598 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -678,10 +622,6 @@ CONFIG_GEN_RTC=y | |||
| 678 | # CONFIG_AGP is not set | 622 | # CONFIG_AGP is not set |
| 679 | # CONFIG_DRM is not set | 623 | # CONFIG_DRM is not set |
| 680 | # CONFIG_RAW_DRIVER is not set | 624 | # CONFIG_RAW_DRIVER is not set |
| 681 | |||
| 682 | # | ||
| 683 | # TPM devices | ||
| 684 | # | ||
| 685 | # CONFIG_TCG_TPM is not set | 625 | # CONFIG_TCG_TPM is not set |
| 686 | CONFIG_DEVPORT=y | 626 | CONFIG_DEVPORT=y |
| 687 | CONFIG_I2C=y | 627 | CONFIG_I2C=y |
| @@ -716,6 +656,7 @@ CONFIG_I2C_MPC=y | |||
| 716 | # CONFIG_I2C_SIS5595 is not set | 656 | # CONFIG_I2C_SIS5595 is not set |
| 717 | # CONFIG_I2C_SIS630 is not set | 657 | # CONFIG_I2C_SIS630 is not set |
| 718 | # CONFIG_I2C_SIS96X is not set | 658 | # CONFIG_I2C_SIS96X is not set |
| 659 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 719 | # CONFIG_I2C_STUB is not set | 660 | # CONFIG_I2C_STUB is not set |
| 720 | # CONFIG_I2C_TINY_USB is not set | 661 | # CONFIG_I2C_TINY_USB is not set |
| 721 | # CONFIG_I2C_VIA is not set | 662 | # CONFIG_I2C_VIA is not set |
| @@ -727,12 +668,14 @@ CONFIG_I2C_MPC=y | |||
| 727 | # | 668 | # |
| 728 | # CONFIG_SENSORS_DS1337 is not set | 669 | # CONFIG_SENSORS_DS1337 is not set |
| 729 | # CONFIG_SENSORS_DS1374 is not set | 670 | # CONFIG_SENSORS_DS1374 is not set |
| 671 | # CONFIG_DS1682 is not set | ||
| 730 | # CONFIG_SENSORS_EEPROM is not set | 672 | # CONFIG_SENSORS_EEPROM is not set |
| 731 | # CONFIG_SENSORS_PCF8574 is not set | 673 | # CONFIG_SENSORS_PCF8574 is not set |
| 732 | # CONFIG_SENSORS_PCA9539 is not set | 674 | # CONFIG_SENSORS_PCA9539 is not set |
| 733 | # CONFIG_SENSORS_PCF8591 is not set | 675 | # CONFIG_SENSORS_PCF8591 is not set |
| 734 | # CONFIG_SENSORS_M41T00 is not set | 676 | # CONFIG_SENSORS_M41T00 is not set |
| 735 | # CONFIG_SENSORS_MAX6875 is not set | 677 | # CONFIG_SENSORS_MAX6875 is not set |
| 678 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 736 | # CONFIG_I2C_DEBUG_CORE is not set | 679 | # CONFIG_I2C_DEBUG_CORE is not set |
| 737 | # CONFIG_I2C_DEBUG_ALGO is not set | 680 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 738 | # CONFIG_I2C_DEBUG_BUS is not set | 681 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -743,14 +686,12 @@ CONFIG_I2C_MPC=y | |||
| 743 | # | 686 | # |
| 744 | # CONFIG_SPI is not set | 687 | # CONFIG_SPI is not set |
| 745 | # CONFIG_SPI_MASTER is not set | 688 | # CONFIG_SPI_MASTER is not set |
| 746 | |||
| 747 | # | ||
| 748 | # Dallas's 1-wire bus | ||
| 749 | # | ||
| 750 | # CONFIG_W1 is not set | 689 | # CONFIG_W1 is not set |
| 690 | # CONFIG_POWER_SUPPLY is not set | ||
| 751 | CONFIG_HWMON=y | 691 | CONFIG_HWMON=y |
| 752 | # CONFIG_HWMON_VID is not set | 692 | # CONFIG_HWMON_VID is not set |
| 753 | # CONFIG_SENSORS_ABITUGURU is not set | 693 | # CONFIG_SENSORS_ABITUGURU is not set |
| 694 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 754 | # CONFIG_SENSORS_AD7418 is not set | 695 | # CONFIG_SENSORS_AD7418 is not set |
| 755 | # CONFIG_SENSORS_ADM1021 is not set | 696 | # CONFIG_SENSORS_ADM1021 is not set |
| 756 | # CONFIG_SENSORS_ADM1025 is not set | 697 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -777,14 +718,17 @@ CONFIG_HWMON=y | |||
| 777 | # CONFIG_SENSORS_LM87 is not set | 718 | # CONFIG_SENSORS_LM87 is not set |
| 778 | # CONFIG_SENSORS_LM90 is not set | 719 | # CONFIG_SENSORS_LM90 is not set |
| 779 | # CONFIG_SENSORS_LM92 is not set | 720 | # CONFIG_SENSORS_LM92 is not set |
| 721 | # CONFIG_SENSORS_LM93 is not set | ||
| 780 | # CONFIG_SENSORS_MAX1619 is not set | 722 | # CONFIG_SENSORS_MAX1619 is not set |
| 781 | # CONFIG_SENSORS_MAX6650 is not set | 723 | # CONFIG_SENSORS_MAX6650 is not set |
| 782 | # CONFIG_SENSORS_PC87360 is not set | 724 | # CONFIG_SENSORS_PC87360 is not set |
| 783 | # CONFIG_SENSORS_PC87427 is not set | 725 | # CONFIG_SENSORS_PC87427 is not set |
| 784 | # CONFIG_SENSORS_SIS5595 is not set | 726 | # CONFIG_SENSORS_SIS5595 is not set |
| 727 | # CONFIG_SENSORS_DME1737 is not set | ||
| 785 | # CONFIG_SENSORS_SMSC47M1 is not set | 728 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 786 | # CONFIG_SENSORS_SMSC47M192 is not set | 729 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 787 | # CONFIG_SENSORS_SMSC47B397 is not set | 730 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 731 | # CONFIG_SENSORS_THMC50 is not set | ||
| 788 | # CONFIG_SENSORS_VIA686A is not set | 732 | # CONFIG_SENSORS_VIA686A is not set |
| 789 | # CONFIG_SENSORS_VT1211 is not set | 733 | # CONFIG_SENSORS_VT1211 is not set |
| 790 | # CONFIG_SENSORS_VT8231 is not set | 734 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -820,6 +764,7 @@ CONFIG_DAB=y | |||
| 820 | # | 764 | # |
| 821 | # CONFIG_DISPLAY_SUPPORT is not set | 765 | # CONFIG_DISPLAY_SUPPORT is not set |
| 822 | # CONFIG_VGASTATE is not set | 766 | # CONFIG_VGASTATE is not set |
| 767 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 823 | # CONFIG_FB is not set | 768 | # CONFIG_FB is not set |
| 824 | # CONFIG_FB_IBM_GXT4500 is not set | 769 | # CONFIG_FB_IBM_GXT4500 is not set |
| 825 | 770 | ||
| @@ -827,10 +772,7 @@ CONFIG_DAB=y | |||
| 827 | # Sound | 772 | # Sound |
| 828 | # | 773 | # |
| 829 | # CONFIG_SOUND is not set | 774 | # CONFIG_SOUND is not set |
| 830 | 775 | CONFIG_HID_SUPPORT=y | |
| 831 | # | ||
| 832 | # HID Devices | ||
| 833 | # | ||
| 834 | CONFIG_HID=y | 776 | CONFIG_HID=y |
| 835 | # CONFIG_HID_DEBUG is not set | 777 | # CONFIG_HID_DEBUG is not set |
| 836 | 778 | ||
| @@ -844,10 +786,7 @@ CONFIG_HID=y | |||
| 844 | # | 786 | # |
| 845 | # CONFIG_USB_KBD is not set | 787 | # CONFIG_USB_KBD is not set |
| 846 | # CONFIG_USB_MOUSE is not set | 788 | # CONFIG_USB_MOUSE is not set |
| 847 | 789 | CONFIG_USB_SUPPORT=y | |
| 848 | # | ||
| 849 | # USB support | ||
| 850 | # | ||
| 851 | CONFIG_USB_ARCH_HAS_HCD=y | 790 | CONFIG_USB_ARCH_HAS_HCD=y |
| 852 | CONFIG_USB_ARCH_HAS_OHCI=y | 791 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 853 | CONFIG_USB_ARCH_HAS_EHCI=y | 792 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -869,7 +808,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 869 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 808 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 870 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 809 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 871 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 810 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 872 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 873 | # CONFIG_USB_ISP116X_HCD is not set | 811 | # CONFIG_USB_ISP116X_HCD is not set |
| 874 | CONFIG_USB_OHCI_HCD=y | 812 | CONFIG_USB_OHCI_HCD=y |
| 875 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 813 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -881,6 +819,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 881 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 819 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 882 | # CONFIG_USB_UHCI_HCD is not set | 820 | # CONFIG_USB_UHCI_HCD is not set |
| 883 | # CONFIG_USB_SL811_HCD is not set | 821 | # CONFIG_USB_SL811_HCD is not set |
| 822 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 884 | 823 | ||
| 885 | # | 824 | # |
| 886 | # USB Device Class drivers | 825 | # USB Device Class drivers |
| @@ -957,32 +896,9 @@ CONFIG_USB_MON=y | |||
| 957 | # | 896 | # |
| 958 | # CONFIG_USB_GADGET is not set | 897 | # CONFIG_USB_GADGET is not set |
| 959 | # CONFIG_MMC is not set | 898 | # CONFIG_MMC is not set |
| 960 | |||
| 961 | # | ||
| 962 | # LED devices | ||
| 963 | # | ||
| 964 | # CONFIG_NEW_LEDS is not set | 899 | # CONFIG_NEW_LEDS is not set |
| 965 | |||
| 966 | # | ||
| 967 | # LED drivers | ||
| 968 | # | ||
| 969 | |||
| 970 | # | ||
| 971 | # LED Triggers | ||
| 972 | # | ||
| 973 | |||
| 974 | # | ||
| 975 | # InfiniBand support | ||
| 976 | # | ||
| 977 | # CONFIG_INFINIBAND is not set | 900 | # CONFIG_INFINIBAND is not set |
| 978 | 901 | # CONFIG_EDAC is not set | |
| 979 | # | ||
| 980 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 981 | # | ||
| 982 | |||
| 983 | # | ||
| 984 | # Real Time Clock | ||
| 985 | # | ||
| 986 | # CONFIG_RTC_CLASS is not set | 902 | # CONFIG_RTC_CLASS is not set |
| 987 | 903 | ||
| 988 | # | 904 | # |
| @@ -999,6 +915,11 @@ CONFIG_USB_MON=y | |||
| 999 | # | 915 | # |
| 1000 | 916 | ||
| 1001 | # | 917 | # |
| 918 | # Userspace I/O | ||
| 919 | # | ||
| 920 | # CONFIG_UIO is not set | ||
| 921 | |||
| 922 | # | ||
| 1002 | # File systems | 923 | # File systems |
| 1003 | # | 924 | # |
| 1004 | CONFIG_EXT2_FS=y | 925 | CONFIG_EXT2_FS=y |
| @@ -1097,7 +1018,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 1097 | # CONFIG_NCP_FS is not set | 1018 | # CONFIG_NCP_FS is not set |
| 1098 | # CONFIG_CODA_FS is not set | 1019 | # CONFIG_CODA_FS is not set |
| 1099 | # CONFIG_AFS_FS is not set | 1020 | # CONFIG_AFS_FS is not set |
| 1100 | # CONFIG_9P_FS is not set | ||
| 1101 | 1021 | ||
| 1102 | # | 1022 | # |
| 1103 | # Partition Types | 1023 | # Partition Types |
| @@ -1182,6 +1102,7 @@ CONFIG_BITREVERSE=y | |||
| 1182 | # CONFIG_CRC16 is not set | 1102 | # CONFIG_CRC16 is not set |
| 1183 | # CONFIG_CRC_ITU_T is not set | 1103 | # CONFIG_CRC_ITU_T is not set |
| 1184 | CONFIG_CRC32=y | 1104 | CONFIG_CRC32=y |
| 1105 | # CONFIG_CRC7 is not set | ||
| 1185 | # CONFIG_LIBCRC32C is not set | 1106 | # CONFIG_LIBCRC32C is not set |
| 1186 | CONFIG_PLIST=y | 1107 | CONFIG_PLIST=y |
| 1187 | CONFIG_HAS_IOMEM=y | 1108 | CONFIG_HAS_IOMEM=y |
| @@ -1204,7 +1125,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1204 | # CONFIG_HEADERS_CHECK is not set | 1125 | # CONFIG_HEADERS_CHECK is not set |
| 1205 | # CONFIG_DEBUG_KERNEL is not set | 1126 | # CONFIG_DEBUG_KERNEL is not set |
| 1206 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1127 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1207 | # CONFIG_BOOTX_TEXT is not set | ||
| 1208 | # CONFIG_PPC_EARLY_DEBUG is not set | 1128 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1209 | 1129 | ||
| 1210 | # | 1130 | # |
| @@ -1212,10 +1132,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1212 | # | 1132 | # |
| 1213 | # CONFIG_KEYS is not set | 1133 | # CONFIG_KEYS is not set |
| 1214 | # CONFIG_SECURITY is not set | 1134 | # CONFIG_SECURITY is not set |
| 1215 | |||
| 1216 | # | ||
| 1217 | # Cryptographic options | ||
| 1218 | # | ||
| 1219 | CONFIG_CRYPTO=y | 1135 | CONFIG_CRYPTO=y |
| 1220 | CONFIG_CRYPTO_ALGAPI=y | 1136 | CONFIG_CRYPTO_ALGAPI=y |
| 1221 | CONFIG_CRYPTO_BLKCIPHER=y | 1137 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1253,7 +1169,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1253 | # CONFIG_CRYPTO_CRC32C is not set | 1169 | # CONFIG_CRYPTO_CRC32C is not set |
| 1254 | # CONFIG_CRYPTO_CAMELLIA is not set | 1170 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1255 | # CONFIG_CRYPTO_TEST is not set | 1171 | # CONFIG_CRYPTO_TEST is not set |
| 1256 | 1172 | CONFIG_CRYPTO_HW=y | |
| 1257 | # | ||
| 1258 | # Hardware crypto devices | ||
| 1259 | # | ||
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig index 85470b8cae09..ddafa6b9af05 100644 --- a/arch/powerpc/configs/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/mpc834x_itx_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:56 2007 | 4 | # Tue Aug 28 21:24:41 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -158,6 +149,7 @@ CONFIG_MPC834x=y | |||
| 158 | # CONFIG_GENERIC_IOMAP is not set | 149 | # CONFIG_GENERIC_IOMAP is not set |
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | # CONFIG_CPM2 is not set | 151 | # CONFIG_CPM2 is not set |
| 152 | # CONFIG_FSL_ULI1575 is not set | ||
| 161 | 153 | ||
| 162 | # | 154 | # |
| 163 | # Kernel options | 155 | # Kernel options |
| @@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 186 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 178 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 187 | # CONFIG_RESOURCES_64BIT is not set | 179 | # CONFIG_RESOURCES_64BIT is not set |
| 188 | CONFIG_ZONE_DMA_FLAG=1 | 180 | CONFIG_ZONE_DMA_FLAG=1 |
| 181 | CONFIG_BOUNCE=y | ||
| 182 | CONFIG_VIRT_TO_BUS=y | ||
| 189 | CONFIG_PROC_DEVICETREE=y | 183 | CONFIG_PROC_DEVICETREE=y |
| 190 | # CONFIG_CMDLINE_BOOL is not set | 184 | # CONFIG_CMDLINE_BOOL is not set |
| 191 | # CONFIG_PM is not set | 185 | # CONFIG_PM is not set |
| @@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y | |||
| 200 | CONFIG_ZONE_DMA=y | 194 | CONFIG_ZONE_DMA=y |
| 201 | CONFIG_GENERIC_ISA_DMA=y | 195 | CONFIG_GENERIC_ISA_DMA=y |
| 202 | CONFIG_PPC_INDIRECT_PCI=y | 196 | CONFIG_PPC_INDIRECT_PCI=y |
| 203 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 204 | CONFIG_FSL_SOC=y | 197 | CONFIG_FSL_SOC=y |
| 205 | CONFIG_PCI=y | 198 | CONFIG_PCI=y |
| 206 | CONFIG_PCI_DOMAINS=y | 199 | CONFIG_PCI_DOMAINS=y |
| 200 | CONFIG_PCI_SYSCALL=y | ||
| 207 | # CONFIG_PCIEPORTBUS is not set | 201 | # CONFIG_PCIEPORTBUS is not set |
| 208 | CONFIG_ARCH_SUPPORTS_MSI=y | 202 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 209 | # CONFIG_PCI_MSI is not set | 203 | # CONFIG_PCI_MSI is not set |
| @@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_MAC80211 is not set | 307 | # CONFIG_MAC80211 is not set |
| 314 | # CONFIG_IEEE80211 is not set | 308 | # CONFIG_IEEE80211 is not set |
| 315 | # CONFIG_RFKILL is not set | 309 | # CONFIG_RFKILL is not set |
| 310 | # CONFIG_NET_9P is not set | ||
| 316 | 311 | ||
| 317 | # | 312 | # |
| 318 | # Device Drivers | 313 | # Device Drivers |
| @@ -325,10 +320,6 @@ CONFIG_STANDALONE=y | |||
| 325 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 320 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 326 | # CONFIG_FW_LOADER is not set | 321 | # CONFIG_FW_LOADER is not set |
| 327 | # CONFIG_SYS_HYPERVISOR is not set | 322 | # CONFIG_SYS_HYPERVISOR is not set |
| 328 | |||
| 329 | # | ||
| 330 | # Connector - unified userspace <-> kernelspace linker | ||
| 331 | # | ||
| 332 | # CONFIG_CONNECTOR is not set | 323 | # CONFIG_CONNECTOR is not set |
| 333 | CONFIG_MTD=y | 324 | CONFIG_MTD=y |
| 334 | # CONFIG_MTD_DEBUG is not set | 325 | # CONFIG_MTD_DEBUG is not set |
| @@ -408,20 +399,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 408 | # UBI - Unsorted block images | 399 | # UBI - Unsorted block images |
| 409 | # | 400 | # |
| 410 | # CONFIG_MTD_UBI is not set | 401 | # CONFIG_MTD_UBI is not set |
| 411 | 402 | CONFIG_OF_DEVICE=y | |
| 412 | # | ||
| 413 | # Parallel port support | ||
| 414 | # | ||
| 415 | # CONFIG_PARPORT is not set | 403 | # CONFIG_PARPORT is not set |
| 416 | 404 | CONFIG_BLK_DEV=y | |
| 417 | # | ||
| 418 | # Plug and Play support | ||
| 419 | # | ||
| 420 | # CONFIG_PNPACPI is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # Block devices | ||
| 424 | # | ||
| 425 | # CONFIG_BLK_DEV_FD is not set | 405 | # CONFIG_BLK_DEV_FD is not set |
| 426 | # CONFIG_BLK_CPQ_DA is not set | 406 | # CONFIG_BLK_CPQ_DA is not set |
| 427 | # CONFIG_BLK_CPQ_CISS_DA is not set | 407 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -439,14 +419,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 439 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 440 | # CONFIG_CDROM_PKTCDVD is not set | 420 | # CONFIG_CDROM_PKTCDVD is not set |
| 441 | # CONFIG_ATA_OVER_ETH is not set | 421 | # CONFIG_ATA_OVER_ETH is not set |
| 442 | 422 | CONFIG_MISC_DEVICES=y | |
| 443 | # | ||
| 444 | # Misc devices | ||
| 445 | # | ||
| 446 | # CONFIG_PHANTOM is not set | 423 | # CONFIG_PHANTOM is not set |
| 424 | # CONFIG_EEPROM_93CX6 is not set | ||
| 447 | # CONFIG_SGI_IOC4 is not set | 425 | # CONFIG_SGI_IOC4 is not set |
| 448 | # CONFIG_TIFM_CORE is not set | 426 | # CONFIG_TIFM_CORE is not set |
| 449 | # CONFIG_BLINK is not set | ||
| 450 | CONFIG_IDE=y | 427 | CONFIG_IDE=y |
| 451 | CONFIG_IDE_MAX_HWIFS=4 | 428 | CONFIG_IDE_MAX_HWIFS=4 |
| 452 | # CONFIG_BLK_DEV_IDE is not set | 429 | # CONFIG_BLK_DEV_IDE is not set |
| @@ -458,6 +435,7 @@ CONFIG_IDE_MAX_HWIFS=4 | |||
| 458 | # | 435 | # |
| 459 | # CONFIG_RAID_ATTRS is not set | 436 | # CONFIG_RAID_ATTRS is not set |
| 460 | CONFIG_SCSI=y | 437 | CONFIG_SCSI=y |
| 438 | CONFIG_SCSI_DMA=y | ||
| 461 | # CONFIG_SCSI_TGT is not set | 439 | # CONFIG_SCSI_TGT is not set |
| 462 | # CONFIG_SCSI_NETLINK is not set | 440 | # CONFIG_SCSI_NETLINK is not set |
| 463 | CONFIG_SCSI_PROC_FS=y | 441 | CONFIG_SCSI_PROC_FS=y |
| @@ -487,12 +465,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 487 | CONFIG_SCSI_SPI_ATTRS=y | 465 | CONFIG_SCSI_SPI_ATTRS=y |
| 488 | # CONFIG_SCSI_FC_ATTRS is not set | 466 | # CONFIG_SCSI_FC_ATTRS is not set |
| 489 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 467 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 490 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 491 | # CONFIG_SCSI_SAS_LIBSAS is not set | 468 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 492 | 469 | CONFIG_SCSI_LOWLEVEL=y | |
| 493 | # | ||
| 494 | # SCSI low-level drivers | ||
| 495 | # | ||
| 496 | # CONFIG_ISCSI_TCP is not set | 470 | # CONFIG_ISCSI_TCP is not set |
| 497 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 471 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 498 | # CONFIG_SCSI_3W_9XXX is not set | 472 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -583,10 +557,6 @@ CONFIG_SATA_SIL=y | |||
| 583 | # CONFIG_PATA_VIA is not set | 557 | # CONFIG_PATA_VIA is not set |
| 584 | # CONFIG_PATA_WINBOND is not set | 558 | # CONFIG_PATA_WINBOND is not set |
| 585 | # CONFIG_PATA_PLATFORM is not set | 559 | # CONFIG_PATA_PLATFORM is not set |
| 586 | |||
| 587 | # | ||
| 588 | # Multi-device support (RAID and LVM) | ||
| 589 | # | ||
| 590 | CONFIG_MD=y | 560 | CONFIG_MD=y |
| 591 | CONFIG_BLK_DEV_MD=y | 561 | CONFIG_BLK_DEV_MD=y |
| 592 | CONFIG_MD_LINEAR=y | 562 | CONFIG_MD_LINEAR=y |
| @@ -611,19 +581,13 @@ CONFIG_MD_RAID1=y | |||
| 611 | # | 581 | # |
| 612 | # CONFIG_FIREWIRE is not set | 582 | # CONFIG_FIREWIRE is not set |
| 613 | # CONFIG_IEEE1394 is not set | 583 | # CONFIG_IEEE1394 is not set |
| 614 | |||
| 615 | # | ||
| 616 | # I2O device support | ||
| 617 | # | ||
| 618 | # CONFIG_I2O is not set | 584 | # CONFIG_I2O is not set |
| 619 | # CONFIG_MACINTOSH_DRIVERS is not set | 585 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 620 | |||
| 621 | # | ||
| 622 | # Network device support | ||
| 623 | # | ||
| 624 | CONFIG_NETDEVICES=y | 586 | CONFIG_NETDEVICES=y |
| 587 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 625 | # CONFIG_DUMMY is not set | 588 | # CONFIG_DUMMY is not set |
| 626 | # CONFIG_BONDING is not set | 589 | # CONFIG_BONDING is not set |
| 590 | # CONFIG_MACVLAN is not set | ||
| 627 | # CONFIG_EQUALIZER is not set | 591 | # CONFIG_EQUALIZER is not set |
| 628 | # CONFIG_TUN is not set | 592 | # CONFIG_TUN is not set |
| 629 | # CONFIG_ARCNET is not set | 593 | # CONFIG_ARCNET is not set |
| @@ -640,11 +604,8 @@ CONFIG_CICADA_PHY=y | |||
| 640 | # CONFIG_VITESSE_PHY is not set | 604 | # CONFIG_VITESSE_PHY is not set |
| 641 | # CONFIG_SMSC_PHY is not set | 605 | # CONFIG_SMSC_PHY is not set |
| 642 | # CONFIG_BROADCOM_PHY is not set | 606 | # CONFIG_BROADCOM_PHY is not set |
| 607 | # CONFIG_ICPLUS_PHY is not set | ||
| 643 | # CONFIG_FIXED_PHY is not set | 608 | # CONFIG_FIXED_PHY is not set |
| 644 | |||
| 645 | # | ||
| 646 | # Ethernet (10 or 100Mbit) | ||
| 647 | # | ||
| 648 | # CONFIG_NET_ETHERNET is not set | 609 | # CONFIG_NET_ETHERNET is not set |
| 649 | CONFIG_NETDEV_1000=y | 610 | CONFIG_NETDEV_1000=y |
| 650 | # CONFIG_ACENIC is not set | 611 | # CONFIG_ACENIC is not set |
| @@ -657,7 +618,6 @@ CONFIG_NETDEV_1000=y | |||
| 657 | # CONFIG_SIS190 is not set | 618 | # CONFIG_SIS190 is not set |
| 658 | # CONFIG_SKGE is not set | 619 | # CONFIG_SKGE is not set |
| 659 | # CONFIG_SKY2 is not set | 620 | # CONFIG_SKY2 is not set |
| 660 | # CONFIG_SK98LIN is not set | ||
| 661 | # CONFIG_VIA_VELOCITY is not set | 621 | # CONFIG_VIA_VELOCITY is not set |
| 662 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
| 663 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
| @@ -700,15 +660,7 @@ CONFIG_NETDEV_10000=y | |||
| 700 | # CONFIG_NETCONSOLE is not set | 660 | # CONFIG_NETCONSOLE is not set |
| 701 | # CONFIG_NETPOLL is not set | 661 | # CONFIG_NETPOLL is not set |
| 702 | # CONFIG_NET_POLL_CONTROLLER is not set | 662 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 703 | |||
| 704 | # | ||
| 705 | # ISDN subsystem | ||
| 706 | # | ||
| 707 | # CONFIG_ISDN is not set | 663 | # CONFIG_ISDN is not set |
| 708 | |||
| 709 | # | ||
| 710 | # Telephony Support | ||
| 711 | # | ||
| 712 | # CONFIG_PHONE is not set | 664 | # CONFIG_PHONE is not set |
| 713 | 665 | ||
| 714 | # | 666 | # |
| @@ -749,10 +701,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 749 | CONFIG_UNIX98_PTYS=y | 701 | CONFIG_UNIX98_PTYS=y |
| 750 | CONFIG_LEGACY_PTYS=y | 702 | CONFIG_LEGACY_PTYS=y |
| 751 | CONFIG_LEGACY_PTY_COUNT=256 | 703 | CONFIG_LEGACY_PTY_COUNT=256 |
| 752 | |||
| 753 | # | ||
| 754 | # IPMI | ||
| 755 | # | ||
| 756 | # CONFIG_IPMI_HANDLER is not set | 704 | # CONFIG_IPMI_HANDLER is not set |
| 757 | CONFIG_WATCHDOG=y | 705 | CONFIG_WATCHDOG=y |
| 758 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 706 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -781,10 +729,6 @@ CONFIG_HW_RANDOM=y | |||
| 781 | # CONFIG_AGP is not set | 729 | # CONFIG_AGP is not set |
| 782 | # CONFIG_DRM is not set | 730 | # CONFIG_DRM is not set |
| 783 | # CONFIG_RAW_DRIVER is not set | 731 | # CONFIG_RAW_DRIVER is not set |
| 784 | |||
| 785 | # | ||
| 786 | # TPM devices | ||
| 787 | # | ||
| 788 | # CONFIG_TCG_TPM is not set | 732 | # CONFIG_TCG_TPM is not set |
| 789 | CONFIG_DEVPORT=y | 733 | CONFIG_DEVPORT=y |
| 790 | CONFIG_I2C=y | 734 | CONFIG_I2C=y |
| @@ -819,6 +763,7 @@ CONFIG_I2C_MPC=y | |||
| 819 | # CONFIG_I2C_SIS5595 is not set | 763 | # CONFIG_I2C_SIS5595 is not set |
| 820 | # CONFIG_I2C_SIS630 is not set | 764 | # CONFIG_I2C_SIS630 is not set |
| 821 | # CONFIG_I2C_SIS96X is not set | 765 | # CONFIG_I2C_SIS96X is not set |
| 766 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 822 | # CONFIG_I2C_STUB is not set | 767 | # CONFIG_I2C_STUB is not set |
| 823 | # CONFIG_I2C_TINY_USB is not set | 768 | # CONFIG_I2C_TINY_USB is not set |
| 824 | # CONFIG_I2C_VIA is not set | 769 | # CONFIG_I2C_VIA is not set |
| @@ -830,12 +775,14 @@ CONFIG_I2C_MPC=y | |||
| 830 | # | 775 | # |
| 831 | # CONFIG_SENSORS_DS1337 is not set | 776 | # CONFIG_SENSORS_DS1337 is not set |
| 832 | # CONFIG_SENSORS_DS1374 is not set | 777 | # CONFIG_SENSORS_DS1374 is not set |
| 778 | # CONFIG_DS1682 is not set | ||
| 833 | # CONFIG_SENSORS_EEPROM is not set | 779 | # CONFIG_SENSORS_EEPROM is not set |
| 834 | CONFIG_SENSORS_PCF8574=y | 780 | CONFIG_SENSORS_PCF8574=y |
| 835 | # CONFIG_SENSORS_PCA9539 is not set | 781 | # CONFIG_SENSORS_PCA9539 is not set |
| 836 | # CONFIG_SENSORS_PCF8591 is not set | 782 | # CONFIG_SENSORS_PCF8591 is not set |
| 837 | # CONFIG_SENSORS_M41T00 is not set | 783 | # CONFIG_SENSORS_M41T00 is not set |
| 838 | # CONFIG_SENSORS_MAX6875 is not set | 784 | # CONFIG_SENSORS_MAX6875 is not set |
| 785 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 839 | # CONFIG_I2C_DEBUG_CORE is not set | 786 | # CONFIG_I2C_DEBUG_CORE is not set |
| 840 | # CONFIG_I2C_DEBUG_ALGO is not set | 787 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 841 | # CONFIG_I2C_DEBUG_BUS is not set | 788 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -858,11 +805,9 @@ CONFIG_SPI_MPC83xx=y | |||
| 858 | # | 805 | # |
| 859 | # CONFIG_SPI_AT25 is not set | 806 | # CONFIG_SPI_AT25 is not set |
| 860 | # CONFIG_SPI_SPIDEV is not set | 807 | # CONFIG_SPI_SPIDEV is not set |
| 861 | 808 | # CONFIG_SPI_TLE62X0 is not set | |
| 862 | # | ||
| 863 | # Dallas's 1-wire bus | ||
| 864 | # | ||
| 865 | # CONFIG_W1 is not set | 809 | # CONFIG_W1 is not set |
| 810 | # CONFIG_POWER_SUPPLY is not set | ||
| 866 | # CONFIG_HWMON is not set | 811 | # CONFIG_HWMON is not set |
| 867 | 812 | ||
| 868 | # | 813 | # |
| @@ -888,6 +833,7 @@ CONFIG_DAB=y | |||
| 888 | # | 833 | # |
| 889 | # CONFIG_DISPLAY_SUPPORT is not set | 834 | # CONFIG_DISPLAY_SUPPORT is not set |
| 890 | # CONFIG_VGASTATE is not set | 835 | # CONFIG_VGASTATE is not set |
| 836 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 891 | # CONFIG_FB is not set | 837 | # CONFIG_FB is not set |
| 892 | # CONFIG_FB_IBM_GXT4500 is not set | 838 | # CONFIG_FB_IBM_GXT4500 is not set |
| 893 | 839 | ||
| @@ -895,10 +841,7 @@ CONFIG_DAB=y | |||
| 895 | # Sound | 841 | # Sound |
| 896 | # | 842 | # |
| 897 | # CONFIG_SOUND is not set | 843 | # CONFIG_SOUND is not set |
| 898 | 844 | CONFIG_USB_SUPPORT=y | |
| 899 | # | ||
| 900 | # USB support | ||
| 901 | # | ||
| 902 | CONFIG_USB_ARCH_HAS_HCD=y | 845 | CONFIG_USB_ARCH_HAS_HCD=y |
| 903 | CONFIG_USB_ARCH_HAS_OHCI=y | 846 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 904 | CONFIG_USB_ARCH_HAS_EHCI=y | 847 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -918,13 +861,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 918 | # | 861 | # |
| 919 | CONFIG_USB_EHCI_HCD=y | 862 | CONFIG_USB_EHCI_HCD=y |
| 920 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 863 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 921 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 864 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 922 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 865 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 923 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | 866 | CONFIG_USB_EHCI_FSL=y |
| 924 | # CONFIG_USB_ISP116X_HCD is not set | 867 | # CONFIG_USB_ISP116X_HCD is not set |
| 925 | # CONFIG_USB_OHCI_HCD is not set | 868 | # CONFIG_USB_OHCI_HCD is not set |
| 926 | # CONFIG_USB_UHCI_HCD is not set | 869 | # CONFIG_USB_UHCI_HCD is not set |
| 927 | # CONFIG_USB_SL811_HCD is not set | 870 | # CONFIG_USB_SL811_HCD is not set |
| 871 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 928 | 872 | ||
| 929 | # | 873 | # |
| 930 | # USB Device Class drivers | 874 | # USB Device Class drivers |
| @@ -1001,32 +945,9 @@ CONFIG_USB_MON=y | |||
| 1001 | # | 945 | # |
| 1002 | # CONFIG_USB_GADGET is not set | 946 | # CONFIG_USB_GADGET is not set |
| 1003 | # CONFIG_MMC is not set | 947 | # CONFIG_MMC is not set |
| 1004 | |||
| 1005 | # | ||
| 1006 | # LED devices | ||
| 1007 | # | ||
| 1008 | # CONFIG_NEW_LEDS is not set | 948 | # CONFIG_NEW_LEDS is not set |
| 1009 | |||
| 1010 | # | ||
| 1011 | # LED drivers | ||
| 1012 | # | ||
| 1013 | |||
| 1014 | # | ||
| 1015 | # LED Triggers | ||
| 1016 | # | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # InfiniBand support | ||
| 1020 | # | ||
| 1021 | # CONFIG_INFINIBAND is not set | 949 | # CONFIG_INFINIBAND is not set |
| 1022 | 950 | # CONFIG_EDAC is not set | |
| 1023 | # | ||
| 1024 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1025 | # | ||
| 1026 | |||
| 1027 | # | ||
| 1028 | # Real Time Clock | ||
| 1029 | # | ||
| 1030 | CONFIG_RTC_LIB=y | 951 | CONFIG_RTC_LIB=y |
| 1031 | CONFIG_RTC_CLASS=y | 952 | CONFIG_RTC_CLASS=y |
| 1032 | CONFIG_RTC_HCTOSYS=y | 953 | CONFIG_RTC_HCTOSYS=y |
| @@ -1053,6 +974,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1053 | # CONFIG_RTC_DRV_X1205 is not set | 974 | # CONFIG_RTC_DRV_X1205 is not set |
| 1054 | # CONFIG_RTC_DRV_PCF8563 is not set | 975 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1055 | # CONFIG_RTC_DRV_PCF8583 is not set | 976 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 977 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1056 | 978 | ||
| 1057 | # | 979 | # |
| 1058 | # SPI RTC drivers | 980 | # SPI RTC drivers |
| @@ -1063,9 +985,12 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1063 | # | 985 | # |
| 1064 | # Platform RTC drivers | 986 | # Platform RTC drivers |
| 1065 | # | 987 | # |
| 988 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1066 | # CONFIG_RTC_DRV_DS1553 is not set | 989 | # CONFIG_RTC_DRV_DS1553 is not set |
| 990 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1067 | # CONFIG_RTC_DRV_DS1742 is not set | 991 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1068 | # CONFIG_RTC_DRV_M48T86 is not set | 992 | # CONFIG_RTC_DRV_M48T86 is not set |
| 993 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1069 | # CONFIG_RTC_DRV_V3020 is not set | 994 | # CONFIG_RTC_DRV_V3020 is not set |
| 1070 | 995 | ||
| 1071 | # | 996 | # |
| @@ -1088,6 +1013,11 @@ CONFIG_NET_DMA=y | |||
| 1088 | CONFIG_INTEL_IOATDMA=y | 1013 | CONFIG_INTEL_IOATDMA=y |
| 1089 | 1014 | ||
| 1090 | # | 1015 | # |
| 1016 | # Userspace I/O | ||
| 1017 | # | ||
| 1018 | # CONFIG_UIO is not set | ||
| 1019 | |||
| 1020 | # | ||
| 1091 | # File systems | 1021 | # File systems |
| 1092 | # | 1022 | # |
| 1093 | CONFIG_EXT2_FS=y | 1023 | CONFIG_EXT2_FS=y |
| @@ -1187,7 +1117,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 1187 | # CONFIG_NCP_FS is not set | 1117 | # CONFIG_NCP_FS is not set |
| 1188 | # CONFIG_CODA_FS is not set | 1118 | # CONFIG_CODA_FS is not set |
| 1189 | # CONFIG_AFS_FS is not set | 1119 | # CONFIG_AFS_FS is not set |
| 1190 | # CONFIG_9P_FS is not set | ||
| 1191 | 1120 | ||
| 1192 | # | 1121 | # |
| 1193 | # Partition Types | 1122 | # Partition Types |
| @@ -1269,6 +1198,7 @@ CONFIG_BITREVERSE=y | |||
| 1269 | # CONFIG_CRC16 is not set | 1198 | # CONFIG_CRC16 is not set |
| 1270 | # CONFIG_CRC_ITU_T is not set | 1199 | # CONFIG_CRC_ITU_T is not set |
| 1271 | CONFIG_CRC32=y | 1200 | CONFIG_CRC32=y |
| 1201 | # CONFIG_CRC7 is not set | ||
| 1272 | # CONFIG_LIBCRC32C is not set | 1202 | # CONFIG_LIBCRC32C is not set |
| 1273 | CONFIG_PLIST=y | 1203 | CONFIG_PLIST=y |
| 1274 | CONFIG_HAS_IOMEM=y | 1204 | CONFIG_HAS_IOMEM=y |
| @@ -1291,7 +1221,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1291 | # CONFIG_HEADERS_CHECK is not set | 1221 | # CONFIG_HEADERS_CHECK is not set |
| 1292 | # CONFIG_DEBUG_KERNEL is not set | 1222 | # CONFIG_DEBUG_KERNEL is not set |
| 1293 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1223 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1294 | # CONFIG_BOOTX_TEXT is not set | ||
| 1295 | # CONFIG_PPC_EARLY_DEBUG is not set | 1224 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1296 | 1225 | ||
| 1297 | # | 1226 | # |
| @@ -1299,10 +1228,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1299 | # | 1228 | # |
| 1300 | # CONFIG_KEYS is not set | 1229 | # CONFIG_KEYS is not set |
| 1301 | # CONFIG_SECURITY is not set | 1230 | # CONFIG_SECURITY is not set |
| 1302 | |||
| 1303 | # | ||
| 1304 | # Cryptographic options | ||
| 1305 | # | ||
| 1306 | CONFIG_CRYPTO=y | 1231 | CONFIG_CRYPTO=y |
| 1307 | CONFIG_CRYPTO_ALGAPI=y | 1232 | CONFIG_CRYPTO_ALGAPI=y |
| 1308 | CONFIG_CRYPTO_BLKCIPHER=y | 1233 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1340,7 +1265,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1340 | # CONFIG_CRYPTO_CRC32C is not set | 1265 | # CONFIG_CRYPTO_CRC32C is not set |
| 1341 | # CONFIG_CRYPTO_CAMELLIA is not set | 1266 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1342 | # CONFIG_CRYPTO_TEST is not set | 1267 | # CONFIG_CRYPTO_TEST is not set |
| 1343 | 1268 | CONFIG_CRYPTO_HW=y | |
| 1344 | # | ||
| 1345 | # Hardware crypto devices | ||
| 1346 | # | ||
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig index 704ee8b285bf..8241c6985861 100644 --- a/arch/powerpc/configs/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/mpc834x_itxgp_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:56 2007 | 4 | # Tue Aug 28 21:24:41 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -158,6 +149,7 @@ CONFIG_MPC834x=y | |||
| 158 | # CONFIG_GENERIC_IOMAP is not set | 149 | # CONFIG_GENERIC_IOMAP is not set |
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | # CONFIG_CPM2 is not set | 151 | # CONFIG_CPM2 is not set |
| 152 | # CONFIG_FSL_ULI1575 is not set | ||
| 161 | 153 | ||
| 162 | # | 154 | # |
| 163 | # Kernel options | 155 | # Kernel options |
| @@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 186 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 178 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 187 | # CONFIG_RESOURCES_64BIT is not set | 179 | # CONFIG_RESOURCES_64BIT is not set |
| 188 | CONFIG_ZONE_DMA_FLAG=1 | 180 | CONFIG_ZONE_DMA_FLAG=1 |
| 181 | CONFIG_BOUNCE=y | ||
| 182 | CONFIG_VIRT_TO_BUS=y | ||
| 189 | CONFIG_PROC_DEVICETREE=y | 183 | CONFIG_PROC_DEVICETREE=y |
| 190 | # CONFIG_CMDLINE_BOOL is not set | 184 | # CONFIG_CMDLINE_BOOL is not set |
| 191 | # CONFIG_PM is not set | 185 | # CONFIG_PM is not set |
| @@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y | |||
| 200 | CONFIG_ZONE_DMA=y | 194 | CONFIG_ZONE_DMA=y |
| 201 | CONFIG_GENERIC_ISA_DMA=y | 195 | CONFIG_GENERIC_ISA_DMA=y |
| 202 | CONFIG_PPC_INDIRECT_PCI=y | 196 | CONFIG_PPC_INDIRECT_PCI=y |
| 203 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 204 | CONFIG_FSL_SOC=y | 197 | CONFIG_FSL_SOC=y |
| 205 | CONFIG_PCI=y | 198 | CONFIG_PCI=y |
| 206 | CONFIG_PCI_DOMAINS=y | 199 | CONFIG_PCI_DOMAINS=y |
| 200 | CONFIG_PCI_SYSCALL=y | ||
| 207 | # CONFIG_PCIEPORTBUS is not set | 201 | # CONFIG_PCIEPORTBUS is not set |
| 208 | CONFIG_ARCH_SUPPORTS_MSI=y | 202 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 209 | # CONFIG_PCI_MSI is not set | 203 | # CONFIG_PCI_MSI is not set |
| @@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_MAC80211 is not set | 307 | # CONFIG_MAC80211 is not set |
| 314 | # CONFIG_IEEE80211 is not set | 308 | # CONFIG_IEEE80211 is not set |
| 315 | # CONFIG_RFKILL is not set | 309 | # CONFIG_RFKILL is not set |
| 310 | # CONFIG_NET_9P is not set | ||
| 316 | 311 | ||
| 317 | # | 312 | # |
| 318 | # Device Drivers | 313 | # Device Drivers |
| @@ -325,10 +320,6 @@ CONFIG_STANDALONE=y | |||
| 325 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 320 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 326 | # CONFIG_FW_LOADER is not set | 321 | # CONFIG_FW_LOADER is not set |
| 327 | # CONFIG_SYS_HYPERVISOR is not set | 322 | # CONFIG_SYS_HYPERVISOR is not set |
| 328 | |||
| 329 | # | ||
| 330 | # Connector - unified userspace <-> kernelspace linker | ||
| 331 | # | ||
| 332 | # CONFIG_CONNECTOR is not set | 323 | # CONFIG_CONNECTOR is not set |
| 333 | CONFIG_MTD=y | 324 | CONFIG_MTD=y |
| 334 | # CONFIG_MTD_DEBUG is not set | 325 | # CONFIG_MTD_DEBUG is not set |
| @@ -408,20 +399,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 408 | # UBI - Unsorted block images | 399 | # UBI - Unsorted block images |
| 409 | # | 400 | # |
| 410 | # CONFIG_MTD_UBI is not set | 401 | # CONFIG_MTD_UBI is not set |
| 411 | 402 | CONFIG_OF_DEVICE=y | |
| 412 | # | ||
| 413 | # Parallel port support | ||
| 414 | # | ||
| 415 | # CONFIG_PARPORT is not set | 403 | # CONFIG_PARPORT is not set |
| 416 | 404 | CONFIG_BLK_DEV=y | |
| 417 | # | ||
| 418 | # Plug and Play support | ||
| 419 | # | ||
| 420 | # CONFIG_PNPACPI is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # Block devices | ||
| 424 | # | ||
| 425 | # CONFIG_BLK_DEV_FD is not set | 405 | # CONFIG_BLK_DEV_FD is not set |
| 426 | # CONFIG_BLK_CPQ_DA is not set | 406 | # CONFIG_BLK_CPQ_DA is not set |
| 427 | # CONFIG_BLK_CPQ_CISS_DA is not set | 407 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -438,14 +418,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 438 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 418 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 439 | # CONFIG_CDROM_PKTCDVD is not set | 419 | # CONFIG_CDROM_PKTCDVD is not set |
| 440 | # CONFIG_ATA_OVER_ETH is not set | 420 | # CONFIG_ATA_OVER_ETH is not set |
| 441 | 421 | CONFIG_MISC_DEVICES=y | |
| 442 | # | ||
| 443 | # Misc devices | ||
| 444 | # | ||
| 445 | # CONFIG_PHANTOM is not set | 422 | # CONFIG_PHANTOM is not set |
| 423 | # CONFIG_EEPROM_93CX6 is not set | ||
| 446 | # CONFIG_SGI_IOC4 is not set | 424 | # CONFIG_SGI_IOC4 is not set |
| 447 | # CONFIG_TIFM_CORE is not set | 425 | # CONFIG_TIFM_CORE is not set |
| 448 | # CONFIG_BLINK is not set | ||
| 449 | # CONFIG_IDE is not set | 426 | # CONFIG_IDE is not set |
| 450 | 427 | ||
| 451 | # | 428 | # |
| @@ -453,6 +430,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 453 | # | 430 | # |
| 454 | # CONFIG_RAID_ATTRS is not set | 431 | # CONFIG_RAID_ATTRS is not set |
| 455 | CONFIG_SCSI=y | 432 | CONFIG_SCSI=y |
| 433 | CONFIG_SCSI_DMA=y | ||
| 456 | # CONFIG_SCSI_TGT is not set | 434 | # CONFIG_SCSI_TGT is not set |
| 457 | # CONFIG_SCSI_NETLINK is not set | 435 | # CONFIG_SCSI_NETLINK is not set |
| 458 | CONFIG_SCSI_PROC_FS=y | 436 | CONFIG_SCSI_PROC_FS=y |
| @@ -482,12 +460,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 482 | CONFIG_SCSI_SPI_ATTRS=y | 460 | CONFIG_SCSI_SPI_ATTRS=y |
| 483 | # CONFIG_SCSI_FC_ATTRS is not set | 461 | # CONFIG_SCSI_FC_ATTRS is not set |
| 484 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 462 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 485 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 486 | # CONFIG_SCSI_SAS_LIBSAS is not set | 463 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 487 | 464 | CONFIG_SCSI_LOWLEVEL=y | |
| 488 | # | ||
| 489 | # SCSI low-level drivers | ||
| 490 | # | ||
| 491 | # CONFIG_ISCSI_TCP is not set | 465 | # CONFIG_ISCSI_TCP is not set |
| 492 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 466 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 493 | # CONFIG_SCSI_3W_9XXX is not set | 467 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -523,10 +497,6 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 523 | # CONFIG_SCSI_DEBUG is not set | 497 | # CONFIG_SCSI_DEBUG is not set |
| 524 | # CONFIG_SCSI_SRP is not set | 498 | # CONFIG_SCSI_SRP is not set |
| 525 | # CONFIG_ATA is not set | 499 | # CONFIG_ATA is not set |
| 526 | |||
| 527 | # | ||
| 528 | # Multi-device support (RAID and LVM) | ||
| 529 | # | ||
| 530 | # CONFIG_MD is not set | 500 | # CONFIG_MD is not set |
| 531 | 501 | ||
| 532 | # | 502 | # |
| @@ -542,19 +512,13 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 542 | # | 512 | # |
| 543 | # CONFIG_FIREWIRE is not set | 513 | # CONFIG_FIREWIRE is not set |
| 544 | # CONFIG_IEEE1394 is not set | 514 | # CONFIG_IEEE1394 is not set |
| 545 | |||
| 546 | # | ||
| 547 | # I2O device support | ||
| 548 | # | ||
| 549 | # CONFIG_I2O is not set | 515 | # CONFIG_I2O is not set |
| 550 | # CONFIG_MACINTOSH_DRIVERS is not set | 516 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 551 | |||
| 552 | # | ||
| 553 | # Network device support | ||
| 554 | # | ||
| 555 | CONFIG_NETDEVICES=y | 517 | CONFIG_NETDEVICES=y |
| 518 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 556 | # CONFIG_DUMMY is not set | 519 | # CONFIG_DUMMY is not set |
| 557 | # CONFIG_BONDING is not set | 520 | # CONFIG_BONDING is not set |
| 521 | # CONFIG_MACVLAN is not set | ||
| 558 | # CONFIG_EQUALIZER is not set | 522 | # CONFIG_EQUALIZER is not set |
| 559 | # CONFIG_TUN is not set | 523 | # CONFIG_TUN is not set |
| 560 | # CONFIG_ARCNET is not set | 524 | # CONFIG_ARCNET is not set |
| @@ -571,11 +535,8 @@ CONFIG_CICADA_PHY=y | |||
| 571 | # CONFIG_VITESSE_PHY is not set | 535 | # CONFIG_VITESSE_PHY is not set |
| 572 | # CONFIG_SMSC_PHY is not set | 536 | # CONFIG_SMSC_PHY is not set |
| 573 | # CONFIG_BROADCOM_PHY is not set | 537 | # CONFIG_BROADCOM_PHY is not set |
| 538 | # CONFIG_ICPLUS_PHY is not set | ||
| 574 | # CONFIG_FIXED_PHY is not set | 539 | # CONFIG_FIXED_PHY is not set |
| 575 | |||
| 576 | # | ||
| 577 | # Ethernet (10 or 100Mbit) | ||
| 578 | # | ||
| 579 | # CONFIG_NET_ETHERNET is not set | 540 | # CONFIG_NET_ETHERNET is not set |
| 580 | CONFIG_NETDEV_1000=y | 541 | CONFIG_NETDEV_1000=y |
| 581 | # CONFIG_ACENIC is not set | 542 | # CONFIG_ACENIC is not set |
| @@ -588,7 +549,6 @@ CONFIG_NETDEV_1000=y | |||
| 588 | # CONFIG_SIS190 is not set | 549 | # CONFIG_SIS190 is not set |
| 589 | # CONFIG_SKGE is not set | 550 | # CONFIG_SKGE is not set |
| 590 | # CONFIG_SKY2 is not set | 551 | # CONFIG_SKY2 is not set |
| 591 | # CONFIG_SK98LIN is not set | ||
| 592 | # CONFIG_VIA_VELOCITY is not set | 552 | # CONFIG_VIA_VELOCITY is not set |
| 593 | # CONFIG_TIGON3 is not set | 553 | # CONFIG_TIGON3 is not set |
| 594 | # CONFIG_BNX2 is not set | 554 | # CONFIG_BNX2 is not set |
| @@ -621,15 +581,7 @@ CONFIG_NETDEV_10000=y | |||
| 621 | # CONFIG_NETCONSOLE is not set | 581 | # CONFIG_NETCONSOLE is not set |
| 622 | # CONFIG_NETPOLL is not set | 582 | # CONFIG_NETPOLL is not set |
| 623 | # CONFIG_NET_POLL_CONTROLLER is not set | 583 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 624 | |||
| 625 | # | ||
| 626 | # ISDN subsystem | ||
| 627 | # | ||
| 628 | # CONFIG_ISDN is not set | 584 | # CONFIG_ISDN is not set |
| 629 | |||
| 630 | # | ||
| 631 | # Telephony Support | ||
| 632 | # | ||
| 633 | # CONFIG_PHONE is not set | 585 | # CONFIG_PHONE is not set |
| 634 | 586 | ||
| 635 | # | 587 | # |
| @@ -670,10 +622,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 670 | CONFIG_UNIX98_PTYS=y | 622 | CONFIG_UNIX98_PTYS=y |
| 671 | CONFIG_LEGACY_PTYS=y | 623 | CONFIG_LEGACY_PTYS=y |
| 672 | CONFIG_LEGACY_PTY_COUNT=256 | 624 | CONFIG_LEGACY_PTY_COUNT=256 |
| 673 | |||
| 674 | # | ||
| 675 | # IPMI | ||
| 676 | # | ||
| 677 | # CONFIG_IPMI_HANDLER is not set | 625 | # CONFIG_IPMI_HANDLER is not set |
| 678 | CONFIG_WATCHDOG=y | 626 | CONFIG_WATCHDOG=y |
| 679 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 627 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -697,10 +645,6 @@ CONFIG_HW_RANDOM=y | |||
| 697 | # CONFIG_AGP is not set | 645 | # CONFIG_AGP is not set |
| 698 | # CONFIG_DRM is not set | 646 | # CONFIG_DRM is not set |
| 699 | # CONFIG_RAW_DRIVER is not set | 647 | # CONFIG_RAW_DRIVER is not set |
| 700 | |||
| 701 | # | ||
| 702 | # TPM devices | ||
| 703 | # | ||
| 704 | # CONFIG_TCG_TPM is not set | 648 | # CONFIG_TCG_TPM is not set |
| 705 | CONFIG_DEVPORT=y | 649 | CONFIG_DEVPORT=y |
| 706 | CONFIG_I2C=y | 650 | CONFIG_I2C=y |
| @@ -735,6 +679,7 @@ CONFIG_I2C_MPC=y | |||
| 735 | # CONFIG_I2C_SIS5595 is not set | 679 | # CONFIG_I2C_SIS5595 is not set |
| 736 | # CONFIG_I2C_SIS630 is not set | 680 | # CONFIG_I2C_SIS630 is not set |
| 737 | # CONFIG_I2C_SIS96X is not set | 681 | # CONFIG_I2C_SIS96X is not set |
| 682 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 738 | # CONFIG_I2C_STUB is not set | 683 | # CONFIG_I2C_STUB is not set |
| 739 | # CONFIG_I2C_VIA is not set | 684 | # CONFIG_I2C_VIA is not set |
| 740 | # CONFIG_I2C_VIAPRO is not set | 685 | # CONFIG_I2C_VIAPRO is not set |
| @@ -745,12 +690,14 @@ CONFIG_I2C_MPC=y | |||
| 745 | # | 690 | # |
| 746 | # CONFIG_SENSORS_DS1337 is not set | 691 | # CONFIG_SENSORS_DS1337 is not set |
| 747 | # CONFIG_SENSORS_DS1374 is not set | 692 | # CONFIG_SENSORS_DS1374 is not set |
| 693 | # CONFIG_DS1682 is not set | ||
| 748 | # CONFIG_SENSORS_EEPROM is not set | 694 | # CONFIG_SENSORS_EEPROM is not set |
| 749 | CONFIG_SENSORS_PCF8574=y | 695 | CONFIG_SENSORS_PCF8574=y |
| 750 | # CONFIG_SENSORS_PCA9539 is not set | 696 | # CONFIG_SENSORS_PCA9539 is not set |
| 751 | # CONFIG_SENSORS_PCF8591 is not set | 697 | # CONFIG_SENSORS_PCF8591 is not set |
| 752 | # CONFIG_SENSORS_M41T00 is not set | 698 | # CONFIG_SENSORS_M41T00 is not set |
| 753 | # CONFIG_SENSORS_MAX6875 is not set | 699 | # CONFIG_SENSORS_MAX6875 is not set |
| 700 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 754 | # CONFIG_I2C_DEBUG_CORE is not set | 701 | # CONFIG_I2C_DEBUG_CORE is not set |
| 755 | # CONFIG_I2C_DEBUG_ALGO is not set | 702 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 756 | # CONFIG_I2C_DEBUG_BUS is not set | 703 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -773,11 +720,9 @@ CONFIG_SPI_MPC83xx=y | |||
| 773 | # | 720 | # |
| 774 | # CONFIG_SPI_AT25 is not set | 721 | # CONFIG_SPI_AT25 is not set |
| 775 | # CONFIG_SPI_SPIDEV is not set | 722 | # CONFIG_SPI_SPIDEV is not set |
| 776 | 723 | # CONFIG_SPI_TLE62X0 is not set | |
| 777 | # | ||
| 778 | # Dallas's 1-wire bus | ||
| 779 | # | ||
| 780 | # CONFIG_W1 is not set | 724 | # CONFIG_W1 is not set |
| 725 | # CONFIG_POWER_SUPPLY is not set | ||
| 781 | # CONFIG_HWMON is not set | 726 | # CONFIG_HWMON is not set |
| 782 | 727 | ||
| 783 | # | 728 | # |
| @@ -802,6 +747,7 @@ CONFIG_DAB=y | |||
| 802 | # | 747 | # |
| 803 | # CONFIG_DISPLAY_SUPPORT is not set | 748 | # CONFIG_DISPLAY_SUPPORT is not set |
| 804 | # CONFIG_VGASTATE is not set | 749 | # CONFIG_VGASTATE is not set |
| 750 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 805 | # CONFIG_FB is not set | 751 | # CONFIG_FB is not set |
| 806 | # CONFIG_FB_IBM_GXT4500 is not set | 752 | # CONFIG_FB_IBM_GXT4500 is not set |
| 807 | 753 | ||
| @@ -809,14 +755,13 @@ CONFIG_DAB=y | |||
| 809 | # Sound | 755 | # Sound |
| 810 | # | 756 | # |
| 811 | # CONFIG_SOUND is not set | 757 | # CONFIG_SOUND is not set |
| 812 | 758 | CONFIG_USB_SUPPORT=y | |
| 813 | # | ||
| 814 | # USB support | ||
| 815 | # | ||
| 816 | CONFIG_USB_ARCH_HAS_HCD=y | 759 | CONFIG_USB_ARCH_HAS_HCD=y |
| 817 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 818 | CONFIG_USB_ARCH_HAS_EHCI=y | 761 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 819 | # CONFIG_USB is not set | 762 | # CONFIG_USB is not set |
| 763 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | ||
| 764 | CONFIG_USB_EHCI_FSL=y | ||
| 820 | 765 | ||
| 821 | # | 766 | # |
| 822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -827,32 +772,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 827 | # | 772 | # |
| 828 | # CONFIG_USB_GADGET is not set | 773 | # CONFIG_USB_GADGET is not set |
| 829 | # CONFIG_MMC is not set | 774 | # CONFIG_MMC is not set |
| 830 | |||
| 831 | # | ||
| 832 | # LED devices | ||
| 833 | # | ||
| 834 | # CONFIG_NEW_LEDS is not set | 775 | # CONFIG_NEW_LEDS is not set |
| 835 | |||
| 836 | # | ||
| 837 | # LED drivers | ||
| 838 | # | ||
| 839 | |||
| 840 | # | ||
| 841 | # LED Triggers | ||
| 842 | # | ||
| 843 | |||
| 844 | # | ||
| 845 | # InfiniBand support | ||
| 846 | # | ||
| 847 | # CONFIG_INFINIBAND is not set | 776 | # CONFIG_INFINIBAND is not set |
| 848 | 777 | # CONFIG_EDAC is not set | |
| 849 | # | ||
| 850 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 851 | # | ||
| 852 | |||
| 853 | # | ||
| 854 | # Real Time Clock | ||
| 855 | # | ||
| 856 | CONFIG_RTC_LIB=y | 778 | CONFIG_RTC_LIB=y |
| 857 | CONFIG_RTC_CLASS=y | 779 | CONFIG_RTC_CLASS=y |
| 858 | CONFIG_RTC_HCTOSYS=y | 780 | CONFIG_RTC_HCTOSYS=y |
| @@ -879,6 +801,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 879 | # CONFIG_RTC_DRV_X1205 is not set | 801 | # CONFIG_RTC_DRV_X1205 is not set |
| 880 | # CONFIG_RTC_DRV_PCF8563 is not set | 802 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 881 | # CONFIG_RTC_DRV_PCF8583 is not set | 803 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 804 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 882 | 805 | ||
| 883 | # | 806 | # |
| 884 | # SPI RTC drivers | 807 | # SPI RTC drivers |
| @@ -889,9 +812,12 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 889 | # | 812 | # |
| 890 | # Platform RTC drivers | 813 | # Platform RTC drivers |
| 891 | # | 814 | # |
| 815 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 892 | # CONFIG_RTC_DRV_DS1553 is not set | 816 | # CONFIG_RTC_DRV_DS1553 is not set |
| 817 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 893 | # CONFIG_RTC_DRV_DS1742 is not set | 818 | # CONFIG_RTC_DRV_DS1742 is not set |
| 894 | # CONFIG_RTC_DRV_M48T86 is not set | 819 | # CONFIG_RTC_DRV_M48T86 is not set |
| 820 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 895 | # CONFIG_RTC_DRV_V3020 is not set | 821 | # CONFIG_RTC_DRV_V3020 is not set |
| 896 | 822 | ||
| 897 | # | 823 | # |
| @@ -914,6 +840,11 @@ CONFIG_NET_DMA=y | |||
| 914 | CONFIG_INTEL_IOATDMA=y | 840 | CONFIG_INTEL_IOATDMA=y |
| 915 | 841 | ||
| 916 | # | 842 | # |
| 843 | # Userspace I/O | ||
| 844 | # | ||
| 845 | # CONFIG_UIO is not set | ||
| 846 | |||
| 847 | # | ||
| 917 | # File systems | 848 | # File systems |
| 918 | # | 849 | # |
| 919 | CONFIG_EXT2_FS=y | 850 | CONFIG_EXT2_FS=y |
| @@ -1013,7 +944,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 1013 | # CONFIG_NCP_FS is not set | 944 | # CONFIG_NCP_FS is not set |
| 1014 | # CONFIG_CODA_FS is not set | 945 | # CONFIG_CODA_FS is not set |
| 1015 | # CONFIG_AFS_FS is not set | 946 | # CONFIG_AFS_FS is not set |
| 1016 | # CONFIG_9P_FS is not set | ||
| 1017 | 947 | ||
| 1018 | # | 948 | # |
| 1019 | # Partition Types | 949 | # Partition Types |
| @@ -1095,6 +1025,7 @@ CONFIG_BITREVERSE=y | |||
| 1095 | # CONFIG_CRC16 is not set | 1025 | # CONFIG_CRC16 is not set |
| 1096 | # CONFIG_CRC_ITU_T is not set | 1026 | # CONFIG_CRC_ITU_T is not set |
| 1097 | CONFIG_CRC32=y | 1027 | CONFIG_CRC32=y |
| 1028 | # CONFIG_CRC7 is not set | ||
| 1098 | # CONFIG_LIBCRC32C is not set | 1029 | # CONFIG_LIBCRC32C is not set |
| 1099 | CONFIG_PLIST=y | 1030 | CONFIG_PLIST=y |
| 1100 | CONFIG_HAS_IOMEM=y | 1031 | CONFIG_HAS_IOMEM=y |
| @@ -1117,7 +1048,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1117 | # CONFIG_HEADERS_CHECK is not set | 1048 | # CONFIG_HEADERS_CHECK is not set |
| 1118 | # CONFIG_DEBUG_KERNEL is not set | 1049 | # CONFIG_DEBUG_KERNEL is not set |
| 1119 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1050 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1120 | # CONFIG_BOOTX_TEXT is not set | ||
| 1121 | # CONFIG_PPC_EARLY_DEBUG is not set | 1051 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1122 | 1052 | ||
| 1123 | # | 1053 | # |
| @@ -1125,10 +1055,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1125 | # | 1055 | # |
| 1126 | # CONFIG_KEYS is not set | 1056 | # CONFIG_KEYS is not set |
| 1127 | # CONFIG_SECURITY is not set | 1057 | # CONFIG_SECURITY is not set |
| 1128 | |||
| 1129 | # | ||
| 1130 | # Cryptographic options | ||
| 1131 | # | ||
| 1132 | CONFIG_CRYPTO=y | 1058 | CONFIG_CRYPTO=y |
| 1133 | CONFIG_CRYPTO_ALGAPI=y | 1059 | CONFIG_CRYPTO_ALGAPI=y |
| 1134 | CONFIG_CRYPTO_BLKCIPHER=y | 1060 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1166,7 +1092,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1166 | # CONFIG_CRYPTO_CRC32C is not set | 1092 | # CONFIG_CRYPTO_CRC32C is not set |
| 1167 | # CONFIG_CRYPTO_CAMELLIA is not set | 1093 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1168 | # CONFIG_CRYPTO_TEST is not set | 1094 | # CONFIG_CRYPTO_TEST is not set |
| 1169 | 1095 | CONFIG_CRYPTO_HW=y | |
| 1170 | # | ||
| 1171 | # Hardware crypto devices | ||
| 1172 | # | ||
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig index c28b3ee3cb12..06233b1a9418 100644 --- a/arch/powerpc/configs/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/mpc834x_mds_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:57 2007 | 4 | # Tue Aug 28 21:24:41 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -158,6 +149,7 @@ CONFIG_MPC834x=y | |||
| 158 | # CONFIG_GENERIC_IOMAP is not set | 149 | # CONFIG_GENERIC_IOMAP is not set |
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | # CONFIG_CPM2 is not set | 151 | # CONFIG_CPM2 is not set |
| 152 | # CONFIG_FSL_ULI1575 is not set | ||
| 161 | 153 | ||
| 162 | # | 154 | # |
| 163 | # Kernel options | 155 | # Kernel options |
| @@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 186 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 178 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 187 | # CONFIG_RESOURCES_64BIT is not set | 179 | # CONFIG_RESOURCES_64BIT is not set |
| 188 | CONFIG_ZONE_DMA_FLAG=1 | 180 | CONFIG_ZONE_DMA_FLAG=1 |
| 181 | CONFIG_BOUNCE=y | ||
| 182 | CONFIG_VIRT_TO_BUS=y | ||
| 189 | CONFIG_PROC_DEVICETREE=y | 183 | CONFIG_PROC_DEVICETREE=y |
| 190 | # CONFIG_CMDLINE_BOOL is not set | 184 | # CONFIG_CMDLINE_BOOL is not set |
| 191 | # CONFIG_PM is not set | 185 | # CONFIG_PM is not set |
| @@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y | |||
| 200 | CONFIG_ZONE_DMA=y | 194 | CONFIG_ZONE_DMA=y |
| 201 | CONFIG_GENERIC_ISA_DMA=y | 195 | CONFIG_GENERIC_ISA_DMA=y |
| 202 | CONFIG_PPC_INDIRECT_PCI=y | 196 | CONFIG_PPC_INDIRECT_PCI=y |
| 203 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 204 | CONFIG_FSL_SOC=y | 197 | CONFIG_FSL_SOC=y |
| 205 | CONFIG_PCI=y | 198 | CONFIG_PCI=y |
| 206 | CONFIG_PCI_DOMAINS=y | 199 | CONFIG_PCI_DOMAINS=y |
| 200 | CONFIG_PCI_SYSCALL=y | ||
| 207 | # CONFIG_PCIEPORTBUS is not set | 201 | # CONFIG_PCIEPORTBUS is not set |
| 208 | CONFIG_ARCH_SUPPORTS_MSI=y | 202 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 209 | # CONFIG_PCI_MSI is not set | 203 | # CONFIG_PCI_MSI is not set |
| @@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_MAC80211 is not set | 307 | # CONFIG_MAC80211 is not set |
| 314 | # CONFIG_IEEE80211 is not set | 308 | # CONFIG_IEEE80211 is not set |
| 315 | # CONFIG_RFKILL is not set | 309 | # CONFIG_RFKILL is not set |
| 310 | # CONFIG_NET_9P is not set | ||
| 316 | 311 | ||
| 317 | # | 312 | # |
| 318 | # Device Drivers | 313 | # Device Drivers |
| @@ -325,26 +320,11 @@ CONFIG_STANDALONE=y | |||
| 325 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 320 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 326 | # CONFIG_FW_LOADER is not set | 321 | # CONFIG_FW_LOADER is not set |
| 327 | # CONFIG_SYS_HYPERVISOR is not set | 322 | # CONFIG_SYS_HYPERVISOR is not set |
| 328 | |||
| 329 | # | ||
| 330 | # Connector - unified userspace <-> kernelspace linker | ||
| 331 | # | ||
| 332 | # CONFIG_CONNECTOR is not set | 323 | # CONFIG_CONNECTOR is not set |
| 333 | # CONFIG_MTD is not set | 324 | # CONFIG_MTD is not set |
| 334 | 325 | CONFIG_OF_DEVICE=y | |
| 335 | # | ||
| 336 | # Parallel port support | ||
| 337 | # | ||
| 338 | # CONFIG_PARPORT is not set | 326 | # CONFIG_PARPORT is not set |
| 339 | 327 | CONFIG_BLK_DEV=y | |
| 340 | # | ||
| 341 | # Plug and Play support | ||
| 342 | # | ||
| 343 | # CONFIG_PNPACPI is not set | ||
| 344 | |||
| 345 | # | ||
| 346 | # Block devices | ||
| 347 | # | ||
| 348 | # CONFIG_BLK_DEV_FD is not set | 328 | # CONFIG_BLK_DEV_FD is not set |
| 349 | # CONFIG_BLK_CPQ_DA is not set | 329 | # CONFIG_BLK_CPQ_DA is not set |
| 350 | # CONFIG_BLK_CPQ_CISS_DA is not set | 330 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -361,14 +341,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 361 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 341 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 362 | # CONFIG_CDROM_PKTCDVD is not set | 342 | # CONFIG_CDROM_PKTCDVD is not set |
| 363 | # CONFIG_ATA_OVER_ETH is not set | 343 | # CONFIG_ATA_OVER_ETH is not set |
| 364 | 344 | CONFIG_MISC_DEVICES=y | |
| 365 | # | ||
| 366 | # Misc devices | ||
| 367 | # | ||
| 368 | # CONFIG_PHANTOM is not set | 345 | # CONFIG_PHANTOM is not set |
| 346 | # CONFIG_EEPROM_93CX6 is not set | ||
| 369 | # CONFIG_SGI_IOC4 is not set | 347 | # CONFIG_SGI_IOC4 is not set |
| 370 | # CONFIG_TIFM_CORE is not set | 348 | # CONFIG_TIFM_CORE is not set |
| 371 | # CONFIG_BLINK is not set | ||
| 372 | # CONFIG_IDE is not set | 349 | # CONFIG_IDE is not set |
| 373 | 350 | ||
| 374 | # | 351 | # |
| @@ -376,12 +353,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 376 | # | 353 | # |
| 377 | # CONFIG_RAID_ATTRS is not set | 354 | # CONFIG_RAID_ATTRS is not set |
| 378 | # CONFIG_SCSI is not set | 355 | # CONFIG_SCSI is not set |
| 356 | # CONFIG_SCSI_DMA is not set | ||
| 379 | # CONFIG_SCSI_NETLINK is not set | 357 | # CONFIG_SCSI_NETLINK is not set |
| 380 | # CONFIG_ATA is not set | 358 | # CONFIG_ATA is not set |
| 381 | |||
| 382 | # | ||
| 383 | # Multi-device support (RAID and LVM) | ||
| 384 | # | ||
| 385 | # CONFIG_MD is not set | 359 | # CONFIG_MD is not set |
| 386 | 360 | ||
| 387 | # | 361 | # |
| @@ -394,19 +368,13 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 394 | # | 368 | # |
| 395 | # CONFIG_FIREWIRE is not set | 369 | # CONFIG_FIREWIRE is not set |
| 396 | # CONFIG_IEEE1394 is not set | 370 | # CONFIG_IEEE1394 is not set |
| 397 | |||
| 398 | # | ||
| 399 | # I2O device support | ||
| 400 | # | ||
| 401 | # CONFIG_I2O is not set | 371 | # CONFIG_I2O is not set |
| 402 | # CONFIG_MACINTOSH_DRIVERS is not set | 372 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 403 | |||
| 404 | # | ||
| 405 | # Network device support | ||
| 406 | # | ||
| 407 | CONFIG_NETDEVICES=y | 373 | CONFIG_NETDEVICES=y |
| 374 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 408 | # CONFIG_DUMMY is not set | 375 | # CONFIG_DUMMY is not set |
| 409 | # CONFIG_BONDING is not set | 376 | # CONFIG_BONDING is not set |
| 377 | # CONFIG_MACVLAN is not set | ||
| 410 | # CONFIG_EQUALIZER is not set | 378 | # CONFIG_EQUALIZER is not set |
| 411 | # CONFIG_TUN is not set | 379 | # CONFIG_TUN is not set |
| 412 | # CONFIG_ARCNET is not set | 380 | # CONFIG_ARCNET is not set |
| @@ -423,21 +391,14 @@ CONFIG_MARVELL_PHY=y | |||
| 423 | # CONFIG_VITESSE_PHY is not set | 391 | # CONFIG_VITESSE_PHY is not set |
| 424 | # CONFIG_SMSC_PHY is not set | 392 | # CONFIG_SMSC_PHY is not set |
| 425 | # CONFIG_BROADCOM_PHY is not set | 393 | # CONFIG_BROADCOM_PHY is not set |
| 394 | # CONFIG_ICPLUS_PHY is not set | ||
| 426 | # CONFIG_FIXED_PHY is not set | 395 | # CONFIG_FIXED_PHY is not set |
| 427 | |||
| 428 | # | ||
| 429 | # Ethernet (10 or 100Mbit) | ||
| 430 | # | ||
| 431 | CONFIG_NET_ETHERNET=y | 396 | CONFIG_NET_ETHERNET=y |
| 432 | CONFIG_MII=y | 397 | CONFIG_MII=y |
| 433 | # CONFIG_HAPPYMEAL is not set | 398 | # CONFIG_HAPPYMEAL is not set |
| 434 | # CONFIG_SUNGEM is not set | 399 | # CONFIG_SUNGEM is not set |
| 435 | # CONFIG_CASSINI is not set | 400 | # CONFIG_CASSINI is not set |
| 436 | # CONFIG_NET_VENDOR_3COM is not set | 401 | # CONFIG_NET_VENDOR_3COM is not set |
| 437 | |||
| 438 | # | ||
| 439 | # Tulip family network device support | ||
| 440 | # | ||
| 441 | # CONFIG_NET_TULIP is not set | 402 | # CONFIG_NET_TULIP is not set |
| 442 | # CONFIG_HP100 is not set | 403 | # CONFIG_HP100 is not set |
| 443 | CONFIG_NET_PCI=y | 404 | CONFIG_NET_PCI=y |
| @@ -471,7 +432,6 @@ CONFIG_NETDEV_1000=y | |||
| 471 | # CONFIG_SIS190 is not set | 432 | # CONFIG_SIS190 is not set |
| 472 | # CONFIG_SKGE is not set | 433 | # CONFIG_SKGE is not set |
| 473 | # CONFIG_SKY2 is not set | 434 | # CONFIG_SKY2 is not set |
| 474 | # CONFIG_SK98LIN is not set | ||
| 475 | # CONFIG_VIA_VELOCITY is not set | 435 | # CONFIG_VIA_VELOCITY is not set |
| 476 | # CONFIG_TIGON3 is not set | 436 | # CONFIG_TIGON3 is not set |
| 477 | # CONFIG_BNX2 is not set | 437 | # CONFIG_BNX2 is not set |
| @@ -503,15 +463,7 @@ CONFIG_NETDEV_10000=y | |||
| 503 | # CONFIG_NETCONSOLE is not set | 463 | # CONFIG_NETCONSOLE is not set |
| 504 | # CONFIG_NETPOLL is not set | 464 | # CONFIG_NETPOLL is not set |
| 505 | # CONFIG_NET_POLL_CONTROLLER is not set | 465 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 506 | |||
| 507 | # | ||
| 508 | # ISDN subsystem | ||
| 509 | # | ||
| 510 | # CONFIG_ISDN is not set | 466 | # CONFIG_ISDN is not set |
| 511 | |||
| 512 | # | ||
| 513 | # Telephony Support | ||
| 514 | # | ||
| 515 | # CONFIG_PHONE is not set | 467 | # CONFIG_PHONE is not set |
| 516 | 468 | ||
| 517 | # | 469 | # |
| @@ -573,10 +525,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 573 | CONFIG_UNIX98_PTYS=y | 525 | CONFIG_UNIX98_PTYS=y |
| 574 | CONFIG_LEGACY_PTYS=y | 526 | CONFIG_LEGACY_PTYS=y |
| 575 | CONFIG_LEGACY_PTY_COUNT=256 | 527 | CONFIG_LEGACY_PTY_COUNT=256 |
| 576 | |||
| 577 | # | ||
| 578 | # IPMI | ||
| 579 | # | ||
| 580 | # CONFIG_IPMI_HANDLER is not set | 528 | # CONFIG_IPMI_HANDLER is not set |
| 581 | CONFIG_WATCHDOG=y | 529 | CONFIG_WATCHDOG=y |
| 582 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 530 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -601,10 +549,6 @@ CONFIG_GEN_RTC=y | |||
| 601 | # CONFIG_AGP is not set | 549 | # CONFIG_AGP is not set |
| 602 | # CONFIG_DRM is not set | 550 | # CONFIG_DRM is not set |
| 603 | # CONFIG_RAW_DRIVER is not set | 551 | # CONFIG_RAW_DRIVER is not set |
| 604 | |||
| 605 | # | ||
| 606 | # TPM devices | ||
| 607 | # | ||
| 608 | # CONFIG_TCG_TPM is not set | 552 | # CONFIG_TCG_TPM is not set |
| 609 | CONFIG_DEVPORT=y | 553 | CONFIG_DEVPORT=y |
| 610 | CONFIG_I2C=y | 554 | CONFIG_I2C=y |
| @@ -639,6 +583,7 @@ CONFIG_I2C_MPC=y | |||
| 639 | # CONFIG_I2C_SIS5595 is not set | 583 | # CONFIG_I2C_SIS5595 is not set |
| 640 | # CONFIG_I2C_SIS630 is not set | 584 | # CONFIG_I2C_SIS630 is not set |
| 641 | # CONFIG_I2C_SIS96X is not set | 585 | # CONFIG_I2C_SIS96X is not set |
| 586 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 642 | # CONFIG_I2C_STUB is not set | 587 | # CONFIG_I2C_STUB is not set |
| 643 | # CONFIG_I2C_VIA is not set | 588 | # CONFIG_I2C_VIA is not set |
| 644 | # CONFIG_I2C_VIAPRO is not set | 589 | # CONFIG_I2C_VIAPRO is not set |
| @@ -649,12 +594,14 @@ CONFIG_I2C_MPC=y | |||
| 649 | # | 594 | # |
| 650 | # CONFIG_SENSORS_DS1337 is not set | 595 | # CONFIG_SENSORS_DS1337 is not set |
| 651 | # CONFIG_SENSORS_DS1374 is not set | 596 | # CONFIG_SENSORS_DS1374 is not set |
| 597 | # CONFIG_DS1682 is not set | ||
| 652 | # CONFIG_SENSORS_EEPROM is not set | 598 | # CONFIG_SENSORS_EEPROM is not set |
| 653 | # CONFIG_SENSORS_PCF8574 is not set | 599 | # CONFIG_SENSORS_PCF8574 is not set |
| 654 | # CONFIG_SENSORS_PCA9539 is not set | 600 | # CONFIG_SENSORS_PCA9539 is not set |
| 655 | # CONFIG_SENSORS_PCF8591 is not set | 601 | # CONFIG_SENSORS_PCF8591 is not set |
| 656 | # CONFIG_SENSORS_M41T00 is not set | 602 | # CONFIG_SENSORS_M41T00 is not set |
| 657 | # CONFIG_SENSORS_MAX6875 is not set | 603 | # CONFIG_SENSORS_MAX6875 is not set |
| 604 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 658 | # CONFIG_I2C_DEBUG_CORE is not set | 605 | # CONFIG_I2C_DEBUG_CORE is not set |
| 659 | # CONFIG_I2C_DEBUG_ALGO is not set | 606 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 660 | # CONFIG_I2C_DEBUG_BUS is not set | 607 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -665,14 +612,12 @@ CONFIG_I2C_MPC=y | |||
| 665 | # | 612 | # |
| 666 | # CONFIG_SPI is not set | 613 | # CONFIG_SPI is not set |
| 667 | # CONFIG_SPI_MASTER is not set | 614 | # CONFIG_SPI_MASTER is not set |
| 668 | |||
| 669 | # | ||
| 670 | # Dallas's 1-wire bus | ||
| 671 | # | ||
| 672 | # CONFIG_W1 is not set | 615 | # CONFIG_W1 is not set |
| 616 | # CONFIG_POWER_SUPPLY is not set | ||
| 673 | CONFIG_HWMON=y | 617 | CONFIG_HWMON=y |
| 674 | # CONFIG_HWMON_VID is not set | 618 | # CONFIG_HWMON_VID is not set |
| 675 | # CONFIG_SENSORS_ABITUGURU is not set | 619 | # CONFIG_SENSORS_ABITUGURU is not set |
| 620 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 676 | # CONFIG_SENSORS_AD7418 is not set | 621 | # CONFIG_SENSORS_AD7418 is not set |
| 677 | # CONFIG_SENSORS_ADM1021 is not set | 622 | # CONFIG_SENSORS_ADM1021 is not set |
| 678 | # CONFIG_SENSORS_ADM1025 is not set | 623 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -699,14 +644,17 @@ CONFIG_HWMON=y | |||
| 699 | # CONFIG_SENSORS_LM87 is not set | 644 | # CONFIG_SENSORS_LM87 is not set |
| 700 | # CONFIG_SENSORS_LM90 is not set | 645 | # CONFIG_SENSORS_LM90 is not set |
| 701 | # CONFIG_SENSORS_LM92 is not set | 646 | # CONFIG_SENSORS_LM92 is not set |
| 647 | # CONFIG_SENSORS_LM93 is not set | ||
| 702 | # CONFIG_SENSORS_MAX1619 is not set | 648 | # CONFIG_SENSORS_MAX1619 is not set |
| 703 | # CONFIG_SENSORS_MAX6650 is not set | 649 | # CONFIG_SENSORS_MAX6650 is not set |
| 704 | # CONFIG_SENSORS_PC87360 is not set | 650 | # CONFIG_SENSORS_PC87360 is not set |
| 705 | # CONFIG_SENSORS_PC87427 is not set | 651 | # CONFIG_SENSORS_PC87427 is not set |
| 706 | # CONFIG_SENSORS_SIS5595 is not set | 652 | # CONFIG_SENSORS_SIS5595 is not set |
| 653 | # CONFIG_SENSORS_DME1737 is not set | ||
| 707 | # CONFIG_SENSORS_SMSC47M1 is not set | 654 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 708 | # CONFIG_SENSORS_SMSC47M192 is not set | 655 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 709 | # CONFIG_SENSORS_SMSC47B397 is not set | 656 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 657 | # CONFIG_SENSORS_THMC50 is not set | ||
| 710 | # CONFIG_SENSORS_VIA686A is not set | 658 | # CONFIG_SENSORS_VIA686A is not set |
| 711 | # CONFIG_SENSORS_VT1211 is not set | 659 | # CONFIG_SENSORS_VT1211 is not set |
| 712 | # CONFIG_SENSORS_VT8231 is not set | 660 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -741,6 +689,7 @@ CONFIG_DAB=y | |||
| 741 | # | 689 | # |
| 742 | # CONFIG_DISPLAY_SUPPORT is not set | 690 | # CONFIG_DISPLAY_SUPPORT is not set |
| 743 | # CONFIG_VGASTATE is not set | 691 | # CONFIG_VGASTATE is not set |
| 692 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 744 | # CONFIG_FB is not set | 693 | # CONFIG_FB is not set |
| 745 | # CONFIG_FB_IBM_GXT4500 is not set | 694 | # CONFIG_FB_IBM_GXT4500 is not set |
| 746 | 695 | ||
| @@ -748,20 +697,16 @@ CONFIG_DAB=y | |||
| 748 | # Sound | 697 | # Sound |
| 749 | # | 698 | # |
| 750 | # CONFIG_SOUND is not set | 699 | # CONFIG_SOUND is not set |
| 751 | 700 | CONFIG_HID_SUPPORT=y | |
| 752 | # | ||
| 753 | # HID Devices | ||
| 754 | # | ||
| 755 | CONFIG_HID=y | 701 | CONFIG_HID=y |
| 756 | # CONFIG_HID_DEBUG is not set | 702 | # CONFIG_HID_DEBUG is not set |
| 757 | 703 | CONFIG_USB_SUPPORT=y | |
| 758 | # | ||
| 759 | # USB support | ||
| 760 | # | ||
| 761 | CONFIG_USB_ARCH_HAS_HCD=y | 704 | CONFIG_USB_ARCH_HAS_HCD=y |
| 762 | CONFIG_USB_ARCH_HAS_OHCI=y | 705 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 763 | CONFIG_USB_ARCH_HAS_EHCI=y | 706 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 764 | # CONFIG_USB is not set | 707 | # CONFIG_USB is not set |
| 708 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | ||
| 709 | CONFIG_USB_EHCI_FSL=y | ||
| 765 | 710 | ||
| 766 | # | 711 | # |
| 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -772,32 +717,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 772 | # | 717 | # |
| 773 | # CONFIG_USB_GADGET is not set | 718 | # CONFIG_USB_GADGET is not set |
| 774 | # CONFIG_MMC is not set | 719 | # CONFIG_MMC is not set |
| 775 | |||
| 776 | # | ||
| 777 | # LED devices | ||
| 778 | # | ||
| 779 | # CONFIG_NEW_LEDS is not set | 720 | # CONFIG_NEW_LEDS is not set |
| 780 | |||
| 781 | # | ||
| 782 | # LED drivers | ||
| 783 | # | ||
| 784 | |||
| 785 | # | ||
| 786 | # LED Triggers | ||
| 787 | # | ||
| 788 | |||
| 789 | # | ||
| 790 | # InfiniBand support | ||
| 791 | # | ||
| 792 | # CONFIG_INFINIBAND is not set | 721 | # CONFIG_INFINIBAND is not set |
| 793 | 722 | # CONFIG_EDAC is not set | |
| 794 | # | ||
| 795 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 796 | # | ||
| 797 | |||
| 798 | # | ||
| 799 | # Real Time Clock | ||
| 800 | # | ||
| 801 | # CONFIG_RTC_CLASS is not set | 723 | # CONFIG_RTC_CLASS is not set |
| 802 | 724 | ||
| 803 | # | 725 | # |
| @@ -814,6 +736,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 814 | # | 736 | # |
| 815 | 737 | ||
| 816 | # | 738 | # |
| 739 | # Userspace I/O | ||
| 740 | # | ||
| 741 | # CONFIG_UIO is not set | ||
| 742 | |||
| 743 | # | ||
| 817 | # File systems | 744 | # File systems |
| 818 | # | 745 | # |
| 819 | CONFIG_EXT2_FS=y | 746 | CONFIG_EXT2_FS=y |
| @@ -909,7 +836,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 909 | # CONFIG_NCP_FS is not set | 836 | # CONFIG_NCP_FS is not set |
| 910 | # CONFIG_CODA_FS is not set | 837 | # CONFIG_CODA_FS is not set |
| 911 | # CONFIG_AFS_FS is not set | 838 | # CONFIG_AFS_FS is not set |
| 912 | # CONFIG_9P_FS is not set | ||
| 913 | 839 | ||
| 914 | # | 840 | # |
| 915 | # Partition Types | 841 | # Partition Types |
| @@ -948,6 +874,7 @@ CONFIG_BITREVERSE=y | |||
| 948 | # CONFIG_CRC16 is not set | 874 | # CONFIG_CRC16 is not set |
| 949 | # CONFIG_CRC_ITU_T is not set | 875 | # CONFIG_CRC_ITU_T is not set |
| 950 | CONFIG_CRC32=y | 876 | CONFIG_CRC32=y |
| 877 | # CONFIG_CRC7 is not set | ||
| 951 | # CONFIG_LIBCRC32C is not set | 878 | # CONFIG_LIBCRC32C is not set |
| 952 | CONFIG_PLIST=y | 879 | CONFIG_PLIST=y |
| 953 | CONFIG_HAS_IOMEM=y | 880 | CONFIG_HAS_IOMEM=y |
| @@ -970,7 +897,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 970 | # CONFIG_HEADERS_CHECK is not set | 897 | # CONFIG_HEADERS_CHECK is not set |
| 971 | # CONFIG_DEBUG_KERNEL is not set | 898 | # CONFIG_DEBUG_KERNEL is not set |
| 972 | # CONFIG_DEBUG_BUGVERBOSE is not set | 899 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 973 | # CONFIG_BOOTX_TEXT is not set | ||
| 974 | # CONFIG_PPC_EARLY_DEBUG is not set | 900 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 975 | 901 | ||
| 976 | # | 902 | # |
| @@ -978,10 +904,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 978 | # | 904 | # |
| 979 | # CONFIG_KEYS is not set | 905 | # CONFIG_KEYS is not set |
| 980 | # CONFIG_SECURITY is not set | 906 | # CONFIG_SECURITY is not set |
| 981 | |||
| 982 | # | ||
| 983 | # Cryptographic options | ||
| 984 | # | ||
| 985 | CONFIG_CRYPTO=y | 907 | CONFIG_CRYPTO=y |
| 986 | CONFIG_CRYPTO_ALGAPI=y | 908 | CONFIG_CRYPTO_ALGAPI=y |
| 987 | CONFIG_CRYPTO_BLKCIPHER=y | 909 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1019,7 +941,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1019 | # CONFIG_CRYPTO_CRC32C is not set | 941 | # CONFIG_CRYPTO_CRC32C is not set |
| 1020 | # CONFIG_CRYPTO_CAMELLIA is not set | 942 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1021 | # CONFIG_CRYPTO_TEST is not set | 943 | # CONFIG_CRYPTO_TEST is not set |
| 1022 | 944 | CONFIG_CRYPTO_HW=y | |
| 1023 | # | ||
| 1024 | # Hardware crypto devices | ||
| 1025 | # | ||
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig index bcbbc167f90d..3045749d62fe 100644 --- a/arch/powerpc/configs/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/mpc836x_mds_defconfig | |||
| @@ -1,9 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:57 2007 | 4 | # Tue Aug 28 21:24:42 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_83xx=y | ||
| 18 | CONFIG_PPC_FPU=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 7 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -14,61 +30,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 45 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | CONFIG_PPC_83xx=y | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_83xx=y | ||
| 43 | CONFIG_PPC_FPU=y | ||
| 44 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 45 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 49 | ||
| 52 | # | 50 | # |
| 53 | # Code maturity level options | 51 | # General setup |
| 54 | # | 52 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 54 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 67 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -100,24 +93,17 @@ CONFIG_SLAB=y | |||
| 100 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
| 101 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
| 102 | CONFIG_BASE_SMALL=0 | 95 | CONFIG_BASE_SMALL=0 |
| 103 | |||
| 104 | # | ||
| 105 | # Loadable module support | ||
| 106 | # | ||
| 107 | CONFIG_MODULES=y | 96 | CONFIG_MODULES=y |
| 108 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 110 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 111 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 112 | # CONFIG_KMOD is not set | 101 | # CONFIG_KMOD is not set |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 102 | CONFIG_BLOCK=y |
| 118 | # CONFIG_LBD is not set | 103 | # CONFIG_LBD is not set |
| 119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 104 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 120 | # CONFIG_LSF is not set | 105 | # CONFIG_LSF is not set |
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 121 | 107 | ||
| 122 | # | 108 | # |
| 123 | # IO Schedulers | 109 | # IO Schedulers |
| @@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 121 | # |
| 136 | # Platform support | 122 | # Platform support |
| 137 | # | 123 | # |
| 124 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 125 | # CONFIG_EMBEDDED6xx is not set | ||
| 126 | # CONFIG_PPC_82xx is not set | ||
| 127 | CONFIG_PPC_83xx=y | ||
| 128 | # CONFIG_PPC_86xx is not set | ||
| 138 | # CONFIG_PPC_MPC52xx is not set | 129 | # CONFIG_PPC_MPC52xx is not set |
| 139 | # CONFIG_PPC_MPC5200 is not set | 130 | # CONFIG_PPC_MPC5200 is not set |
| 140 | # CONFIG_PPC_CELL is not set | 131 | # CONFIG_PPC_CELL is not set |
| @@ -159,6 +150,7 @@ CONFIG_PPC_MPC836x=y | |||
| 159 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 160 | CONFIG_QUICC_ENGINE=y | 151 | CONFIG_QUICC_ENGINE=y |
| 161 | # CONFIG_CPM2 is not set | 152 | # CONFIG_CPM2 is not set |
| 153 | # CONFIG_FSL_ULI1575 is not set | ||
| 162 | 154 | ||
| 163 | # | 155 | # |
| 164 | # Kernel options | 156 | # Kernel options |
| @@ -187,6 +179,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 187 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 179 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 188 | # CONFIG_RESOURCES_64BIT is not set | 180 | # CONFIG_RESOURCES_64BIT is not set |
| 189 | CONFIG_ZONE_DMA_FLAG=1 | 181 | CONFIG_ZONE_DMA_FLAG=1 |
| 182 | CONFIG_BOUNCE=y | ||
| 183 | CONFIG_VIRT_TO_BUS=y | ||
| 190 | CONFIG_PROC_DEVICETREE=y | 184 | CONFIG_PROC_DEVICETREE=y |
| 191 | # CONFIG_CMDLINE_BOOL is not set | 185 | # CONFIG_CMDLINE_BOOL is not set |
| 192 | # CONFIG_PM is not set | 186 | # CONFIG_PM is not set |
| @@ -201,10 +195,10 @@ CONFIG_ISA_DMA_API=y | |||
| 201 | CONFIG_ZONE_DMA=y | 195 | CONFIG_ZONE_DMA=y |
| 202 | CONFIG_GENERIC_ISA_DMA=y | 196 | CONFIG_GENERIC_ISA_DMA=y |
| 203 | CONFIG_PPC_INDIRECT_PCI=y | 197 | CONFIG_PPC_INDIRECT_PCI=y |
| 204 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 205 | CONFIG_FSL_SOC=y | 198 | CONFIG_FSL_SOC=y |
| 206 | CONFIG_PCI=y | 199 | CONFIG_PCI=y |
| 207 | CONFIG_PCI_DOMAINS=y | 200 | CONFIG_PCI_DOMAINS=y |
| 201 | CONFIG_PCI_SYSCALL=y | ||
| 208 | # CONFIG_PCIEPORTBUS is not set | 202 | # CONFIG_PCIEPORTBUS is not set |
| 209 | CONFIG_ARCH_SUPPORTS_MSI=y | 203 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 210 | # CONFIG_PCI_MSI is not set | 204 | # CONFIG_PCI_MSI is not set |
| @@ -314,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 314 | # CONFIG_MAC80211 is not set | 308 | # CONFIG_MAC80211 is not set |
| 315 | # CONFIG_IEEE80211 is not set | 309 | # CONFIG_IEEE80211 is not set |
| 316 | # CONFIG_RFKILL is not set | 310 | # CONFIG_RFKILL is not set |
| 311 | # CONFIG_NET_9P is not set | ||
| 317 | 312 | ||
| 318 | # | 313 | # |
| 319 | # Device Drivers | 314 | # Device Drivers |
| @@ -326,26 +321,11 @@ CONFIG_STANDALONE=y | |||
| 326 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 321 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 327 | # CONFIG_FW_LOADER is not set | 322 | # CONFIG_FW_LOADER is not set |
| 328 | # CONFIG_SYS_HYPERVISOR is not set | 323 | # CONFIG_SYS_HYPERVISOR is not set |
| 329 | |||
| 330 | # | ||
| 331 | # Connector - unified userspace <-> kernelspace linker | ||
| 332 | # | ||
| 333 | # CONFIG_CONNECTOR is not set | 324 | # CONFIG_CONNECTOR is not set |
| 334 | # CONFIG_MTD is not set | 325 | # CONFIG_MTD is not set |
| 335 | 326 | CONFIG_OF_DEVICE=y | |
| 336 | # | ||
| 337 | # Parallel port support | ||
| 338 | # | ||
| 339 | # CONFIG_PARPORT is not set | 327 | # CONFIG_PARPORT is not set |
| 340 | 328 | CONFIG_BLK_DEV=y | |
| 341 | # | ||
| 342 | # Plug and Play support | ||
| 343 | # | ||
| 344 | # CONFIG_PNPACPI is not set | ||
| 345 | |||
| 346 | # | ||
| 347 | # Block devices | ||
| 348 | # | ||
| 349 | # CONFIG_BLK_DEV_FD is not set | 329 | # CONFIG_BLK_DEV_FD is not set |
| 350 | # CONFIG_BLK_CPQ_DA is not set | 330 | # CONFIG_BLK_CPQ_DA is not set |
| 351 | # CONFIG_BLK_CPQ_CISS_DA is not set | 331 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -362,14 +342,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 362 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 342 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 363 | # CONFIG_CDROM_PKTCDVD is not set | 343 | # CONFIG_CDROM_PKTCDVD is not set |
| 364 | # CONFIG_ATA_OVER_ETH is not set | 344 | # CONFIG_ATA_OVER_ETH is not set |
| 365 | 345 | CONFIG_MISC_DEVICES=y | |
| 366 | # | ||
| 367 | # Misc devices | ||
| 368 | # | ||
| 369 | # CONFIG_PHANTOM is not set | 346 | # CONFIG_PHANTOM is not set |
| 347 | # CONFIG_EEPROM_93CX6 is not set | ||
| 370 | # CONFIG_SGI_IOC4 is not set | 348 | # CONFIG_SGI_IOC4 is not set |
| 371 | # CONFIG_TIFM_CORE is not set | 349 | # CONFIG_TIFM_CORE is not set |
| 372 | # CONFIG_BLINK is not set | ||
| 373 | # CONFIG_IDE is not set | 350 | # CONFIG_IDE is not set |
| 374 | 351 | ||
| 375 | # | 352 | # |
| @@ -377,6 +354,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 377 | # | 354 | # |
| 378 | # CONFIG_RAID_ATTRS is not set | 355 | # CONFIG_RAID_ATTRS is not set |
| 379 | CONFIG_SCSI=y | 356 | CONFIG_SCSI=y |
| 357 | CONFIG_SCSI_DMA=y | ||
| 380 | # CONFIG_SCSI_TGT is not set | 358 | # CONFIG_SCSI_TGT is not set |
| 381 | # CONFIG_SCSI_NETLINK is not set | 359 | # CONFIG_SCSI_NETLINK is not set |
| 382 | CONFIG_SCSI_PROC_FS=y | 360 | CONFIG_SCSI_PROC_FS=y |
| @@ -406,12 +384,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 406 | # CONFIG_SCSI_SPI_ATTRS is not set | 384 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 407 | # CONFIG_SCSI_FC_ATTRS is not set | 385 | # CONFIG_SCSI_FC_ATTRS is not set |
| 408 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 386 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 409 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 410 | # CONFIG_SCSI_SAS_LIBSAS is not set | 387 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 411 | 388 | CONFIG_SCSI_LOWLEVEL=y | |
| 412 | # | ||
| 413 | # SCSI low-level drivers | ||
| 414 | # | ||
| 415 | # CONFIG_ISCSI_TCP is not set | 389 | # CONFIG_ISCSI_TCP is not set |
| 416 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 390 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 417 | # CONFIG_SCSI_3W_9XXX is not set | 391 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -447,10 +421,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 447 | # CONFIG_SCSI_DEBUG is not set | 421 | # CONFIG_SCSI_DEBUG is not set |
| 448 | # CONFIG_SCSI_SRP is not set | 422 | # CONFIG_SCSI_SRP is not set |
| 449 | # CONFIG_ATA is not set | 423 | # CONFIG_ATA is not set |
| 450 | |||
| 451 | # | ||
| 452 | # Multi-device support (RAID and LVM) | ||
| 453 | # | ||
| 454 | # CONFIG_MD is not set | 424 | # CONFIG_MD is not set |
| 455 | 425 | ||
| 456 | # | 426 | # |
| @@ -466,19 +436,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 466 | # | 436 | # |
| 467 | # CONFIG_FIREWIRE is not set | 437 | # CONFIG_FIREWIRE is not set |
| 468 | # CONFIG_IEEE1394 is not set | 438 | # CONFIG_IEEE1394 is not set |
| 469 | |||
| 470 | # | ||
| 471 | # I2O device support | ||
| 472 | # | ||
| 473 | # CONFIG_I2O is not set | 439 | # CONFIG_I2O is not set |
| 474 | # CONFIG_MACINTOSH_DRIVERS is not set | 440 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 475 | |||
| 476 | # | ||
| 477 | # Network device support | ||
| 478 | # | ||
| 479 | CONFIG_NETDEVICES=y | 441 | CONFIG_NETDEVICES=y |
| 442 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 480 | # CONFIG_DUMMY is not set | 443 | # CONFIG_DUMMY is not set |
| 481 | # CONFIG_BONDING is not set | 444 | # CONFIG_BONDING is not set |
| 445 | # CONFIG_MACVLAN is not set | ||
| 482 | # CONFIG_EQUALIZER is not set | 446 | # CONFIG_EQUALIZER is not set |
| 483 | # CONFIG_TUN is not set | 447 | # CONFIG_TUN is not set |
| 484 | # CONFIG_ARCNET is not set | 448 | # CONFIG_ARCNET is not set |
| @@ -495,21 +459,14 @@ CONFIG_MARVELL_PHY=y | |||
| 495 | # CONFIG_VITESSE_PHY is not set | 459 | # CONFIG_VITESSE_PHY is not set |
| 496 | # CONFIG_SMSC_PHY is not set | 460 | # CONFIG_SMSC_PHY is not set |
| 497 | # CONFIG_BROADCOM_PHY is not set | 461 | # CONFIG_BROADCOM_PHY is not set |
| 462 | # CONFIG_ICPLUS_PHY is not set | ||
| 498 | # CONFIG_FIXED_PHY is not set | 463 | # CONFIG_FIXED_PHY is not set |
| 499 | |||
| 500 | # | ||
| 501 | # Ethernet (10 or 100Mbit) | ||
| 502 | # | ||
| 503 | CONFIG_NET_ETHERNET=y | 464 | CONFIG_NET_ETHERNET=y |
| 504 | CONFIG_MII=y | 465 | CONFIG_MII=y |
| 505 | # CONFIG_HAPPYMEAL is not set | 466 | # CONFIG_HAPPYMEAL is not set |
| 506 | # CONFIG_SUNGEM is not set | 467 | # CONFIG_SUNGEM is not set |
| 507 | # CONFIG_CASSINI is not set | 468 | # CONFIG_CASSINI is not set |
| 508 | # CONFIG_NET_VENDOR_3COM is not set | 469 | # CONFIG_NET_VENDOR_3COM is not set |
| 509 | |||
| 510 | # | ||
| 511 | # Tulip family network device support | ||
| 512 | # | ||
| 513 | # CONFIG_NET_TULIP is not set | 470 | # CONFIG_NET_TULIP is not set |
| 514 | # CONFIG_HP100 is not set | 471 | # CONFIG_HP100 is not set |
| 515 | # CONFIG_NET_PCI is not set | 472 | # CONFIG_NET_PCI is not set |
| @@ -524,7 +481,6 @@ CONFIG_NETDEV_1000=y | |||
| 524 | # CONFIG_SIS190 is not set | 481 | # CONFIG_SIS190 is not set |
| 525 | # CONFIG_SKGE is not set | 482 | # CONFIG_SKGE is not set |
| 526 | # CONFIG_SKY2 is not set | 483 | # CONFIG_SKY2 is not set |
| 527 | # CONFIG_SK98LIN is not set | ||
| 528 | # CONFIG_VIA_VELOCITY is not set | 484 | # CONFIG_VIA_VELOCITY is not set |
| 529 | # CONFIG_TIGON3 is not set | 485 | # CONFIG_TIGON3 is not set |
| 530 | # CONFIG_BNX2 is not set | 486 | # CONFIG_BNX2 is not set |
| @@ -561,15 +517,7 @@ CONFIG_NETDEV_10000=y | |||
| 561 | # CONFIG_NETCONSOLE is not set | 517 | # CONFIG_NETCONSOLE is not set |
| 562 | # CONFIG_NETPOLL is not set | 518 | # CONFIG_NETPOLL is not set |
| 563 | # CONFIG_NET_POLL_CONTROLLER is not set | 519 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 564 | |||
| 565 | # | ||
| 566 | # ISDN subsystem | ||
| 567 | # | ||
| 568 | # CONFIG_ISDN is not set | 520 | # CONFIG_ISDN is not set |
| 569 | |||
| 570 | # | ||
| 571 | # Telephony Support | ||
| 572 | # | ||
| 573 | # CONFIG_PHONE is not set | 521 | # CONFIG_PHONE is not set |
| 574 | 522 | ||
| 575 | # | 523 | # |
| @@ -631,10 +579,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 631 | CONFIG_UNIX98_PTYS=y | 579 | CONFIG_UNIX98_PTYS=y |
| 632 | CONFIG_LEGACY_PTYS=y | 580 | CONFIG_LEGACY_PTYS=y |
| 633 | CONFIG_LEGACY_PTY_COUNT=256 | 581 | CONFIG_LEGACY_PTY_COUNT=256 |
| 634 | |||
| 635 | # | ||
| 636 | # IPMI | ||
| 637 | # | ||
| 638 | # CONFIG_IPMI_HANDLER is not set | 582 | # CONFIG_IPMI_HANDLER is not set |
| 639 | CONFIG_WATCHDOG=y | 583 | CONFIG_WATCHDOG=y |
| 640 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 584 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| @@ -659,10 +603,6 @@ CONFIG_GEN_RTC=y | |||
| 659 | # CONFIG_AGP is not set | 603 | # CONFIG_AGP is not set |
| 660 | # CONFIG_DRM is not set | 604 | # CONFIG_DRM is not set |
| 661 | # CONFIG_RAW_DRIVER is not set | 605 | # CONFIG_RAW_DRIVER is not set |
| 662 | |||
| 663 | # | ||
| 664 | # TPM devices | ||
| 665 | # | ||
| 666 | # CONFIG_TCG_TPM is not set | 606 | # CONFIG_TCG_TPM is not set |
| 667 | CONFIG_DEVPORT=y | 607 | CONFIG_DEVPORT=y |
| 668 | CONFIG_I2C=y | 608 | CONFIG_I2C=y |
| @@ -697,6 +637,7 @@ CONFIG_I2C_MPC=y | |||
| 697 | # CONFIG_I2C_SIS5595 is not set | 637 | # CONFIG_I2C_SIS5595 is not set |
| 698 | # CONFIG_I2C_SIS630 is not set | 638 | # CONFIG_I2C_SIS630 is not set |
| 699 | # CONFIG_I2C_SIS96X is not set | 639 | # CONFIG_I2C_SIS96X is not set |
| 640 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 700 | # CONFIG_I2C_STUB is not set | 641 | # CONFIG_I2C_STUB is not set |
| 701 | # CONFIG_I2C_VIA is not set | 642 | # CONFIG_I2C_VIA is not set |
| 702 | # CONFIG_I2C_VIAPRO is not set | 643 | # CONFIG_I2C_VIAPRO is not set |
| @@ -707,12 +648,14 @@ CONFIG_I2C_MPC=y | |||
| 707 | # | 648 | # |
| 708 | # CONFIG_SENSORS_DS1337 is not set | 649 | # CONFIG_SENSORS_DS1337 is not set |
| 709 | # CONFIG_SENSORS_DS1374 is not set | 650 | # CONFIG_SENSORS_DS1374 is not set |
| 651 | # CONFIG_DS1682 is not set | ||
| 710 | # CONFIG_SENSORS_EEPROM is not set | 652 | # CONFIG_SENSORS_EEPROM is not set |
| 711 | # CONFIG_SENSORS_PCF8574 is not set | 653 | # CONFIG_SENSORS_PCF8574 is not set |
| 712 | # CONFIG_SENSORS_PCA9539 is not set | 654 | # CONFIG_SENSORS_PCA9539 is not set |
| 713 | # CONFIG_SENSORS_PCF8591 is not set | 655 | # CONFIG_SENSORS_PCF8591 is not set |
| 714 | # CONFIG_SENSORS_M41T00 is not set | 656 | # CONFIG_SENSORS_M41T00 is not set |
| 715 | # CONFIG_SENSORS_MAX6875 is not set | 657 | # CONFIG_SENSORS_MAX6875 is not set |
| 658 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 716 | # CONFIG_I2C_DEBUG_CORE is not set | 659 | # CONFIG_I2C_DEBUG_CORE is not set |
| 717 | # CONFIG_I2C_DEBUG_ALGO is not set | 660 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 718 | # CONFIG_I2C_DEBUG_BUS is not set | 661 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -723,14 +666,12 @@ CONFIG_I2C_MPC=y | |||
| 723 | # | 666 | # |
| 724 | # CONFIG_SPI is not set | 667 | # CONFIG_SPI is not set |
| 725 | # CONFIG_SPI_MASTER is not set | 668 | # CONFIG_SPI_MASTER is not set |
| 726 | |||
| 727 | # | ||
| 728 | # Dallas's 1-wire bus | ||
| 729 | # | ||
| 730 | # CONFIG_W1 is not set | 669 | # CONFIG_W1 is not set |
| 670 | # CONFIG_POWER_SUPPLY is not set | ||
| 731 | CONFIG_HWMON=y | 671 | CONFIG_HWMON=y |
| 732 | # CONFIG_HWMON_VID is not set | 672 | # CONFIG_HWMON_VID is not set |
| 733 | # CONFIG_SENSORS_ABITUGURU is not set | 673 | # CONFIG_SENSORS_ABITUGURU is not set |
| 674 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 734 | # CONFIG_SENSORS_AD7418 is not set | 675 | # CONFIG_SENSORS_AD7418 is not set |
| 735 | # CONFIG_SENSORS_ADM1021 is not set | 676 | # CONFIG_SENSORS_ADM1021 is not set |
| 736 | # CONFIG_SENSORS_ADM1025 is not set | 677 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -757,14 +698,17 @@ CONFIG_HWMON=y | |||
| 757 | # CONFIG_SENSORS_LM87 is not set | 698 | # CONFIG_SENSORS_LM87 is not set |
| 758 | # CONFIG_SENSORS_LM90 is not set | 699 | # CONFIG_SENSORS_LM90 is not set |
| 759 | # CONFIG_SENSORS_LM92 is not set | 700 | # CONFIG_SENSORS_LM92 is not set |
| 701 | # CONFIG_SENSORS_LM93 is not set | ||
| 760 | # CONFIG_SENSORS_MAX1619 is not set | 702 | # CONFIG_SENSORS_MAX1619 is not set |
| 761 | # CONFIG_SENSORS_MAX6650 is not set | 703 | # CONFIG_SENSORS_MAX6650 is not set |
| 762 | # CONFIG_SENSORS_PC87360 is not set | 704 | # CONFIG_SENSORS_PC87360 is not set |
| 763 | # CONFIG_SENSORS_PC87427 is not set | 705 | # CONFIG_SENSORS_PC87427 is not set |
| 764 | # CONFIG_SENSORS_SIS5595 is not set | 706 | # CONFIG_SENSORS_SIS5595 is not set |
| 707 | # CONFIG_SENSORS_DME1737 is not set | ||
| 765 | # CONFIG_SENSORS_SMSC47M1 is not set | 708 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 766 | # CONFIG_SENSORS_SMSC47M192 is not set | 709 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 767 | # CONFIG_SENSORS_SMSC47B397 is not set | 710 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 711 | # CONFIG_SENSORS_THMC50 is not set | ||
| 768 | # CONFIG_SENSORS_VIA686A is not set | 712 | # CONFIG_SENSORS_VIA686A is not set |
| 769 | # CONFIG_SENSORS_VT1211 is not set | 713 | # CONFIG_SENSORS_VT1211 is not set |
| 770 | # CONFIG_SENSORS_VT8231 is not set | 714 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -799,6 +743,7 @@ CONFIG_DAB=y | |||
| 799 | # | 743 | # |
| 800 | # CONFIG_DISPLAY_SUPPORT is not set | 744 | # CONFIG_DISPLAY_SUPPORT is not set |
| 801 | # CONFIG_VGASTATE is not set | 745 | # CONFIG_VGASTATE is not set |
| 746 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 802 | # CONFIG_FB is not set | 747 | # CONFIG_FB is not set |
| 803 | # CONFIG_FB_IBM_GXT4500 is not set | 748 | # CONFIG_FB_IBM_GXT4500 is not set |
| 804 | 749 | ||
| @@ -806,16 +751,10 @@ CONFIG_DAB=y | |||
| 806 | # Sound | 751 | # Sound |
| 807 | # | 752 | # |
| 808 | # CONFIG_SOUND is not set | 753 | # CONFIG_SOUND is not set |
| 809 | 754 | CONFIG_HID_SUPPORT=y | |
| 810 | # | ||
| 811 | # HID Devices | ||
| 812 | # | ||
| 813 | CONFIG_HID=y | 755 | CONFIG_HID=y |
| 814 | # CONFIG_HID_DEBUG is not set | 756 | # CONFIG_HID_DEBUG is not set |
| 815 | 757 | CONFIG_USB_SUPPORT=y | |
| 816 | # | ||
| 817 | # USB support | ||
| 818 | # | ||
| 819 | CONFIG_USB_ARCH_HAS_HCD=y | 758 | CONFIG_USB_ARCH_HAS_HCD=y |
| 820 | CONFIG_USB_ARCH_HAS_OHCI=y | 759 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 821 | CONFIG_USB_ARCH_HAS_EHCI=y | 760 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -830,32 +769,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 830 | # | 769 | # |
| 831 | # CONFIG_USB_GADGET is not set | 770 | # CONFIG_USB_GADGET is not set |
| 832 | # CONFIG_MMC is not set | 771 | # CONFIG_MMC is not set |
| 833 | |||
| 834 | # | ||
| 835 | # LED devices | ||
| 836 | # | ||
| 837 | # CONFIG_NEW_LEDS is not set | 772 | # CONFIG_NEW_LEDS is not set |
| 838 | |||
| 839 | # | ||
| 840 | # LED drivers | ||
| 841 | # | ||
| 842 | |||
| 843 | # | ||
| 844 | # LED Triggers | ||
| 845 | # | ||
| 846 | |||
| 847 | # | ||
| 848 | # InfiniBand support | ||
| 849 | # | ||
| 850 | # CONFIG_INFINIBAND is not set | 773 | # CONFIG_INFINIBAND is not set |
| 851 | 774 | # CONFIG_EDAC is not set | |
| 852 | # | ||
| 853 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 854 | # | ||
| 855 | |||
| 856 | # | ||
| 857 | # Real Time Clock | ||
| 858 | # | ||
| 859 | # CONFIG_RTC_CLASS is not set | 775 | # CONFIG_RTC_CLASS is not set |
| 860 | 776 | ||
| 861 | # | 777 | # |
| @@ -872,6 +788,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 872 | # | 788 | # |
| 873 | 789 | ||
| 874 | # | 790 | # |
| 791 | # Userspace I/O | ||
| 792 | # | ||
| 793 | # CONFIG_UIO is not set | ||
| 794 | |||
| 795 | # | ||
| 875 | # File systems | 796 | # File systems |
| 876 | # | 797 | # |
| 877 | CONFIG_EXT2_FS=y | 798 | CONFIG_EXT2_FS=y |
| @@ -967,7 +888,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
| 967 | # CONFIG_NCP_FS is not set | 888 | # CONFIG_NCP_FS is not set |
| 968 | # CONFIG_CODA_FS is not set | 889 | # CONFIG_CODA_FS is not set |
| 969 | # CONFIG_AFS_FS is not set | 890 | # CONFIG_AFS_FS is not set |
| 970 | # CONFIG_9P_FS is not set | ||
| 971 | 891 | ||
| 972 | # | 892 | # |
| 973 | # Partition Types | 893 | # Partition Types |
| @@ -1008,6 +928,7 @@ CONFIG_BITREVERSE=y | |||
| 1008 | # CONFIG_CRC16 is not set | 928 | # CONFIG_CRC16 is not set |
| 1009 | # CONFIG_CRC_ITU_T is not set | 929 | # CONFIG_CRC_ITU_T is not set |
| 1010 | CONFIG_CRC32=y | 930 | CONFIG_CRC32=y |
| 931 | # CONFIG_CRC7 is not set | ||
| 1011 | # CONFIG_LIBCRC32C is not set | 932 | # CONFIG_LIBCRC32C is not set |
| 1012 | CONFIG_PLIST=y | 933 | CONFIG_PLIST=y |
| 1013 | CONFIG_HAS_IOMEM=y | 934 | CONFIG_HAS_IOMEM=y |
| @@ -1030,7 +951,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1030 | # CONFIG_HEADERS_CHECK is not set | 951 | # CONFIG_HEADERS_CHECK is not set |
| 1031 | # CONFIG_DEBUG_KERNEL is not set | 952 | # CONFIG_DEBUG_KERNEL is not set |
| 1032 | # CONFIG_DEBUG_BUGVERBOSE is not set | 953 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1033 | # CONFIG_BOOTX_TEXT is not set | ||
| 1034 | # CONFIG_PPC_EARLY_DEBUG is not set | 954 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1035 | 955 | ||
| 1036 | # | 956 | # |
| @@ -1038,10 +958,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1038 | # | 958 | # |
| 1039 | # CONFIG_KEYS is not set | 959 | # CONFIG_KEYS is not set |
| 1040 | # CONFIG_SECURITY is not set | 960 | # CONFIG_SECURITY is not set |
| 1041 | |||
| 1042 | # | ||
| 1043 | # Cryptographic options | ||
| 1044 | # | ||
| 1045 | CONFIG_CRYPTO=y | 961 | CONFIG_CRYPTO=y |
| 1046 | CONFIG_CRYPTO_ALGAPI=y | 962 | CONFIG_CRYPTO_ALGAPI=y |
| 1047 | CONFIG_CRYPTO_BLKCIPHER=y | 963 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1079,7 +995,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1079 | # CONFIG_CRYPTO_CRC32C is not set | 995 | # CONFIG_CRYPTO_CRC32C is not set |
| 1080 | # CONFIG_CRYPTO_CAMELLIA is not set | 996 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1081 | # CONFIG_CRYPTO_TEST is not set | 997 | # CONFIG_CRYPTO_TEST is not set |
| 1082 | 998 | CONFIG_CRYPTO_HW=y | |
| 1083 | # | ||
| 1084 | # Hardware crypto devices | ||
| 1085 | # | ||
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig index faedcf8d64a7..b282c3521dd5 100644 --- a/arch/powerpc/configs/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/mpc8540_ads_defconfig | |||
| @@ -1,9 +1,26 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:58 2007 | 4 | # Tue Aug 28 21:24:42 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | CONFIG_PPC_85xx=y | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_85xx=y | ||
| 18 | CONFIG_E500=y | ||
| 19 | CONFIG_BOOKE=y | ||
| 20 | CONFIG_FSL_BOOKE=y | ||
| 21 | # CONFIG_PHYS_64BIT is not set | ||
| 22 | CONFIG_SPE=y | ||
| 23 | # CONFIG_PPC_MM_SLICES is not set | ||
| 7 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| @@ -14,61 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 31 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 32 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 33 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 34 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 35 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 36 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 37 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 43 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 45 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 46 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | CONFIG_PPC_85xx=y | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_85xx=y | ||
| 42 | CONFIG_E500=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | CONFIG_BOOKE=y | ||
| 46 | CONFIG_FSL_BOOKE=y | ||
| 47 | # CONFIG_PHYS_64BIT is not set | ||
| 48 | CONFIG_SPE=y | ||
| 49 | # CONFIG_PPC_MM_SLICES is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 50 | ||
| 52 | # | 51 | # |
| 53 | # Code maturity level options | 52 | # General setup |
| 54 | # | 53 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 62 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 67 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 68 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -102,19 +96,12 @@ CONFIG_SLAB=y | |||
| 102 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
| 105 | |||
| 106 | # | ||
| 107 | # Loadable module support | ||
| 108 | # | ||
| 109 | # CONFIG_MODULES is not set | 99 | # CONFIG_MODULES is not set |
| 110 | |||
| 111 | # | ||
| 112 | # Block layer | ||
| 113 | # | ||
| 114 | CONFIG_BLOCK=y | 100 | CONFIG_BLOCK=y |
| 115 | # CONFIG_LBD is not set | 101 | # CONFIG_LBD is not set |
| 116 | # CONFIG_BLK_DEV_IO_TRACE is not set | 102 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 117 | # CONFIG_LSF is not set | 103 | # CONFIG_LSF is not set |
| 104 | # CONFIG_BLK_DEV_BSG is not set | ||
| 118 | 105 | ||
| 119 | # | 106 | # |
| 120 | # IO Schedulers | 107 | # IO Schedulers |
| @@ -155,6 +142,7 @@ CONFIG_MPIC=y | |||
| 155 | # CONFIG_GENERIC_IOMAP is not set | 142 | # CONFIG_GENERIC_IOMAP is not set |
| 156 | # CONFIG_CPU_FREQ is not set | 143 | # CONFIG_CPU_FREQ is not set |
| 157 | # CONFIG_CPM2 is not set | 144 | # CONFIG_CPM2 is not set |
| 145 | # CONFIG_FSL_ULI1575 is not set | ||
| 158 | 146 | ||
| 159 | # | 147 | # |
| 160 | # Kernel options | 148 | # Kernel options |
| @@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 184 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 185 | # CONFIG_RESOURCES_64BIT is not set | 173 | # CONFIG_RESOURCES_64BIT is not set |
| 186 | CONFIG_ZONE_DMA_FLAG=1 | 174 | CONFIG_ZONE_DMA_FLAG=1 |
| 175 | CONFIG_BOUNCE=y | ||
| 176 | CONFIG_VIRT_TO_BUS=y | ||
| 187 | CONFIG_PROC_DEVICETREE=y | 177 | CONFIG_PROC_DEVICETREE=y |
| 188 | # CONFIG_CMDLINE_BOOL is not set | 178 | # CONFIG_CMDLINE_BOOL is not set |
| 189 | # CONFIG_PM is not set | 179 | # CONFIG_PM is not set |
| @@ -197,10 +187,10 @@ CONFIG_ISA_DMA_API=y | |||
| 197 | # | 187 | # |
| 198 | CONFIG_ZONE_DMA=y | 188 | CONFIG_ZONE_DMA=y |
| 199 | CONFIG_PPC_INDIRECT_PCI=y | 189 | CONFIG_PPC_INDIRECT_PCI=y |
| 200 | CONFIG_PPC_INDIRECT_PCI_BE=y | ||
| 201 | CONFIG_FSL_SOC=y | 190 | CONFIG_FSL_SOC=y |
| 202 | # CONFIG_PCI is not set | 191 | # CONFIG_PCI is not set |
| 203 | # CONFIG_PCI_DOMAINS is not set | 192 | # CONFIG_PCI_DOMAINS is not set |
| 193 | # CONFIG_PCI_SYSCALL is not set | ||
| 204 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 194 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 205 | 195 | ||
| 206 | # | 196 | # |
| @@ -307,6 +297,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 307 | # CONFIG_MAC80211 is not set | 297 | # CONFIG_MAC80211 is not set |
| 308 | # CONFIG_IEEE80211 is not set | 298 | # CONFIG_IEEE80211 is not set |
| 309 | # CONFIG_RFKILL is not set | 299 | # CONFIG_RFKILL is not set |
| 300 | # CONFIG_NET_9P is not set | ||
| 310 | 301 | ||
| 311 | # | 302 | # |
| 312 | # Device Drivers | 303 | # Device Drivers |
| @@ -321,26 +312,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 321 | # CONFIG_DEBUG_DRIVER is not set | 312 | # CONFIG_DEBUG_DRIVER is not set |
| 322 | # CONFIG_DEBUG_DEVRES is not set | 313 | # CONFIG_DEBUG_DEVRES is not set |
| 323 | # CONFIG_SYS_HYPERVISOR is not set | 314 | # CONFIG_SYS_HYPERVISOR is not set |
| 324 | |||
| 325 | # | ||
| 326 | # Connector - unified userspace <-> kernelspace linker | ||
| 327 | # | ||
| 328 | # CONFIG_CONNECTOR is not set | 315 | # CONFIG_CONNECTOR is not set |
| 329 | # CONFIG_MTD is not set | 316 | # CONFIG_MTD is not set |
| 330 | 317 | CONFIG_OF_DEVICE=y | |
| 331 | # | ||
| 332 | # Parallel port support | ||
| 333 | # | ||
| 334 | # CONFIG_PARPORT is not set | 318 | # CONFIG_PARPORT is not set |
| 335 | 319 | CONFIG_BLK_DEV=y | |
| 336 | # | ||
| 337 | # Plug and Play support | ||
| 338 | # | ||
| 339 | # CONFIG_PNPACPI is not set | ||
| 340 | |||
| 341 | # | ||
| 342 | # Block devices | ||
| 343 | # | ||
| 344 | # CONFIG_BLK_DEV_FD is not set | 320 | # CONFIG_BLK_DEV_FD is not set |
| 345 | # CONFIG_BLK_DEV_COW_COMMON is not set | 321 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 346 | CONFIG_BLK_DEV_LOOP=y | 322 | CONFIG_BLK_DEV_LOOP=y |
| @@ -352,11 +328,8 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 352 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 328 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 353 | # CONFIG_CDROM_PKTCDVD is not set | 329 | # CONFIG_CDROM_PKTCDVD is not set |
| 354 | # CONFIG_ATA_OVER_ETH is not set | 330 | # CONFIG_ATA_OVER_ETH is not set |
| 355 | 331 | CONFIG_MISC_DEVICES=y | |
| 356 | # | 332 | # CONFIG_EEPROM_93CX6 is not set |
| 357 | # Misc devices | ||
| 358 | # | ||
| 359 | # CONFIG_BLINK is not set | ||
| 360 | # CONFIG_IDE is not set | 333 | # CONFIG_IDE is not set |
| 361 | 334 | ||
| 362 | # | 335 | # |
| @@ -364,21 +337,16 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 364 | # | 337 | # |
| 365 | # CONFIG_RAID_ATTRS is not set | 338 | # CONFIG_RAID_ATTRS is not set |
| 366 | # CONFIG_SCSI is not set | 339 | # CONFIG_SCSI is not set |
| 340 | # CONFIG_SCSI_DMA is not set | ||
| 367 | # CONFIG_SCSI_NETLINK is not set | 341 | # CONFIG_SCSI_NETLINK is not set |
| 368 | # CONFIG_ATA is not set | 342 | # CONFIG_ATA is not set |
| 369 | |||
| 370 | # | ||
| 371 | # Multi-device support (RAID and LVM) | ||
| 372 | # | ||
| 373 | # CONFIG_MD is not set | 343 | # CONFIG_MD is not set |
| 374 | # CONFIG_MACINTOSH_DRIVERS is not set | 344 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 375 | |||
| 376 | # | ||
| 377 | # Network device support | ||
| 378 | # | ||
| 379 | CONFIG_NETDEVICES=y | 345 | CONFIG_NETDEVICES=y |
| 346 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 380 | # CONFIG_DUMMY is not set | 347 | # CONFIG_DUMMY is not set |
| 381 | # CONFIG_BONDING is not set | 348 | # CONFIG_BONDING is not set |
| 349 | # CONFIG_MACVLAN is not set | ||
| 382 | # CONFIG_EQUALIZER is not set | 350 | # CONFIG_EQUALIZER is not set |
| 383 | # CONFIG_TUN is not set | 351 | # CONFIG_TUN is not set |
| 384 | CONFIG_PHYLIB=y | 352 | CONFIG_PHYLIB=y |
| @@ -394,11 +362,8 @@ CONFIG_PHYLIB=y | |||
| 394 | # CONFIG_VITESSE_PHY is not set | 362 | # CONFIG_VITESSE_PHY is not set |
| 395 | # CONFIG_SMSC_PHY is not set | 363 | # CONFIG_SMSC_PHY is not set |
| 396 | # CONFIG_BROADCOM_PHY is not set | 364 | # CONFIG_BROADCOM_PHY is not set |
| 365 | # CONFIG_ICPLUS_PHY is not set | ||
| 397 | # CONFIG_FIXED_PHY is not set | 366 | # CONFIG_FIXED_PHY is not set |
| 398 | |||
| 399 | # | ||
| 400 | # Ethernet (10 or 100Mbit) | ||
| 401 | # | ||
| 402 | CONFIG_NET_ETHERNET=y | 367 | CONFIG_NET_ETHERNET=y |
| 403 | CONFIG_MII=y | 368 | CONFIG_MII=y |
| 404 | CONFIG_NETDEV_1000=y | 369 | CONFIG_NETDEV_1000=y |
| @@ -418,15 +383,7 @@ CONFIG_NETDEV_10000=y | |||
| 418 | # CONFIG_NETCONSOLE is not set | 383 | # CONFIG_NETCONSOLE is not set |
| 419 | # CONFIG_NETPOLL is not set | 384 | # CONFIG_NETPOLL is not set |
| 420 | # CONFIG_NET_POLL_CONTROLLER is not set | 385 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 421 | |||
| 422 | # | ||
| 423 | # ISDN subsystem | ||
| 424 | # | ||
| 425 | # CONFIG_ISDN is not set | 386 | # CONFIG_ISDN is not set |
| 426 | |||
| 427 | # | ||
| 428 | # Telephony Support | ||
| 429 | # | ||
| 430 | # CONFIG_PHONE is not set | 387 | # CONFIG_PHONE is not set |
| 431 | 388 | ||
| 432 | # | 389 | # |
| @@ -487,10 +444,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 487 | CONFIG_UNIX98_PTYS=y | 444 | CONFIG_UNIX98_PTYS=y |
| 488 | CONFIG_LEGACY_PTYS=y | 445 | CONFIG_LEGACY_PTYS=y |
| 489 | CONFIG_LEGACY_PTY_COUNT=256 | 446 | CONFIG_LEGACY_PTY_COUNT=256 |
| 490 | |||
| 491 | # | ||
| 492 | # IPMI | ||
| 493 | # | ||
| 494 | # CONFIG_IPMI_HANDLER is not set | 447 | # CONFIG_IPMI_HANDLER is not set |
| 495 | # CONFIG_WATCHDOG is not set | 448 | # CONFIG_WATCHDOG is not set |
| 496 | # CONFIG_HW_RANDOM is not set | 449 | # CONFIG_HW_RANDOM is not set |
| @@ -499,10 +452,6 @@ CONFIG_GEN_RTC=y | |||
| 499 | # CONFIG_GEN_RTC_X is not set | 452 | # CONFIG_GEN_RTC_X is not set |
| 500 | # CONFIG_R3964 is not set | 453 | # CONFIG_R3964 is not set |
| 501 | # CONFIG_RAW_DRIVER is not set | 454 | # CONFIG_RAW_DRIVER is not set |
| 502 | |||
| 503 | # | ||
| 504 | # TPM devices | ||
| 505 | # | ||
| 506 | # CONFIG_TCG_TPM is not set | 455 | # CONFIG_TCG_TPM is not set |
| 507 | # CONFIG_I2C is not set | 456 | # CONFIG_I2C is not set |
| 508 | 457 | ||
| @@ -511,20 +460,21 @@ CONFIG_GEN_RTC=y | |||
| 511 | # | 460 | # |
| 512 | # CONFIG_SPI is not set | 461 | # CONFIG_SPI is not set |
| 513 | # CONFIG_SPI_MASTER is not set | 462 | # CONFIG_SPI_MASTER is not set |
| 514 | |||
| 515 | # | ||
| 516 | # Dallas's 1-wire bus | ||
| 517 | # | ||
| 518 | # CONFIG_W1 is not set | 463 | # CONFIG_W1 is not set |
| 464 | # CONFIG_POWER_SUPPLY is not set | ||
| 519 | CONFIG_HWMON=y | 465 | CONFIG_HWMON=y |
| 520 | # CONFIG_HWMON_VID is not set | 466 | # CONFIG_HWMON_VID is not set |
| 521 | # CONFIG_SENSORS_ABITUGURU is not set | 467 | # CONFIG_SENSORS_ABITUGURU is not set |
| 468 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 522 | # CONFIG_SENSORS_F71805F is not set | 469 | # CONFIG_SENSORS_F71805F is not set |
| 470 | # CONFIG_SENSORS_IT87 is not set | ||
| 471 | # CONFIG_SENSORS_PC87360 is not set | ||
| 523 | # CONFIG_SENSORS_PC87427 is not set | 472 | # CONFIG_SENSORS_PC87427 is not set |
| 524 | # CONFIG_SENSORS_SMSC47M1 is not set | 473 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 525 | # CONFIG_SENSORS_SMSC47B397 is not set | 474 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 526 | # CONFIG_SENSORS_VT1211 is not set | 475 | # CONFIG_SENSORS_VT1211 is not set |
| 527 | # CONFIG_SENSORS_W83627HF is not set | 476 | # CONFIG_SENSORS_W83627HF is not set |
| 477 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 528 | # CONFIG_HWMON_DEBUG_CHIP is not set | 478 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 529 | 479 | ||
| 530 | # | 480 | # |
| @@ -549,6 +499,7 @@ CONFIG_DAB=y | |||
| 549 | # | 499 | # |
| 550 | # CONFIG_DISPLAY_SUPPORT is not set | 500 | # CONFIG_DISPLAY_SUPPORT is not set |
| 551 | # CONFIG_VGASTATE is not set | 501 | # CONFIG_VGASTATE is not set |
| 502 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 552 | # CONFIG_FB is not set | 503 | # CONFIG_FB is not set |
| 553 | # CONFIG_FB_IBM_GXT4500 is not set | 504 | # CONFIG_FB_IBM_GXT4500 is not set |
| 554 | 505 | ||
| @@ -556,16 +507,10 @@ CONFIG_DAB=y | |||
| 556 | # Sound | 507 | # Sound |
| 557 | # | 508 | # |
| 558 | # CONFIG_SOUND is not set | 509 | # CONFIG_SOUND is not set |
| 559 | 510 | CONFIG_HID_SUPPORT=y | |
| 560 | # | ||
| 561 | # HID Devices | ||
| 562 | # | ||
| 563 | CONFIG_HID=y | 511 | CONFIG_HID=y |
| 564 | # CONFIG_HID_DEBUG is not set | 512 | # CONFIG_HID_DEBUG is not set |
| 565 | 513 | CONFIG_USB_SUPPORT=y | |
| 566 | # | ||
| 567 | # USB support | ||
| 568 | # | ||
| 569 | # CONFIG_USB_ARCH_HAS_HCD is not set | 514 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 570 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 515 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 571 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 516 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -579,31 +524,8 @@ CONFIG_HID=y | |||
| 579 | # | 524 | # |
| 580 | # CONFIG_USB_GADGET is not set | 525 | # CONFIG_USB_GADGET is not set |
| 581 | # CONFIG_MMC is not set | 526 | # CONFIG_MMC is not set |
| 582 | |||
| 583 | # | ||
| 584 | # LED devices | ||
| 585 | # | ||
| 586 | # CONFIG_NEW_LEDS is not set | 527 | # CONFIG_NEW_LEDS is not set |
| 587 | 528 | # CONFIG_EDAC is not set | |
| 588 | # | ||
| 589 | # LED drivers | ||
| 590 | # | ||
| 591 | |||
| 592 | # | ||
| 593 | # LED Triggers | ||
| 594 | # | ||
| 595 | |||
| 596 | # | ||
| 597 | # InfiniBand support | ||
| 598 | # | ||
| 599 | |||
| 600 | # | ||
| 601 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 602 | # | ||
| 603 | |||
| 604 | # | ||
| 605 | # Real Time Clock | ||
| 606 | # | ||
| 607 | # CONFIG_RTC_CLASS is not set | 529 | # CONFIG_RTC_CLASS is not set |
| 608 | 530 | ||
| 609 | # | 531 | # |
| @@ -620,6 +542,11 @@ CONFIG_HID=y | |||
| 620 | # | 542 | # |
| 621 | 543 | ||
| 622 | # | 544 | # |
| 545 | # Userspace I/O | ||
| 546 | # | ||
| 547 | # CONFIG_UIO is not set | ||
| 548 | |||
| 549 | # | ||
| 623 | # File systems | 550 | # File systems |
| 624 | # | 551 | # |
| 625 | CONFIG_EXT2_FS=y | 552 | CONFIG_EXT2_FS=y |
| @@ -712,7 +639,6 @@ CONFIG_SUNRPC=y | |||
| 712 | # CONFIG_NCP_FS is not set | 639 | # CONFIG_NCP_FS is not set |
| 713 | # CONFIG_CODA_FS is not set | 640 | # CONFIG_CODA_FS is not set |
| 714 | # CONFIG_AFS_FS is not set | 641 | # CONFIG_AFS_FS is not set |
| 715 | # CONFIG_9P_FS is not set | ||
| 716 | 642 | ||
| 717 | # | 643 | # |
| 718 | # Partition Types | 644 | # Partition Types |
| @@ -751,6 +677,7 @@ CONFIG_BITREVERSE=y | |||
| 751 | # CONFIG_CRC16 is not set | 677 | # CONFIG_CRC16 is not set |
| 752 | # CONFIG_CRC_ITU_T is not set | 678 | # CONFIG_CRC_ITU_T is not set |
| 753 | CONFIG_CRC32=y | 679 | CONFIG_CRC32=y |
| 680 | # CONFIG_CRC7 is not set | ||
| 754 | # CONFIG_LIBCRC32C is not set | 681 | # CONFIG_LIBCRC32C is not set |
| 755 | CONFIG_PLIST=y | 682 | CONFIG_PLIST=y |
| 756 | CONFIG_HAS_IOMEM=y | 683 | CONFIG_HAS_IOMEM=y |
| @@ -774,6 +701,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 774 | CONFIG_DEBUG_KERNEL=y | 701 | CONFIG_DEBUG_KERNEL=y |
| 775 | # CONFIG_DEBUG_SHIRQ is not set | 702 | # CONFIG_DEBUG_SHIRQ is not set |
| 776 | CONFIG_DETECT_SOFTLOCKUP=y | 703 | CONFIG_DETECT_SOFTLOCKUP=y |
| 704 | CONFIG_SCHED_DEBUG=y | ||
| 777 | # CONFIG_SCHEDSTATS is not set | 705 | # CONFIG_SCHEDSTATS is not set |
| 778 | # CONFIG_TIMER_STATS is not set | 706 | # CONFIG_TIMER_STATS is not set |
| 779 | # CONFIG_DEBUG_SLAB is not set | 707 | # CONFIG_DEBUG_SLAB is not set |
| @@ -795,7 +723,6 @@ CONFIG_FORCED_INLINING=y | |||
| 795 | # CONFIG_DEBUG_PAGEALLOC is not set | 723 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 796 | # CONFIG_DEBUGGER is not set | 724 | # CONFIG_DEBUGGER is not set |
| 797 | # CONFIG_BDI_SWITCH is not set | 725 | # CONFIG_BDI_SWITCH is not set |
| 798 | # CONFIG_BOOTX_TEXT is not set | ||
| 799 | # CONFIG_PPC_EARLY_DEBUG is not set | 726 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 800 | 727 | ||
| 801 | # | 728 | # |
| @@ -803,8 +730,4 @@ CONFIG_FORCED_INLINING=y | |||
| 803 | # | 730 | # |
| 804 | # CONFIG_KEYS is not set | 731 | # CONFIG_KEYS is not set |
| 805 | # CONFIG_SECURITY is not set | 732 | # CONFIG_SECURITY is not set |
| 806 | |||
| 807 | # | ||
| 808 | # Cryptographic options | ||
| 809 | # | ||
| 810 | # CONFIG_CRYPTO is not set | 733 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig index 7995231def26..86582aefab93 100644 --- a/arch/powerpc/configs/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/mpc8544_ds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Fri Jul 20 14:09:13 2007 | 4 | # Wed Aug 29 16:41:04 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -19,7 +19,7 @@ CONFIG_E500=y | |||
| 19 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
| 20 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
| 21 | # CONFIG_PHYS_64BIT is not set | 21 | # CONFIG_PHYS_64BIT is not set |
| 22 | # CONFIG_SPE is not set | 22 | CONFIG_SPE=y |
| 23 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
| 24 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| @@ -38,6 +38,7 @@ CONFIG_GENERIC_NVRAM=y | |||
| 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 40 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 41 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 42 | # CONFIG_GENERIC_TBSYNC is not set | 43 | # CONFIG_GENERIC_TBSYNC is not set |
| 43 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| @@ -48,15 +49,11 @@ CONFIG_DEFAULT_UIMAGE=y | |||
| 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 49 | 50 | ||
| 50 | # | 51 | # |
| 51 | # Code maturity level options | 52 | # General setup |
| 52 | # | 53 | # |
| 53 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 54 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 56 | |||
| 57 | # | ||
| 58 | # General setup | ||
| 59 | # | ||
| 60 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 61 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 62 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| @@ -82,7 +79,7 @@ CONFIG_EMBEDDED=y | |||
| 82 | CONFIG_SYSCTL_SYSCALL=y | 79 | CONFIG_SYSCTL_SYSCALL=y |
| 83 | CONFIG_KALLSYMS=y | 80 | CONFIG_KALLSYMS=y |
| 84 | CONFIG_KALLSYMS_ALL=y | 81 | CONFIG_KALLSYMS_ALL=y |
| 85 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 82 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 86 | CONFIG_HOTPLUG=y | 83 | CONFIG_HOTPLUG=y |
| 87 | CONFIG_PRINTK=y | 84 | CONFIG_PRINTK=y |
| 88 | CONFIG_BUG=y | 85 | CONFIG_BUG=y |
| @@ -152,6 +149,7 @@ CONFIG_PPC_I8259=y | |||
| 152 | # CONFIG_GENERIC_IOMAP is not set | 149 | # CONFIG_GENERIC_IOMAP is not set |
| 153 | # CONFIG_CPU_FREQ is not set | 150 | # CONFIG_CPU_FREQ is not set |
| 154 | # CONFIG_CPM2 is not set | 151 | # CONFIG_CPM2 is not set |
| 152 | CONFIG_FSL_ULI1575=y | ||
| 155 | 153 | ||
| 156 | # | 154 | # |
| 157 | # Kernel options | 155 | # Kernel options |
| @@ -184,8 +182,7 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
| 184 | CONFIG_BOUNCE=y | 182 | CONFIG_BOUNCE=y |
| 185 | CONFIG_VIRT_TO_BUS=y | 183 | CONFIG_VIRT_TO_BUS=y |
| 186 | CONFIG_PROC_DEVICETREE=y | 184 | CONFIG_PROC_DEVICETREE=y |
| 187 | CONFIG_CMDLINE_BOOL=y | 185 | # CONFIG_CMDLINE_BOOL is not set |
| 188 | CONFIG_CMDLINE="root=/dev/sda3 rw console=ttyS0,115200" | ||
| 189 | # CONFIG_PM is not set | 186 | # CONFIG_PM is not set |
| 190 | CONFIG_SECCOMP=y | 187 | CONFIG_SECCOMP=y |
| 191 | CONFIG_WANT_DEVICE_TREE=y | 188 | CONFIG_WANT_DEVICE_TREE=y |
| @@ -239,7 +236,7 @@ CONFIG_PACKET=y | |||
| 239 | # CONFIG_PACKET_MMAP is not set | 236 | # CONFIG_PACKET_MMAP is not set |
| 240 | CONFIG_UNIX=y | 237 | CONFIG_UNIX=y |
| 241 | CONFIG_XFRM=y | 238 | CONFIG_XFRM=y |
| 242 | CONFIG_XFRM_USER=m | 239 | CONFIG_XFRM_USER=y |
| 243 | # CONFIG_XFRM_SUB_POLICY is not set | 240 | # CONFIG_XFRM_SUB_POLICY is not set |
| 244 | # CONFIG_XFRM_MIGRATE is not set | 241 | # CONFIG_XFRM_MIGRATE is not set |
| 245 | CONFIG_NET_KEY=m | 242 | CONFIG_NET_KEY=m |
| @@ -279,9 +276,23 @@ CONFIG_INET_TCP_DIAG=y | |||
| 279 | CONFIG_TCP_CONG_CUBIC=y | 276 | CONFIG_TCP_CONG_CUBIC=y |
| 280 | CONFIG_DEFAULT_TCP_CONG="cubic" | 277 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 281 | # CONFIG_TCP_MD5SIG is not set | 278 | # CONFIG_TCP_MD5SIG is not set |
| 282 | # CONFIG_IPV6 is not set | 279 | CONFIG_IPV6=y |
| 280 | # CONFIG_IPV6_PRIVACY is not set | ||
| 281 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 282 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 283 | # CONFIG_INET6_AH is not set | ||
| 284 | # CONFIG_INET6_ESP is not set | ||
| 285 | # CONFIG_INET6_IPCOMP is not set | ||
| 286 | # CONFIG_IPV6_MIP6 is not set | ||
| 283 | # CONFIG_INET6_XFRM_TUNNEL is not set | 287 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 284 | # CONFIG_INET6_TUNNEL is not set | 288 | # CONFIG_INET6_TUNNEL is not set |
| 289 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | ||
| 290 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | ||
| 291 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
| 292 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 293 | CONFIG_IPV6_SIT=y | ||
| 294 | # CONFIG_IPV6_TUNNEL is not set | ||
| 295 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 285 | # CONFIG_NETWORK_SECMARK is not set | 296 | # CONFIG_NETWORK_SECMARK is not set |
| 286 | # CONFIG_NETFILTER is not set | 297 | # CONFIG_NETFILTER is not set |
| 287 | # CONFIG_IP_DCCP is not set | 298 | # CONFIG_IP_DCCP is not set |
| @@ -338,12 +349,13 @@ CONFIG_FIB_RULES=y | |||
| 338 | # | 349 | # |
| 339 | CONFIG_STANDALONE=y | 350 | CONFIG_STANDALONE=y |
| 340 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 351 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 341 | # CONFIG_FW_LOADER is not set | 352 | CONFIG_FW_LOADER=y |
| 342 | # CONFIG_DEBUG_DRIVER is not set | 353 | # CONFIG_DEBUG_DRIVER is not set |
| 343 | # CONFIG_DEBUG_DEVRES is not set | 354 | # CONFIG_DEBUG_DEVRES is not set |
| 344 | # CONFIG_SYS_HYPERVISOR is not set | 355 | # CONFIG_SYS_HYPERVISOR is not set |
| 345 | # CONFIG_CONNECTOR is not set | 356 | # CONFIG_CONNECTOR is not set |
| 346 | # CONFIG_MTD is not set | 357 | # CONFIG_MTD is not set |
| 358 | CONFIG_OF_DEVICE=y | ||
| 347 | # CONFIG_PARPORT is not set | 359 | # CONFIG_PARPORT is not set |
| 348 | CONFIG_BLK_DEV=y | 360 | CONFIG_BLK_DEV=y |
| 349 | # CONFIG_BLK_DEV_FD is not set | 361 | # CONFIG_BLK_DEV_FD is not set |
| @@ -356,9 +368,10 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 356 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 368 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 357 | CONFIG_BLK_DEV_NBD=y | 369 | CONFIG_BLK_DEV_NBD=y |
| 358 | # CONFIG_BLK_DEV_SX8 is not set | 370 | # CONFIG_BLK_DEV_SX8 is not set |
| 371 | # CONFIG_BLK_DEV_UB is not set | ||
| 359 | CONFIG_BLK_DEV_RAM=y | 372 | CONFIG_BLK_DEV_RAM=y |
| 360 | CONFIG_BLK_DEV_RAM_COUNT=2 | 373 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 361 | CONFIG_BLK_DEV_RAM_SIZE=16384 | 374 | CONFIG_BLK_DEV_RAM_SIZE=131072 |
| 362 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 375 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 363 | # CONFIG_CDROM_PKTCDVD is not set | 376 | # CONFIG_CDROM_PKTCDVD is not set |
| 364 | # CONFIG_ATA_OVER_ETH is not set | 377 | # CONFIG_ATA_OVER_ETH is not set |
| @@ -385,7 +398,8 @@ CONFIG_SCSI_PROC_FS=y | |||
| 385 | CONFIG_BLK_DEV_SD=y | 398 | CONFIG_BLK_DEV_SD=y |
| 386 | CONFIG_CHR_DEV_ST=y | 399 | CONFIG_CHR_DEV_ST=y |
| 387 | # CONFIG_CHR_DEV_OSST is not set | 400 | # CONFIG_CHR_DEV_OSST is not set |
| 388 | # CONFIG_BLK_DEV_SR is not set | 401 | CONFIG_BLK_DEV_SR=y |
| 402 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 389 | CONFIG_CHR_DEV_SG=y | 403 | CONFIG_CHR_DEV_SG=y |
| 390 | # CONFIG_CHR_DEV_SCH is not set | 404 | # CONFIG_CHR_DEV_SCH is not set |
| 391 | 405 | ||
| @@ -404,12 +418,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 404 | # CONFIG_SCSI_SPI_ATTRS is not set | 418 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 405 | # CONFIG_SCSI_FC_ATTRS is not set | 419 | # CONFIG_SCSI_FC_ATTRS is not set |
| 406 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 420 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 407 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 408 | # CONFIG_SCSI_SAS_LIBSAS is not set | 421 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 409 | 422 | CONFIG_SCSI_LOWLEVEL=y | |
| 410 | # | ||
| 411 | # SCSI low-level drivers | ||
| 412 | # | ||
| 413 | # CONFIG_ISCSI_TCP is not set | 423 | # CONFIG_ISCSI_TCP is not set |
| 414 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 424 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 415 | # CONFIG_SCSI_3W_9XXX is not set | 425 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -447,7 +457,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 447 | # CONFIG_SCSI_SRP is not set | 457 | # CONFIG_SCSI_SRP is not set |
| 448 | CONFIG_ATA=y | 458 | CONFIG_ATA=y |
| 449 | # CONFIG_ATA_NONSTANDARD is not set | 459 | # CONFIG_ATA_NONSTANDARD is not set |
| 450 | # CONFIG_SATA_AHCI is not set | 460 | CONFIG_SATA_AHCI=y |
| 451 | # CONFIG_SATA_SVW is not set | 461 | # CONFIG_SATA_SVW is not set |
| 452 | # CONFIG_ATA_PIIX is not set | 462 | # CONFIG_ATA_PIIX is not set |
| 453 | # CONFIG_SATA_MV is not set | 463 | # CONFIG_SATA_MV is not set |
| @@ -463,7 +473,7 @@ CONFIG_ATA=y | |||
| 463 | # CONFIG_SATA_VIA is not set | 473 | # CONFIG_SATA_VIA is not set |
| 464 | # CONFIG_SATA_VITESSE is not set | 474 | # CONFIG_SATA_VITESSE is not set |
| 465 | # CONFIG_SATA_INIC162X is not set | 475 | # CONFIG_SATA_INIC162X is not set |
| 466 | # CONFIG_PATA_ALI is not set | 476 | CONFIG_PATA_ALI=y |
| 467 | # CONFIG_PATA_AMD is not set | 477 | # CONFIG_PATA_AMD is not set |
| 468 | # CONFIG_PATA_ARTOP is not set | 478 | # CONFIG_PATA_ARTOP is not set |
| 469 | # CONFIG_PATA_ATIIXP is not set | 479 | # CONFIG_PATA_ATIIXP is not set |
| @@ -519,7 +529,7 @@ CONFIG_ATA=y | |||
| 519 | # CONFIG_MACINTOSH_DRIVERS is not set | 529 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 520 | CONFIG_NETDEVICES=y | 530 | CONFIG_NETDEVICES=y |
| 521 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 531 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| 522 | # CONFIG_DUMMY is not set | 532 | CONFIG_DUMMY=y |
| 523 | # CONFIG_BONDING is not set | 533 | # CONFIG_BONDING is not set |
| 524 | # CONFIG_MACVLAN is not set | 534 | # CONFIG_MACVLAN is not set |
| 525 | # CONFIG_EQUALIZER is not set | 535 | # CONFIG_EQUALIZER is not set |
| @@ -582,6 +592,16 @@ CONFIG_NETDEV_10000=y | |||
| 582 | # | 592 | # |
| 583 | # CONFIG_WLAN_PRE80211 is not set | 593 | # CONFIG_WLAN_PRE80211 is not set |
| 584 | # CONFIG_WLAN_80211 is not set | 594 | # CONFIG_WLAN_80211 is not set |
| 595 | |||
| 596 | # | ||
| 597 | # USB Network Adapters | ||
| 598 | # | ||
| 599 | # CONFIG_USB_CATC is not set | ||
| 600 | # CONFIG_USB_KAWETH is not set | ||
| 601 | # CONFIG_USB_PEGASUS is not set | ||
| 602 | # CONFIG_USB_RTL8150 is not set | ||
| 603 | # CONFIG_USB_USBNET_MII is not set | ||
| 604 | # CONFIG_USB_USBNET is not set | ||
| 585 | # CONFIG_WAN is not set | 605 | # CONFIG_WAN is not set |
| 586 | # CONFIG_FDDI is not set | 606 | # CONFIG_FDDI is not set |
| 587 | # CONFIG_HIPPI is not set | 607 | # CONFIG_HIPPI is not set |
| @@ -647,10 +667,13 @@ CONFIG_HW_CONSOLE=y | |||
| 647 | CONFIG_SERIAL_8250=y | 667 | CONFIG_SERIAL_8250=y |
| 648 | CONFIG_SERIAL_8250_CONSOLE=y | 668 | CONFIG_SERIAL_8250_CONSOLE=y |
| 649 | CONFIG_SERIAL_8250_PCI=y | 669 | CONFIG_SERIAL_8250_PCI=y |
| 650 | CONFIG_SERIAL_8250_NR_UARTS=4 | 670 | CONFIG_SERIAL_8250_NR_UARTS=2 |
| 651 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 671 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
| 652 | # CONFIG_SERIAL_8250_EXTENDED is not set | 672 | CONFIG_SERIAL_8250_EXTENDED=y |
| 673 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 653 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 674 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 675 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 676 | CONFIG_SERIAL_8250_RSA=y | ||
| 654 | 677 | ||
| 655 | # | 678 | # |
| 656 | # Non-8250 serial port support | 679 | # Non-8250 serial port support |
| @@ -676,7 +699,62 @@ CONFIG_GEN_RTC_X=y | |||
| 676 | # CONFIG_RAW_DRIVER is not set | 699 | # CONFIG_RAW_DRIVER is not set |
| 677 | # CONFIG_TCG_TPM is not set | 700 | # CONFIG_TCG_TPM is not set |
| 678 | CONFIG_DEVPORT=y | 701 | CONFIG_DEVPORT=y |
| 679 | # CONFIG_I2C is not set | 702 | CONFIG_I2C=y |
| 703 | CONFIG_I2C_BOARDINFO=y | ||
| 704 | # CONFIG_I2C_CHARDEV is not set | ||
| 705 | |||
| 706 | # | ||
| 707 | # I2C Algorithms | ||
| 708 | # | ||
| 709 | # CONFIG_I2C_ALGOBIT is not set | ||
| 710 | # CONFIG_I2C_ALGOPCF is not set | ||
| 711 | # CONFIG_I2C_ALGOPCA is not set | ||
| 712 | |||
| 713 | # | ||
| 714 | # I2C Hardware Bus support | ||
| 715 | # | ||
| 716 | # CONFIG_I2C_ALI1535 is not set | ||
| 717 | # CONFIG_I2C_ALI1563 is not set | ||
| 718 | # CONFIG_I2C_ALI15X3 is not set | ||
| 719 | # CONFIG_I2C_AMD756 is not set | ||
| 720 | # CONFIG_I2C_AMD8111 is not set | ||
| 721 | # CONFIG_I2C_I801 is not set | ||
| 722 | # CONFIG_I2C_I810 is not set | ||
| 723 | # CONFIG_I2C_PIIX4 is not set | ||
| 724 | CONFIG_I2C_MPC=y | ||
| 725 | # CONFIG_I2C_NFORCE2 is not set | ||
| 726 | # CONFIG_I2C_OCORES is not set | ||
| 727 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 728 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 729 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 730 | # CONFIG_I2C_SIMTEC is not set | ||
| 731 | # CONFIG_I2C_SIS5595 is not set | ||
| 732 | # CONFIG_I2C_SIS630 is not set | ||
| 733 | # CONFIG_I2C_SIS96X is not set | ||
| 734 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 735 | # CONFIG_I2C_STUB is not set | ||
| 736 | # CONFIG_I2C_TINY_USB is not set | ||
| 737 | # CONFIG_I2C_VIA is not set | ||
| 738 | # CONFIG_I2C_VIAPRO is not set | ||
| 739 | # CONFIG_I2C_VOODOO3 is not set | ||
| 740 | |||
| 741 | # | ||
| 742 | # Miscellaneous I2C Chip support | ||
| 743 | # | ||
| 744 | # CONFIG_SENSORS_DS1337 is not set | ||
| 745 | # CONFIG_SENSORS_DS1374 is not set | ||
| 746 | # CONFIG_DS1682 is not set | ||
| 747 | CONFIG_SENSORS_EEPROM=y | ||
| 748 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 749 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 750 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 751 | # CONFIG_SENSORS_M41T00 is not set | ||
| 752 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 753 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 754 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 755 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 756 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 757 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 680 | 758 | ||
| 681 | # | 759 | # |
| 682 | # SPI support | 760 | # SPI support |
| @@ -701,6 +779,32 @@ CONFIG_DVB_CORE=m | |||
| 701 | CONFIG_DVB_CAPTURE_DRIVERS=y | 779 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 702 | 780 | ||
| 703 | # | 781 | # |
| 782 | # Supported SAA7146 based PCI Adapters | ||
| 783 | # | ||
| 784 | |||
| 785 | # | ||
| 786 | # Supported USB Adapters | ||
| 787 | # | ||
| 788 | # CONFIG_DVB_USB is not set | ||
| 789 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
| 790 | # CONFIG_DVB_TTUSB_DEC is not set | ||
| 791 | # CONFIG_DVB_CINERGYT2 is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # Supported FlexCopII (B2C2) Adapters | ||
| 795 | # | ||
| 796 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Supported BT878 Adapters | ||
| 800 | # | ||
| 801 | |||
| 802 | # | ||
| 803 | # Supported Pluto2 Adapters | ||
| 804 | # | ||
| 805 | # CONFIG_DVB_PLUTO2 is not set | ||
| 806 | |||
| 807 | # | ||
| 704 | # Supported DVB Frontends | 808 | # Supported DVB Frontends |
| 705 | # | 809 | # |
| 706 | 810 | ||
| @@ -712,27 +816,66 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 712 | # | 816 | # |
| 713 | # DVB-S (satellite) frontends | 817 | # DVB-S (satellite) frontends |
| 714 | # | 818 | # |
| 819 | # CONFIG_DVB_STV0299 is not set | ||
| 820 | # CONFIG_DVB_CX24110 is not set | ||
| 821 | # CONFIG_DVB_CX24123 is not set | ||
| 822 | # CONFIG_DVB_TDA8083 is not set | ||
| 823 | # CONFIG_DVB_MT312 is not set | ||
| 824 | # CONFIG_DVB_VES1X93 is not set | ||
| 825 | # CONFIG_DVB_S5H1420 is not set | ||
| 826 | # CONFIG_DVB_TDA10086 is not set | ||
| 715 | 827 | ||
| 716 | # | 828 | # |
| 717 | # DVB-T (terrestrial) frontends | 829 | # DVB-T (terrestrial) frontends |
| 718 | # | 830 | # |
| 831 | # CONFIG_DVB_SP8870 is not set | ||
| 832 | # CONFIG_DVB_SP887X is not set | ||
| 833 | # CONFIG_DVB_CX22700 is not set | ||
| 834 | # CONFIG_DVB_CX22702 is not set | ||
| 835 | # CONFIG_DVB_L64781 is not set | ||
| 836 | # CONFIG_DVB_TDA1004X is not set | ||
| 837 | # CONFIG_DVB_NXT6000 is not set | ||
| 838 | # CONFIG_DVB_MT352 is not set | ||
| 839 | # CONFIG_DVB_ZL10353 is not set | ||
| 840 | # CONFIG_DVB_DIB3000MB is not set | ||
| 841 | # CONFIG_DVB_DIB3000MC is not set | ||
| 842 | # CONFIG_DVB_DIB7000M is not set | ||
| 843 | # CONFIG_DVB_DIB7000P is not set | ||
| 719 | 844 | ||
| 720 | # | 845 | # |
| 721 | # DVB-C (cable) frontends | 846 | # DVB-C (cable) frontends |
| 722 | # | 847 | # |
| 848 | # CONFIG_DVB_VES1820 is not set | ||
| 849 | # CONFIG_DVB_TDA10021 is not set | ||
| 850 | # CONFIG_DVB_TDA10023 is not set | ||
| 851 | # CONFIG_DVB_STV0297 is not set | ||
| 723 | 852 | ||
| 724 | # | 853 | # |
| 725 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | 854 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends |
| 726 | # | 855 | # |
| 856 | # CONFIG_DVB_NXT200X is not set | ||
| 857 | # CONFIG_DVB_OR51211 is not set | ||
| 858 | # CONFIG_DVB_OR51132 is not set | ||
| 859 | # CONFIG_DVB_BCM3510 is not set | ||
| 860 | # CONFIG_DVB_LGDT330X is not set | ||
| 727 | 861 | ||
| 728 | # | 862 | # |
| 729 | # Tuners/PLL support | 863 | # Tuners/PLL support |
| 730 | # | 864 | # |
| 865 | # CONFIG_DVB_PLL is not set | ||
| 866 | # CONFIG_DVB_TDA826X is not set | ||
| 867 | # CONFIG_DVB_TDA827X is not set | ||
| 868 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 869 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 731 | 870 | ||
| 732 | # | 871 | # |
| 733 | # Miscellaneous devices | 872 | # Miscellaneous devices |
| 734 | # | 873 | # |
| 874 | # CONFIG_DVB_LNBP21 is not set | ||
| 875 | # CONFIG_DVB_ISL6421 is not set | ||
| 876 | # CONFIG_DVB_TUA6100 is not set | ||
| 735 | CONFIG_DAB=y | 877 | CONFIG_DAB=y |
| 878 | # CONFIG_USB_DABUSB is not set | ||
| 736 | 879 | ||
| 737 | # | 880 | # |
| 738 | # Graphics support | 881 | # Graphics support |
| @@ -744,55 +887,261 @@ CONFIG_DAB=y | |||
| 744 | # | 887 | # |
| 745 | # CONFIG_DISPLAY_SUPPORT is not set | 888 | # CONFIG_DISPLAY_SUPPORT is not set |
| 746 | # CONFIG_VGASTATE is not set | 889 | # CONFIG_VGASTATE is not set |
| 890 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 747 | # CONFIG_FB is not set | 891 | # CONFIG_FB is not set |
| 748 | # CONFIG_FB_IBM_GXT4500 is not set | 892 | # CONFIG_FB_IBM_GXT4500 is not set |
| 749 | 893 | ||
| 750 | # | 894 | # |
| 751 | # Console display driver support | 895 | # Console display driver support |
| 752 | # | 896 | # |
| 753 | # CONFIG_VGA_CONSOLE is not set | 897 | CONFIG_VGA_CONSOLE=y |
| 898 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | ||
| 754 | CONFIG_DUMMY_CONSOLE=y | 899 | CONFIG_DUMMY_CONSOLE=y |
| 755 | 900 | ||
| 756 | # | 901 | # |
| 757 | # Sound | 902 | # Sound |
| 758 | # | 903 | # |
| 759 | # CONFIG_SOUND is not set | 904 | CONFIG_SOUND=y |
| 905 | |||
| 906 | # | ||
| 907 | # Advanced Linux Sound Architecture | ||
| 908 | # | ||
| 909 | CONFIG_SND=y | ||
| 910 | CONFIG_SND_TIMER=y | ||
| 911 | CONFIG_SND_PCM=y | ||
| 912 | # CONFIG_SND_SEQUENCER is not set | ||
| 913 | # CONFIG_SND_MIXER_OSS is not set | ||
| 914 | # CONFIG_SND_PCM_OSS is not set | ||
| 915 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 916 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 917 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 918 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 919 | # CONFIG_SND_DEBUG is not set | ||
| 920 | |||
| 921 | # | ||
| 922 | # Generic devices | ||
| 923 | # | ||
| 924 | CONFIG_SND_AC97_CODEC=y | ||
| 925 | # CONFIG_SND_DUMMY is not set | ||
| 926 | # CONFIG_SND_MTPAV is not set | ||
| 927 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 928 | # CONFIG_SND_MPU401 is not set | ||
| 929 | |||
| 930 | # | ||
| 931 | # PCI devices | ||
| 932 | # | ||
| 933 | # CONFIG_SND_AD1889 is not set | ||
| 934 | # CONFIG_SND_ALS300 is not set | ||
| 935 | # CONFIG_SND_ALS4000 is not set | ||
| 936 | # CONFIG_SND_ALI5451 is not set | ||
| 937 | # CONFIG_SND_ATIIXP is not set | ||
| 938 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 939 | # CONFIG_SND_AU8810 is not set | ||
| 940 | # CONFIG_SND_AU8820 is not set | ||
| 941 | # CONFIG_SND_AU8830 is not set | ||
| 942 | # CONFIG_SND_AZT3328 is not set | ||
| 943 | # CONFIG_SND_BT87X is not set | ||
| 944 | # CONFIG_SND_CA0106 is not set | ||
| 945 | # CONFIG_SND_CMIPCI is not set | ||
| 946 | # CONFIG_SND_CS4281 is not set | ||
| 947 | # CONFIG_SND_CS46XX is not set | ||
| 948 | # CONFIG_SND_CS5530 is not set | ||
| 949 | # CONFIG_SND_DARLA20 is not set | ||
| 950 | # CONFIG_SND_GINA20 is not set | ||
| 951 | # CONFIG_SND_LAYLA20 is not set | ||
| 952 | # CONFIG_SND_DARLA24 is not set | ||
| 953 | # CONFIG_SND_GINA24 is not set | ||
| 954 | # CONFIG_SND_LAYLA24 is not set | ||
| 955 | # CONFIG_SND_MONA is not set | ||
| 956 | # CONFIG_SND_MIA is not set | ||
| 957 | # CONFIG_SND_ECHO3G is not set | ||
| 958 | # CONFIG_SND_INDIGO is not set | ||
| 959 | # CONFIG_SND_INDIGOIO is not set | ||
| 960 | # CONFIG_SND_INDIGODJ is not set | ||
| 961 | # CONFIG_SND_EMU10K1 is not set | ||
| 962 | # CONFIG_SND_EMU10K1X is not set | ||
| 963 | # CONFIG_SND_ENS1370 is not set | ||
| 964 | # CONFIG_SND_ENS1371 is not set | ||
| 965 | # CONFIG_SND_ES1938 is not set | ||
| 966 | # CONFIG_SND_ES1968 is not set | ||
| 967 | # CONFIG_SND_FM801 is not set | ||
| 968 | # CONFIG_SND_HDA_INTEL is not set | ||
| 969 | # CONFIG_SND_HDSP is not set | ||
| 970 | # CONFIG_SND_HDSPM is not set | ||
| 971 | # CONFIG_SND_ICE1712 is not set | ||
| 972 | # CONFIG_SND_ICE1724 is not set | ||
| 973 | CONFIG_SND_INTEL8X0=y | ||
| 974 | # CONFIG_SND_INTEL8X0M is not set | ||
| 975 | # CONFIG_SND_KORG1212 is not set | ||
| 976 | # CONFIG_SND_MAESTRO3 is not set | ||
| 977 | # CONFIG_SND_MIXART is not set | ||
| 978 | # CONFIG_SND_NM256 is not set | ||
| 979 | # CONFIG_SND_PCXHR is not set | ||
| 980 | # CONFIG_SND_RIPTIDE is not set | ||
| 981 | # CONFIG_SND_RME32 is not set | ||
| 982 | # CONFIG_SND_RME96 is not set | ||
| 983 | # CONFIG_SND_RME9652 is not set | ||
| 984 | # CONFIG_SND_SONICVIBES is not set | ||
| 985 | # CONFIG_SND_TRIDENT is not set | ||
| 986 | # CONFIG_SND_VIA82XX is not set | ||
| 987 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 988 | # CONFIG_SND_VX222 is not set | ||
| 989 | # CONFIG_SND_YMFPCI is not set | ||
| 990 | # CONFIG_SND_AC97_POWER_SAVE is not set | ||
| 991 | |||
| 992 | # | ||
| 993 | # ALSA PowerMac devices | ||
| 994 | # | ||
| 995 | |||
| 996 | # | ||
| 997 | # ALSA PowerPC devices | ||
| 998 | # | ||
| 999 | |||
| 1000 | # | ||
| 1001 | # USB devices | ||
| 1002 | # | ||
| 1003 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1004 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1005 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1006 | |||
| 1007 | # | ||
| 1008 | # System on Chip audio support | ||
| 1009 | # | ||
| 1010 | # CONFIG_SND_SOC is not set | ||
| 1011 | |||
| 1012 | # | ||
| 1013 | # SoC Audio support for SuperH | ||
| 1014 | # | ||
| 1015 | |||
| 1016 | # | ||
| 1017 | # Open Sound System | ||
| 1018 | # | ||
| 1019 | # CONFIG_SOUND_PRIME is not set | ||
| 1020 | CONFIG_AC97_BUS=y | ||
| 760 | CONFIG_HID_SUPPORT=y | 1021 | CONFIG_HID_SUPPORT=y |
| 761 | CONFIG_HID=y | 1022 | CONFIG_HID=y |
| 762 | # CONFIG_HID_DEBUG is not set | 1023 | # CONFIG_HID_DEBUG is not set |
| 1024 | |||
| 1025 | # | ||
| 1026 | # USB Input Devices | ||
| 1027 | # | ||
| 1028 | CONFIG_USB_HID=y | ||
| 1029 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1030 | # CONFIG_HID_FF is not set | ||
| 1031 | # CONFIG_USB_HIDDEV is not set | ||
| 763 | CONFIG_USB_SUPPORT=y | 1032 | CONFIG_USB_SUPPORT=y |
| 764 | CONFIG_USB_ARCH_HAS_HCD=y | 1033 | CONFIG_USB_ARCH_HAS_HCD=y |
| 765 | CONFIG_USB_ARCH_HAS_OHCI=y | 1034 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 766 | CONFIG_USB_ARCH_HAS_EHCI=y | 1035 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 767 | # CONFIG_USB is not set | 1036 | CONFIG_USB=y |
| 1037 | # CONFIG_USB_DEBUG is not set | ||
| 1038 | |||
| 1039 | # | ||
| 1040 | # Miscellaneous USB options | ||
| 1041 | # | ||
| 1042 | CONFIG_USB_DEVICEFS=y | ||
| 1043 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1044 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1045 | # CONFIG_USB_OTG is not set | ||
| 1046 | |||
| 1047 | # | ||
| 1048 | # USB Host Controller Drivers | ||
| 1049 | # | ||
| 1050 | CONFIG_USB_EHCI_HCD=y | ||
| 1051 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1052 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
| 1053 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
| 1054 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1055 | CONFIG_USB_OHCI_HCD=y | ||
| 1056 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
| 1057 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | ||
| 1058 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | ||
| 1059 | CONFIG_USB_OHCI_HCD_PCI=y | ||
| 1060 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | ||
| 1061 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | ||
| 1062 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 1063 | # CONFIG_USB_UHCI_HCD is not set | ||
| 1064 | # CONFIG_USB_SL811_HCD is not set | ||
| 1065 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1066 | |||
| 1067 | # | ||
| 1068 | # USB Device Class drivers | ||
| 1069 | # | ||
| 1070 | # CONFIG_USB_ACM is not set | ||
| 1071 | # CONFIG_USB_PRINTER is not set | ||
| 768 | 1072 | ||
| 769 | # | 1073 | # |
| 770 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1074 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 771 | # | 1075 | # |
| 772 | 1076 | ||
| 773 | # | 1077 | # |
| 774 | # USB Gadget Support | 1078 | # may also be needed; see USB_STORAGE Help for more information |
| 775 | # | 1079 | # |
| 776 | # CONFIG_USB_GADGET is not set | 1080 | CONFIG_USB_STORAGE=y |
| 777 | # CONFIG_MMC is not set | 1081 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1082 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1083 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1084 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1085 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1086 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1087 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1088 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1089 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1090 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1091 | # CONFIG_USB_LIBUSUAL is not set | ||
| 778 | 1092 | ||
| 779 | # | 1093 | # |
| 780 | # LED devices | 1094 | # USB Imaging devices |
| 781 | # | 1095 | # |
| 782 | # CONFIG_NEW_LEDS is not set | 1096 | # CONFIG_USB_MDC800 is not set |
| 1097 | # CONFIG_USB_MICROTEK is not set | ||
| 1098 | CONFIG_USB_MON=y | ||
| 783 | 1099 | ||
| 784 | # | 1100 | # |
| 785 | # LED drivers | 1101 | # USB port drivers |
| 786 | # | 1102 | # |
| 787 | 1103 | ||
| 788 | # | 1104 | # |
| 789 | # LED Triggers | 1105 | # USB Serial Converter support |
| 1106 | # | ||
| 1107 | # CONFIG_USB_SERIAL is not set | ||
| 1108 | |||
| 1109 | # | ||
| 1110 | # USB Miscellaneous drivers | ||
| 1111 | # | ||
| 1112 | # CONFIG_USB_EMI62 is not set | ||
| 1113 | # CONFIG_USB_EMI26 is not set | ||
| 1114 | # CONFIG_USB_ADUTUX is not set | ||
| 1115 | # CONFIG_USB_AUERSWALD is not set | ||
| 1116 | # CONFIG_USB_RIO500 is not set | ||
| 1117 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1118 | # CONFIG_USB_LCD is not set | ||
| 1119 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1120 | # CONFIG_USB_LED is not set | ||
| 1121 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1122 | # CONFIG_USB_CYTHERM is not set | ||
| 1123 | # CONFIG_USB_PHIDGET is not set | ||
| 1124 | # CONFIG_USB_IDMOUSE is not set | ||
| 1125 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1126 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1127 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1128 | # CONFIG_USB_LD is not set | ||
| 1129 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1130 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1131 | # CONFIG_USB_TEST is not set | ||
| 1132 | |||
| 1133 | # | ||
| 1134 | # USB DSL modem support | ||
| 790 | # | 1135 | # |
| 791 | # CONFIG_INFINIBAND is not set | ||
| 792 | 1136 | ||
| 793 | # | 1137 | # |
| 794 | # Real Time Clock | 1138 | # USB Gadget Support |
| 795 | # | 1139 | # |
| 1140 | # CONFIG_USB_GADGET is not set | ||
| 1141 | # CONFIG_MMC is not set | ||
| 1142 | # CONFIG_NEW_LEDS is not set | ||
| 1143 | # CONFIG_INFINIBAND is not set | ||
| 1144 | # CONFIG_EDAC is not set | ||
| 796 | CONFIG_RTC_LIB=y | 1145 | CONFIG_RTC_LIB=y |
| 797 | CONFIG_RTC_CLASS=y | 1146 | CONFIG_RTC_CLASS=y |
| 798 | CONFIG_RTC_HCTOSYS=y | 1147 | CONFIG_RTC_HCTOSYS=y |
| @@ -809,10 +1158,28 @@ CONFIG_RTC_INTF_DEV=y | |||
| 809 | # CONFIG_RTC_DRV_TEST is not set | 1158 | # CONFIG_RTC_DRV_TEST is not set |
| 810 | 1159 | ||
| 811 | # | 1160 | # |
| 1161 | # I2C RTC drivers | ||
| 1162 | # | ||
| 1163 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1164 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1165 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1166 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1167 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1168 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1169 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1170 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1171 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1172 | |||
| 1173 | # | ||
| 1174 | # SPI RTC drivers | ||
| 1175 | # | ||
| 1176 | |||
| 1177 | # | ||
| 812 | # Platform RTC drivers | 1178 | # Platform RTC drivers |
| 813 | # | 1179 | # |
| 814 | # CONFIG_RTC_DRV_CMOS is not set | 1180 | CONFIG_RTC_DRV_CMOS=y |
| 815 | # CONFIG_RTC_DRV_DS1553 is not set | 1181 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1182 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 816 | # CONFIG_RTC_DRV_DS1742 is not set | 1183 | # CONFIG_RTC_DRV_DS1742 is not set |
| 817 | # CONFIG_RTC_DRV_M48T86 is not set | 1184 | # CONFIG_RTC_DRV_M48T86 is not set |
| 818 | # CONFIG_RTC_DRV_M48T59 is not set | 1185 | # CONFIG_RTC_DRV_M48T59 is not set |
| @@ -933,10 +1300,13 @@ CONFIG_NFS_V3=y | |||
| 933 | # CONFIG_NFS_V3_ACL is not set | 1300 | # CONFIG_NFS_V3_ACL is not set |
| 934 | CONFIG_NFS_V4=y | 1301 | CONFIG_NFS_V4=y |
| 935 | # CONFIG_NFS_DIRECTIO is not set | 1302 | # CONFIG_NFS_DIRECTIO is not set |
| 936 | # CONFIG_NFSD is not set | 1303 | CONFIG_NFSD=y |
| 1304 | # CONFIG_NFSD_V3 is not set | ||
| 1305 | CONFIG_NFSD_TCP=y | ||
| 937 | CONFIG_ROOT_NFS=y | 1306 | CONFIG_ROOT_NFS=y |
| 938 | CONFIG_LOCKD=y | 1307 | CONFIG_LOCKD=y |
| 939 | CONFIG_LOCKD_V4=y | 1308 | CONFIG_LOCKD_V4=y |
| 1309 | CONFIG_EXPORTFS=y | ||
| 940 | CONFIG_NFS_COMMON=y | 1310 | CONFIG_NFS_COMMON=y |
| 941 | CONFIG_SUNRPC=y | 1311 | CONFIG_SUNRPC=y |
| 942 | CONFIG_SUNRPC_GSS=y | 1312 | CONFIG_SUNRPC_GSS=y |
| @@ -957,7 +1327,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 957 | # CONFIG_OSF_PARTITION is not set | 1327 | # CONFIG_OSF_PARTITION is not set |
| 958 | # CONFIG_AMIGA_PARTITION is not set | 1328 | # CONFIG_AMIGA_PARTITION is not set |
| 959 | # CONFIG_ATARI_PARTITION is not set | 1329 | # CONFIG_ATARI_PARTITION is not set |
| 960 | # CONFIG_MAC_PARTITION is not set | 1330 | CONFIG_MAC_PARTITION=y |
| 961 | CONFIG_MSDOS_PARTITION=y | 1331 | CONFIG_MSDOS_PARTITION=y |
| 962 | # CONFIG_BSD_DISKLABEL is not set | 1332 | # CONFIG_BSD_DISKLABEL is not set |
| 963 | # CONFIG_MINIX_SUBPARTITION is not set | 1333 | # CONFIG_MINIX_SUBPARTITION is not set |
| @@ -1078,7 +1448,6 @@ CONFIG_FORCED_INLINING=y | |||
| 1078 | # CONFIG_DEBUG_PAGEALLOC is not set | 1448 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1079 | # CONFIG_DEBUGGER is not set | 1449 | # CONFIG_DEBUGGER is not set |
| 1080 | # CONFIG_BDI_SWITCH is not set | 1450 | # CONFIG_BDI_SWITCH is not set |
| 1081 | # CONFIG_BOOTX_TEXT is not set | ||
| 1082 | # CONFIG_PPC_EARLY_DEBUG is not set | 1451 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1083 | 1452 | ||
| 1084 | # | 1453 | # |
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig index a30bc6f6211c..0fb54c775cf9 100644 --- a/arch/powerpc/configs/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/mpc8560_ads_defconfig | |||
| @@ -1,9 +1,26 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:58 2007 | 4 | # Tue Aug 28 21:24:43 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | CONFIG_PPC_85xx=y | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_85xx=y | ||
| 18 | CONFIG_E500=y | ||
| 19 | CONFIG_BOOKE=y | ||
| 20 | CONFIG_FSL_BOOKE=y | ||
| 21 | # CONFIG_PHYS_64BIT is not set | ||
| 22 | CONFIG_SPE=y | ||
| 23 | # CONFIG_PPC_MM_SLICES is not set | ||
| 7 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| @@ -14,61 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 31 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 32 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 33 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 34 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 35 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 36 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 37 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 43 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 45 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 46 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | CONFIG_PPC_85xx=y | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_85xx=y | ||
| 42 | CONFIG_E500=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | CONFIG_BOOKE=y | ||
| 46 | CONFIG_FSL_BOOKE=y | ||
| 47 | # CONFIG_PHYS_64BIT is not set | ||
| 48 | CONFIG_SPE=y | ||
| 49 | # CONFIG_PPC_MM_SLICES is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 50 | ||
| 52 | # | 51 | # |
| 53 | # Code maturity level options | 52 | # General setup |
| 54 | # | 53 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 62 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 67 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 68 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -102,19 +96,12 @@ CONFIG_SLAB=y | |||
| 102 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
| 105 | |||
| 106 | # | ||
| 107 | # Loadable module support | ||
| 108 | # | ||
| 109 | # CONFIG_MODULES is not set | 99 | # CONFIG_MODULES is not set |
| 110 | |||
| 111 | # | ||
| 112 | # Block layer | ||
| 113 | # | ||
| 114 | CONFIG_BLOCK=y | 100 | CONFIG_BLOCK=y |
| 115 | # CONFIG_LBD is not set | 101 | # CONFIG_LBD is not set |
| 116 | # CONFIG_BLK_DEV_IO_TRACE is not set | 102 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 117 | # CONFIG_LSF is not set | 103 | # CONFIG_LSF is not set |
| 104 | # CONFIG_BLK_DEV_BSG is not set | ||
| 118 | 105 | ||
| 119 | # | 106 | # |
| 120 | # IO Schedulers | 107 | # IO Schedulers |
| @@ -155,6 +142,7 @@ CONFIG_MPIC=y | |||
| 155 | # CONFIG_GENERIC_IOMAP is not set | 142 | # CONFIG_GENERIC_IOMAP is not set |
| 156 | # CONFIG_CPU_FREQ is not set | 143 | # CONFIG_CPU_FREQ is not set |
| 157 | CONFIG_CPM2=y | 144 | CONFIG_CPM2=y |
| 145 | # CONFIG_FSL_ULI1575 is not set | ||
| 158 | 146 | ||
| 159 | # | 147 | # |
| 160 | # Kernel options | 148 | # Kernel options |
| @@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 184 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 185 | # CONFIG_RESOURCES_64BIT is not set | 173 | # CONFIG_RESOURCES_64BIT is not set |
| 186 | CONFIG_ZONE_DMA_FLAG=1 | 174 | CONFIG_ZONE_DMA_FLAG=1 |
| 175 | CONFIG_BOUNCE=y | ||
| 176 | CONFIG_VIRT_TO_BUS=y | ||
| 187 | # CONFIG_PROC_DEVICETREE is not set | 177 | # CONFIG_PROC_DEVICETREE is not set |
| 188 | # CONFIG_CMDLINE_BOOL is not set | 178 | # CONFIG_CMDLINE_BOOL is not set |
| 189 | # CONFIG_PM is not set | 179 | # CONFIG_PM is not set |
| @@ -197,10 +187,11 @@ CONFIG_ISA_DMA_API=y | |||
| 197 | # | 187 | # |
| 198 | CONFIG_ZONE_DMA=y | 188 | CONFIG_ZONE_DMA=y |
| 199 | CONFIG_PPC_INDIRECT_PCI=y | 189 | CONFIG_PPC_INDIRECT_PCI=y |
| 200 | CONFIG_PPC_INDIRECT_PCI_BE=y | ||
| 201 | CONFIG_FSL_SOC=y | 190 | CONFIG_FSL_SOC=y |
| 191 | CONFIG_FSL_PCI=y | ||
| 202 | CONFIG_PCI=y | 192 | CONFIG_PCI=y |
| 203 | CONFIG_PCI_DOMAINS=y | 193 | CONFIG_PCI_DOMAINS=y |
| 194 | CONFIG_PCI_SYSCALL=y | ||
| 204 | # CONFIG_PCIEPORTBUS is not set | 195 | # CONFIG_PCIEPORTBUS is not set |
| 205 | CONFIG_ARCH_SUPPORTS_MSI=y | 196 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 206 | # CONFIG_PCI_MSI is not set | 197 | # CONFIG_PCI_MSI is not set |
| @@ -311,6 +302,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 311 | # CONFIG_MAC80211 is not set | 302 | # CONFIG_MAC80211 is not set |
| 312 | # CONFIG_IEEE80211 is not set | 303 | # CONFIG_IEEE80211 is not set |
| 313 | # CONFIG_RFKILL is not set | 304 | # CONFIG_RFKILL is not set |
| 305 | # CONFIG_NET_9P is not set | ||
| 314 | 306 | ||
| 315 | # | 307 | # |
| 316 | # Device Drivers | 308 | # Device Drivers |
| @@ -325,26 +317,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 325 | # CONFIG_DEBUG_DRIVER is not set | 317 | # CONFIG_DEBUG_DRIVER is not set |
| 326 | # CONFIG_DEBUG_DEVRES is not set | 318 | # CONFIG_DEBUG_DEVRES is not set |
| 327 | # CONFIG_SYS_HYPERVISOR is not set | 319 | # CONFIG_SYS_HYPERVISOR is not set |
| 328 | |||
| 329 | # | ||
| 330 | # Connector - unified userspace <-> kernelspace linker | ||
| 331 | # | ||
| 332 | # CONFIG_CONNECTOR is not set | 320 | # CONFIG_CONNECTOR is not set |
| 333 | # CONFIG_MTD is not set | 321 | # CONFIG_MTD is not set |
| 334 | 322 | CONFIG_OF_DEVICE=y | |
| 335 | # | ||
| 336 | # Parallel port support | ||
| 337 | # | ||
| 338 | # CONFIG_PARPORT is not set | 323 | # CONFIG_PARPORT is not set |
| 339 | 324 | CONFIG_BLK_DEV=y | |
| 340 | # | ||
| 341 | # Plug and Play support | ||
| 342 | # | ||
| 343 | # CONFIG_PNPACPI is not set | ||
| 344 | |||
| 345 | # | ||
| 346 | # Block devices | ||
| 347 | # | ||
| 348 | # CONFIG_BLK_DEV_FD is not set | 325 | # CONFIG_BLK_DEV_FD is not set |
| 349 | # CONFIG_BLK_CPQ_DA is not set | 326 | # CONFIG_BLK_CPQ_DA is not set |
| 350 | # CONFIG_BLK_CPQ_CISS_DA is not set | 327 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -361,14 +338,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 361 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 338 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 362 | # CONFIG_CDROM_PKTCDVD is not set | 339 | # CONFIG_CDROM_PKTCDVD is not set |
| 363 | # CONFIG_ATA_OVER_ETH is not set | 340 | # CONFIG_ATA_OVER_ETH is not set |
| 364 | 341 | CONFIG_MISC_DEVICES=y | |
| 365 | # | ||
| 366 | # Misc devices | ||
| 367 | # | ||
| 368 | # CONFIG_PHANTOM is not set | 342 | # CONFIG_PHANTOM is not set |
| 343 | # CONFIG_EEPROM_93CX6 is not set | ||
| 369 | # CONFIG_SGI_IOC4 is not set | 344 | # CONFIG_SGI_IOC4 is not set |
| 370 | # CONFIG_TIFM_CORE is not set | 345 | # CONFIG_TIFM_CORE is not set |
| 371 | # CONFIG_BLINK is not set | ||
| 372 | # CONFIG_IDE is not set | 346 | # CONFIG_IDE is not set |
| 373 | 347 | ||
| 374 | # | 348 | # |
| @@ -376,12 +350,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 376 | # | 350 | # |
| 377 | # CONFIG_RAID_ATTRS is not set | 351 | # CONFIG_RAID_ATTRS is not set |
| 378 | # CONFIG_SCSI is not set | 352 | # CONFIG_SCSI is not set |
| 353 | # CONFIG_SCSI_DMA is not set | ||
| 379 | # CONFIG_SCSI_NETLINK is not set | 354 | # CONFIG_SCSI_NETLINK is not set |
| 380 | # CONFIG_ATA is not set | 355 | # CONFIG_ATA is not set |
| 381 | |||
| 382 | # | ||
| 383 | # Multi-device support (RAID and LVM) | ||
| 384 | # | ||
| 385 | # CONFIG_MD is not set | 356 | # CONFIG_MD is not set |
| 386 | 357 | ||
| 387 | # | 358 | # |
| @@ -394,19 +365,13 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 394 | # | 365 | # |
| 395 | # CONFIG_FIREWIRE is not set | 366 | # CONFIG_FIREWIRE is not set |
| 396 | # CONFIG_IEEE1394 is not set | 367 | # CONFIG_IEEE1394 is not set |
| 397 | |||
| 398 | # | ||
| 399 | # I2O device support | ||
| 400 | # | ||
| 401 | # CONFIG_I2O is not set | 368 | # CONFIG_I2O is not set |
| 402 | # CONFIG_MACINTOSH_DRIVERS is not set | 369 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 403 | |||
| 404 | # | ||
| 405 | # Network device support | ||
| 406 | # | ||
| 407 | CONFIG_NETDEVICES=y | 370 | CONFIG_NETDEVICES=y |
| 371 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 408 | # CONFIG_DUMMY is not set | 372 | # CONFIG_DUMMY is not set |
| 409 | # CONFIG_BONDING is not set | 373 | # CONFIG_BONDING is not set |
| 374 | # CONFIG_MACVLAN is not set | ||
| 410 | # CONFIG_EQUALIZER is not set | 375 | # CONFIG_EQUALIZER is not set |
| 411 | # CONFIG_TUN is not set | 376 | # CONFIG_TUN is not set |
| 412 | # CONFIG_ARCNET is not set | 377 | # CONFIG_ARCNET is not set |
| @@ -423,21 +388,14 @@ CONFIG_DAVICOM_PHY=y | |||
| 423 | # CONFIG_VITESSE_PHY is not set | 388 | # CONFIG_VITESSE_PHY is not set |
| 424 | # CONFIG_SMSC_PHY is not set | 389 | # CONFIG_SMSC_PHY is not set |
| 425 | # CONFIG_BROADCOM_PHY is not set | 390 | # CONFIG_BROADCOM_PHY is not set |
| 391 | # CONFIG_ICPLUS_PHY is not set | ||
| 426 | # CONFIG_FIXED_PHY is not set | 392 | # CONFIG_FIXED_PHY is not set |
| 427 | |||
| 428 | # | ||
| 429 | # Ethernet (10 or 100Mbit) | ||
| 430 | # | ||
| 431 | CONFIG_NET_ETHERNET=y | 393 | CONFIG_NET_ETHERNET=y |
| 432 | CONFIG_MII=y | 394 | CONFIG_MII=y |
| 433 | # CONFIG_HAPPYMEAL is not set | 395 | # CONFIG_HAPPYMEAL is not set |
| 434 | # CONFIG_SUNGEM is not set | 396 | # CONFIG_SUNGEM is not set |
| 435 | # CONFIG_CASSINI is not set | 397 | # CONFIG_CASSINI is not set |
| 436 | # CONFIG_NET_VENDOR_3COM is not set | 398 | # CONFIG_NET_VENDOR_3COM is not set |
| 437 | |||
| 438 | # | ||
| 439 | # Tulip family network device support | ||
| 440 | # | ||
| 441 | # CONFIG_NET_TULIP is not set | 399 | # CONFIG_NET_TULIP is not set |
| 442 | # CONFIG_HP100 is not set | 400 | # CONFIG_HP100 is not set |
| 443 | # CONFIG_NET_PCI is not set | 401 | # CONFIG_NET_PCI is not set |
| @@ -457,7 +415,6 @@ CONFIG_E1000_NAPI=y | |||
| 457 | # CONFIG_SIS190 is not set | 415 | # CONFIG_SIS190 is not set |
| 458 | # CONFIG_SKGE is not set | 416 | # CONFIG_SKGE is not set |
| 459 | # CONFIG_SKY2 is not set | 417 | # CONFIG_SKY2 is not set |
| 460 | # CONFIG_SK98LIN is not set | ||
| 461 | # CONFIG_VIA_VELOCITY is not set | 418 | # CONFIG_VIA_VELOCITY is not set |
| 462 | # CONFIG_TIGON3 is not set | 419 | # CONFIG_TIGON3 is not set |
| 463 | # CONFIG_BNX2 is not set | 420 | # CONFIG_BNX2 is not set |
| @@ -489,15 +446,7 @@ CONFIG_NETDEV_10000=y | |||
| 489 | # CONFIG_NETCONSOLE is not set | 446 | # CONFIG_NETCONSOLE is not set |
| 490 | # CONFIG_NETPOLL is not set | 447 | # CONFIG_NETPOLL is not set |
| 491 | # CONFIG_NET_POLL_CONTROLLER is not set | 448 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 492 | |||
| 493 | # | ||
| 494 | # ISDN subsystem | ||
| 495 | # | ||
| 496 | # CONFIG_ISDN is not set | 449 | # CONFIG_ISDN is not set |
| 497 | |||
| 498 | # | ||
| 499 | # Telephony Support | ||
| 500 | # | ||
| 501 | # CONFIG_PHONE is not set | 450 | # CONFIG_PHONE is not set |
| 502 | 451 | ||
| 503 | # | 452 | # |
| @@ -561,10 +510,6 @@ CONFIG_SERIAL_CPM_SCC2=y | |||
| 561 | CONFIG_UNIX98_PTYS=y | 510 | CONFIG_UNIX98_PTYS=y |
| 562 | CONFIG_LEGACY_PTYS=y | 511 | CONFIG_LEGACY_PTYS=y |
| 563 | CONFIG_LEGACY_PTY_COUNT=256 | 512 | CONFIG_LEGACY_PTY_COUNT=256 |
| 564 | |||
| 565 | # | ||
| 566 | # IPMI | ||
| 567 | # | ||
| 568 | # CONFIG_IPMI_HANDLER is not set | 513 | # CONFIG_IPMI_HANDLER is not set |
| 569 | # CONFIG_WATCHDOG is not set | 514 | # CONFIG_WATCHDOG is not set |
| 570 | CONFIG_HW_RANDOM=y | 515 | CONFIG_HW_RANDOM=y |
| @@ -576,10 +521,6 @@ CONFIG_GEN_RTC=y | |||
| 576 | # CONFIG_AGP is not set | 521 | # CONFIG_AGP is not set |
| 577 | # CONFIG_DRM is not set | 522 | # CONFIG_DRM is not set |
| 578 | # CONFIG_RAW_DRIVER is not set | 523 | # CONFIG_RAW_DRIVER is not set |
| 579 | |||
| 580 | # | ||
| 581 | # TPM devices | ||
| 582 | # | ||
| 583 | # CONFIG_TCG_TPM is not set | 524 | # CONFIG_TCG_TPM is not set |
| 584 | CONFIG_DEVPORT=y | 525 | CONFIG_DEVPORT=y |
| 585 | # CONFIG_I2C is not set | 526 | # CONFIG_I2C is not set |
| @@ -589,20 +530,24 @@ CONFIG_DEVPORT=y | |||
| 589 | # | 530 | # |
| 590 | # CONFIG_SPI is not set | 531 | # CONFIG_SPI is not set |
| 591 | # CONFIG_SPI_MASTER is not set | 532 | # CONFIG_SPI_MASTER is not set |
| 592 | |||
| 593 | # | ||
| 594 | # Dallas's 1-wire bus | ||
| 595 | # | ||
| 596 | # CONFIG_W1 is not set | 533 | # CONFIG_W1 is not set |
| 534 | # CONFIG_POWER_SUPPLY is not set | ||
| 597 | CONFIG_HWMON=y | 535 | CONFIG_HWMON=y |
| 598 | # CONFIG_HWMON_VID is not set | 536 | # CONFIG_HWMON_VID is not set |
| 599 | # CONFIG_SENSORS_ABITUGURU is not set | 537 | # CONFIG_SENSORS_ABITUGURU is not set |
| 538 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 600 | # CONFIG_SENSORS_F71805F is not set | 539 | # CONFIG_SENSORS_F71805F is not set |
| 540 | # CONFIG_SENSORS_IT87 is not set | ||
| 541 | # CONFIG_SENSORS_PC87360 is not set | ||
| 601 | # CONFIG_SENSORS_PC87427 is not set | 542 | # CONFIG_SENSORS_PC87427 is not set |
| 543 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 602 | # CONFIG_SENSORS_SMSC47M1 is not set | 544 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 603 | # CONFIG_SENSORS_SMSC47B397 is not set | 545 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 546 | # CONFIG_SENSORS_VIA686A is not set | ||
| 604 | # CONFIG_SENSORS_VT1211 is not set | 547 | # CONFIG_SENSORS_VT1211 is not set |
| 548 | # CONFIG_SENSORS_VT8231 is not set | ||
| 605 | # CONFIG_SENSORS_W83627HF is not set | 549 | # CONFIG_SENSORS_W83627HF is not set |
| 550 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 606 | # CONFIG_HWMON_DEBUG_CHIP is not set | 551 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 607 | 552 | ||
| 608 | # | 553 | # |
| @@ -627,6 +572,7 @@ CONFIG_DAB=y | |||
| 627 | # | 572 | # |
| 628 | # CONFIG_DISPLAY_SUPPORT is not set | 573 | # CONFIG_DISPLAY_SUPPORT is not set |
| 629 | # CONFIG_VGASTATE is not set | 574 | # CONFIG_VGASTATE is not set |
| 575 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 630 | # CONFIG_FB is not set | 576 | # CONFIG_FB is not set |
| 631 | # CONFIG_FB_IBM_GXT4500 is not set | 577 | # CONFIG_FB_IBM_GXT4500 is not set |
| 632 | 578 | ||
| @@ -634,16 +580,10 @@ CONFIG_DAB=y | |||
| 634 | # Sound | 580 | # Sound |
| 635 | # | 581 | # |
| 636 | # CONFIG_SOUND is not set | 582 | # CONFIG_SOUND is not set |
| 637 | 583 | CONFIG_HID_SUPPORT=y | |
| 638 | # | ||
| 639 | # HID Devices | ||
| 640 | # | ||
| 641 | CONFIG_HID=y | 584 | CONFIG_HID=y |
| 642 | # CONFIG_HID_DEBUG is not set | 585 | # CONFIG_HID_DEBUG is not set |
| 643 | 586 | CONFIG_USB_SUPPORT=y | |
| 644 | # | ||
| 645 | # USB support | ||
| 646 | # | ||
| 647 | CONFIG_USB_ARCH_HAS_HCD=y | 587 | CONFIG_USB_ARCH_HAS_HCD=y |
| 648 | CONFIG_USB_ARCH_HAS_OHCI=y | 588 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 649 | CONFIG_USB_ARCH_HAS_EHCI=y | 589 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -658,32 +598,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 658 | # | 598 | # |
| 659 | # CONFIG_USB_GADGET is not set | 599 | # CONFIG_USB_GADGET is not set |
| 660 | # CONFIG_MMC is not set | 600 | # CONFIG_MMC is not set |
| 661 | |||
| 662 | # | ||
| 663 | # LED devices | ||
| 664 | # | ||
| 665 | # CONFIG_NEW_LEDS is not set | 601 | # CONFIG_NEW_LEDS is not set |
| 666 | |||
| 667 | # | ||
| 668 | # LED drivers | ||
| 669 | # | ||
| 670 | |||
| 671 | # | ||
| 672 | # LED Triggers | ||
| 673 | # | ||
| 674 | |||
| 675 | # | ||
| 676 | # InfiniBand support | ||
| 677 | # | ||
| 678 | # CONFIG_INFINIBAND is not set | 602 | # CONFIG_INFINIBAND is not set |
| 679 | 603 | # CONFIG_EDAC is not set | |
| 680 | # | ||
| 681 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 682 | # | ||
| 683 | |||
| 684 | # | ||
| 685 | # Real Time Clock | ||
| 686 | # | ||
| 687 | # CONFIG_RTC_CLASS is not set | 604 | # CONFIG_RTC_CLASS is not set |
| 688 | 605 | ||
| 689 | # | 606 | # |
| @@ -700,6 +617,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 700 | # | 617 | # |
| 701 | 618 | ||
| 702 | # | 619 | # |
| 620 | # Userspace I/O | ||
| 621 | # | ||
| 622 | # CONFIG_UIO is not set | ||
| 623 | |||
| 624 | # | ||
| 703 | # File systems | 625 | # File systems |
| 704 | # | 626 | # |
| 705 | CONFIG_EXT2_FS=y | 627 | CONFIG_EXT2_FS=y |
| @@ -792,7 +714,6 @@ CONFIG_SUNRPC=y | |||
| 792 | # CONFIG_NCP_FS is not set | 714 | # CONFIG_NCP_FS is not set |
| 793 | # CONFIG_CODA_FS is not set | 715 | # CONFIG_CODA_FS is not set |
| 794 | # CONFIG_AFS_FS is not set | 716 | # CONFIG_AFS_FS is not set |
| 795 | # CONFIG_9P_FS is not set | ||
| 796 | 717 | ||
| 797 | # | 718 | # |
| 798 | # Partition Types | 719 | # Partition Types |
| @@ -831,6 +752,7 @@ CONFIG_BITREVERSE=y | |||
| 831 | # CONFIG_CRC16 is not set | 752 | # CONFIG_CRC16 is not set |
| 832 | # CONFIG_CRC_ITU_T is not set | 753 | # CONFIG_CRC_ITU_T is not set |
| 833 | CONFIG_CRC32=y | 754 | CONFIG_CRC32=y |
| 755 | # CONFIG_CRC7 is not set | ||
| 834 | # CONFIG_LIBCRC32C is not set | 756 | # CONFIG_LIBCRC32C is not set |
| 835 | CONFIG_PLIST=y | 757 | CONFIG_PLIST=y |
| 836 | CONFIG_HAS_IOMEM=y | 758 | CONFIG_HAS_IOMEM=y |
| @@ -854,6 +776,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 854 | CONFIG_DEBUG_KERNEL=y | 776 | CONFIG_DEBUG_KERNEL=y |
| 855 | # CONFIG_DEBUG_SHIRQ is not set | 777 | # CONFIG_DEBUG_SHIRQ is not set |
| 856 | CONFIG_DETECT_SOFTLOCKUP=y | 778 | CONFIG_DETECT_SOFTLOCKUP=y |
| 779 | CONFIG_SCHED_DEBUG=y | ||
| 857 | # CONFIG_SCHEDSTATS is not set | 780 | # CONFIG_SCHEDSTATS is not set |
| 858 | # CONFIG_TIMER_STATS is not set | 781 | # CONFIG_TIMER_STATS is not set |
| 859 | # CONFIG_DEBUG_SLAB is not set | 782 | # CONFIG_DEBUG_SLAB is not set |
| @@ -876,7 +799,6 @@ CONFIG_FORCED_INLINING=y | |||
| 876 | # CONFIG_DEBUGGER is not set | 799 | # CONFIG_DEBUGGER is not set |
| 877 | # CONFIG_KGDB_CONSOLE is not set | 800 | # CONFIG_KGDB_CONSOLE is not set |
| 878 | # CONFIG_BDI_SWITCH is not set | 801 | # CONFIG_BDI_SWITCH is not set |
| 879 | # CONFIG_BOOTX_TEXT is not set | ||
| 880 | # CONFIG_PPC_EARLY_DEBUG is not set | 802 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 881 | 803 | ||
| 882 | # | 804 | # |
| @@ -884,8 +806,4 @@ CONFIG_FORCED_INLINING=y | |||
| 884 | # | 806 | # |
| 885 | # CONFIG_KEYS is not set | 807 | # CONFIG_KEYS is not set |
| 886 | # CONFIG_SECURITY is not set | 808 | # CONFIG_SECURITY is not set |
| 887 | |||
| 888 | # | ||
| 889 | # Cryptographic options | ||
| 890 | # | ||
| 891 | # CONFIG_CRYPTO is not set | 809 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig index 417d3e6abcdf..0307fe7b0487 100644 --- a/arch/powerpc/configs/mpc8568mds_defconfig +++ b/arch/powerpc/configs/mpc8568mds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Fri Jul 20 13:55:04 2007 | 4 | # Tue Aug 28 21:24:43 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -38,6 +38,7 @@ CONFIG_GENERIC_NVRAM=y | |||
| 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 40 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 41 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 42 | # CONFIG_GENERIC_TBSYNC is not set | 43 | # CONFIG_GENERIC_TBSYNC is not set |
| 43 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| @@ -48,15 +49,11 @@ CONFIG_DEFAULT_UIMAGE=y | |||
| 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 49 | 50 | ||
| 50 | # | 51 | # |
| 51 | # Code maturity level options | 52 | # General setup |
| 52 | # | 53 | # |
| 53 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 54 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 56 | |||
| 57 | # | ||
| 58 | # General setup | ||
| 59 | # | ||
| 60 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 61 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 62 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| @@ -147,6 +144,7 @@ CONFIG_MPIC=y | |||
| 147 | # CONFIG_GENERIC_IOMAP is not set | 144 | # CONFIG_GENERIC_IOMAP is not set |
| 148 | # CONFIG_CPU_FREQ is not set | 145 | # CONFIG_CPU_FREQ is not set |
| 149 | # CONFIG_CPM2 is not set | 146 | # CONFIG_CPM2 is not set |
| 147 | # CONFIG_FSL_ULI1575 is not set | ||
| 150 | 148 | ||
| 151 | # | 149 | # |
| 152 | # Kernel options | 150 | # Kernel options |
| @@ -191,7 +189,6 @@ CONFIG_ISA_DMA_API=y | |||
| 191 | # | 189 | # |
| 192 | CONFIG_ZONE_DMA=y | 190 | CONFIG_ZONE_DMA=y |
| 193 | CONFIG_PPC_INDIRECT_PCI=y | 191 | CONFIG_PPC_INDIRECT_PCI=y |
| 194 | CONFIG_PPC_INDIRECT_PCI_BE=y | ||
| 195 | CONFIG_FSL_SOC=y | 192 | CONFIG_FSL_SOC=y |
| 196 | CONFIG_FSL_PCI=y | 193 | CONFIG_FSL_PCI=y |
| 197 | CONFIG_PCI=y | 194 | CONFIG_PCI=y |
| @@ -324,6 +321,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 324 | # CONFIG_SYS_HYPERVISOR is not set | 321 | # CONFIG_SYS_HYPERVISOR is not set |
| 325 | # CONFIG_CONNECTOR is not set | 322 | # CONFIG_CONNECTOR is not set |
| 326 | # CONFIG_MTD is not set | 323 | # CONFIG_MTD is not set |
| 324 | CONFIG_OF_DEVICE=y | ||
| 327 | # CONFIG_PARPORT is not set | 325 | # CONFIG_PARPORT is not set |
| 328 | CONFIG_BLK_DEV=y | 326 | CONFIG_BLK_DEV=y |
| 329 | # CONFIG_BLK_DEV_FD is not set | 327 | # CONFIG_BLK_DEV_FD is not set |
| @@ -384,12 +382,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 384 | # CONFIG_SCSI_SPI_ATTRS is not set | 382 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 385 | # CONFIG_SCSI_FC_ATTRS is not set | 383 | # CONFIG_SCSI_FC_ATTRS is not set |
| 386 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 384 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 387 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 388 | # CONFIG_SCSI_SAS_LIBSAS is not set | 385 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 389 | 386 | CONFIG_SCSI_LOWLEVEL=y | |
| 390 | # | ||
| 391 | # SCSI low-level drivers | ||
| 392 | # | ||
| 393 | # CONFIG_ISCSI_TCP is not set | 387 | # CONFIG_ISCSI_TCP is not set |
| 394 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 388 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 395 | # CONFIG_SCSI_3W_9XXX is not set | 389 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -672,6 +666,7 @@ CONFIG_I2C_MPC=y | |||
| 672 | CONFIG_HWMON=y | 666 | CONFIG_HWMON=y |
| 673 | # CONFIG_HWMON_VID is not set | 667 | # CONFIG_HWMON_VID is not set |
| 674 | # CONFIG_SENSORS_ABITUGURU is not set | 668 | # CONFIG_SENSORS_ABITUGURU is not set |
| 669 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 675 | # CONFIG_SENSORS_AD7418 is not set | 670 | # CONFIG_SENSORS_AD7418 is not set |
| 676 | # CONFIG_SENSORS_ADM1021 is not set | 671 | # CONFIG_SENSORS_ADM1021 is not set |
| 677 | # CONFIG_SENSORS_ADM1025 is not set | 672 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -698,14 +693,17 @@ CONFIG_HWMON=y | |||
| 698 | # CONFIG_SENSORS_LM87 is not set | 693 | # CONFIG_SENSORS_LM87 is not set |
| 699 | # CONFIG_SENSORS_LM90 is not set | 694 | # CONFIG_SENSORS_LM90 is not set |
| 700 | # CONFIG_SENSORS_LM92 is not set | 695 | # CONFIG_SENSORS_LM92 is not set |
| 696 | # CONFIG_SENSORS_LM93 is not set | ||
| 701 | # CONFIG_SENSORS_MAX1619 is not set | 697 | # CONFIG_SENSORS_MAX1619 is not set |
| 702 | # CONFIG_SENSORS_MAX6650 is not set | 698 | # CONFIG_SENSORS_MAX6650 is not set |
| 703 | # CONFIG_SENSORS_PC87360 is not set | 699 | # CONFIG_SENSORS_PC87360 is not set |
| 704 | # CONFIG_SENSORS_PC87427 is not set | 700 | # CONFIG_SENSORS_PC87427 is not set |
| 705 | # CONFIG_SENSORS_SIS5595 is not set | 701 | # CONFIG_SENSORS_SIS5595 is not set |
| 702 | # CONFIG_SENSORS_DME1737 is not set | ||
| 706 | # CONFIG_SENSORS_SMSC47M1 is not set | 703 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 707 | # CONFIG_SENSORS_SMSC47M192 is not set | 704 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 708 | # CONFIG_SENSORS_SMSC47B397 is not set | 705 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 706 | # CONFIG_SENSORS_THMC50 is not set | ||
| 709 | # CONFIG_SENSORS_VIA686A is not set | 707 | # CONFIG_SENSORS_VIA686A is not set |
| 710 | # CONFIG_SENSORS_VT1211 is not set | 708 | # CONFIG_SENSORS_VT1211 is not set |
| 711 | # CONFIG_SENSORS_VT8231 is not set | 709 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -740,6 +738,7 @@ CONFIG_DAB=y | |||
| 740 | # | 738 | # |
| 741 | # CONFIG_DISPLAY_SUPPORT is not set | 739 | # CONFIG_DISPLAY_SUPPORT is not set |
| 742 | # CONFIG_VGASTATE is not set | 740 | # CONFIG_VGASTATE is not set |
| 741 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 743 | # CONFIG_FB is not set | 742 | # CONFIG_FB is not set |
| 744 | # CONFIG_FB_IBM_GXT4500 is not set | 743 | # CONFIG_FB_IBM_GXT4500 is not set |
| 745 | 744 | ||
| @@ -765,24 +764,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 765 | # | 764 | # |
| 766 | # CONFIG_USB_GADGET is not set | 765 | # CONFIG_USB_GADGET is not set |
| 767 | # CONFIG_MMC is not set | 766 | # CONFIG_MMC is not set |
| 768 | |||
| 769 | # | ||
| 770 | # LED devices | ||
| 771 | # | ||
| 772 | # CONFIG_NEW_LEDS is not set | 767 | # CONFIG_NEW_LEDS is not set |
| 773 | |||
| 774 | # | ||
| 775 | # LED drivers | ||
| 776 | # | ||
| 777 | |||
| 778 | # | ||
| 779 | # LED Triggers | ||
| 780 | # | ||
| 781 | # CONFIG_INFINIBAND is not set | 768 | # CONFIG_INFINIBAND is not set |
| 782 | 769 | # CONFIG_EDAC is not set | |
| 783 | # | ||
| 784 | # Real Time Clock | ||
| 785 | # | ||
| 786 | # CONFIG_RTC_CLASS is not set | 770 | # CONFIG_RTC_CLASS is not set |
| 787 | 771 | ||
| 788 | # | 772 | # |
| @@ -986,7 +970,6 @@ CONFIG_FORCED_INLINING=y | |||
| 986 | CONFIG_DEBUGGER=y | 970 | CONFIG_DEBUGGER=y |
| 987 | # CONFIG_XMON is not set | 971 | # CONFIG_XMON is not set |
| 988 | # CONFIG_BDI_SWITCH is not set | 972 | # CONFIG_BDI_SWITCH is not set |
| 989 | # CONFIG_BOOTX_TEXT is not set | ||
| 990 | CONFIG_PPC_EARLY_DEBUG=y | 973 | CONFIG_PPC_EARLY_DEBUG=y |
| 991 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 974 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| 992 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | 975 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set |
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig index d9afe7009d99..e6850c619f88 100644 --- a/arch/powerpc/configs/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/mpc85xx_cds_defconfig | |||
| @@ -1,9 +1,26 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:56:59 2007 | 4 | # Tue Aug 28 21:24:43 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | CONFIG_PPC_85xx=y | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_85xx=y | ||
| 18 | CONFIG_E500=y | ||
| 19 | CONFIG_BOOKE=y | ||
| 20 | CONFIG_FSL_BOOKE=y | ||
| 21 | # CONFIG_PHYS_64BIT is not set | ||
| 22 | CONFIG_SPE=y | ||
| 23 | # CONFIG_PPC_MM_SLICES is not set | ||
| 7 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| @@ -14,61 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 31 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 32 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 33 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 34 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 35 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 36 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 37 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 43 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 45 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 46 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | CONFIG_PPC_85xx=y | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_85xx=y | ||
| 42 | CONFIG_E500=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | CONFIG_BOOKE=y | ||
| 46 | CONFIG_FSL_BOOKE=y | ||
| 47 | # CONFIG_PHYS_64BIT is not set | ||
| 48 | CONFIG_SPE=y | ||
| 49 | # CONFIG_PPC_MM_SLICES is not set | ||
| 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 51 | 50 | ||
| 52 | # | 51 | # |
| 53 | # Code maturity level options | 52 | # General setup |
| 54 | # | 53 | # |
| 55 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 56 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 58 | |||
| 59 | # | ||
| 60 | # General setup | ||
| 61 | # | ||
| 62 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 63 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 65 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 66 | # CONFIG_IPC_NS is not set | ||
| 67 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_POSIX_MQUEUE is not set | 62 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 72 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 73 | # CONFIG_IKCONFIG is not set | 67 | # CONFIG_IKCONFIG is not set |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 68 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -102,19 +96,12 @@ CONFIG_SLAB=y | |||
| 102 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
| 103 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
| 105 | |||
| 106 | # | ||
| 107 | # Loadable module support | ||
| 108 | # | ||
| 109 | # CONFIG_MODULES is not set | 99 | # CONFIG_MODULES is not set |
| 110 | |||
| 111 | # | ||
| 112 | # Block layer | ||
| 113 | # | ||
| 114 | CONFIG_BLOCK=y | 100 | CONFIG_BLOCK=y |
| 115 | # CONFIG_LBD is not set | 101 | # CONFIG_LBD is not set |
| 116 | # CONFIG_BLK_DEV_IO_TRACE is not set | 102 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 117 | # CONFIG_LSF is not set | 103 | # CONFIG_LSF is not set |
| 104 | # CONFIG_BLK_DEV_BSG is not set | ||
| 118 | 105 | ||
| 119 | # | 106 | # |
| 120 | # IO Schedulers | 107 | # IO Schedulers |
| @@ -146,7 +133,7 @@ CONFIG_MPC8540=y | |||
| 146 | CONFIG_MPC85xx=y | 133 | CONFIG_MPC85xx=y |
| 147 | CONFIG_MPIC=y | 134 | CONFIG_MPIC=y |
| 148 | # CONFIG_MPIC_WEIRD is not set | 135 | # CONFIG_MPIC_WEIRD is not set |
| 149 | # CONFIG_PPC_I8259 is not set | 136 | CONFIG_PPC_I8259=y |
| 150 | # CONFIG_PPC_RTAS is not set | 137 | # CONFIG_PPC_RTAS is not set |
| 151 | # CONFIG_MMIO_NVRAM is not set | 138 | # CONFIG_MMIO_NVRAM is not set |
| 152 | # CONFIG_PPC_MPC106 is not set | 139 | # CONFIG_PPC_MPC106 is not set |
| @@ -155,6 +142,7 @@ CONFIG_MPIC=y | |||
| 155 | # CONFIG_GENERIC_IOMAP is not set | 142 | # CONFIG_GENERIC_IOMAP is not set |
| 156 | # CONFIG_CPU_FREQ is not set | 143 | # CONFIG_CPU_FREQ is not set |
| 157 | # CONFIG_CPM2 is not set | 144 | # CONFIG_CPM2 is not set |
| 145 | # CONFIG_FSL_ULI1575 is not set | ||
| 158 | 146 | ||
| 159 | # | 147 | # |
| 160 | # Kernel options | 148 | # Kernel options |
| @@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 184 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 185 | # CONFIG_RESOURCES_64BIT is not set | 173 | # CONFIG_RESOURCES_64BIT is not set |
| 186 | CONFIG_ZONE_DMA_FLAG=1 | 174 | CONFIG_ZONE_DMA_FLAG=1 |
| 175 | CONFIG_BOUNCE=y | ||
| 176 | CONFIG_VIRT_TO_BUS=y | ||
| 187 | CONFIG_PROC_DEVICETREE=y | 177 | CONFIG_PROC_DEVICETREE=y |
| 188 | # CONFIG_CMDLINE_BOOL is not set | 178 | # CONFIG_CMDLINE_BOOL is not set |
| 189 | # CONFIG_PM is not set | 179 | # CONFIG_PM is not set |
| @@ -197,10 +187,11 @@ CONFIG_ISA_DMA_API=y | |||
| 197 | # | 187 | # |
| 198 | CONFIG_ZONE_DMA=y | 188 | CONFIG_ZONE_DMA=y |
| 199 | CONFIG_PPC_INDIRECT_PCI=y | 189 | CONFIG_PPC_INDIRECT_PCI=y |
| 200 | CONFIG_PPC_INDIRECT_PCI_BE=y | ||
| 201 | CONFIG_FSL_SOC=y | 190 | CONFIG_FSL_SOC=y |
| 191 | CONFIG_FSL_PCI=y | ||
| 202 | CONFIG_PCI=y | 192 | CONFIG_PCI=y |
| 203 | CONFIG_PCI_DOMAINS=y | 193 | CONFIG_PCI_DOMAINS=y |
| 194 | CONFIG_PCI_SYSCALL=y | ||
| 204 | # CONFIG_PCIEPORTBUS is not set | 195 | # CONFIG_PCIEPORTBUS is not set |
| 205 | CONFIG_ARCH_SUPPORTS_MSI=y | 196 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 206 | # CONFIG_PCI_MSI is not set | 197 | # CONFIG_PCI_MSI is not set |
| @@ -311,6 +302,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 311 | # CONFIG_MAC80211 is not set | 302 | # CONFIG_MAC80211 is not set |
| 312 | # CONFIG_IEEE80211 is not set | 303 | # CONFIG_IEEE80211 is not set |
| 313 | # CONFIG_RFKILL is not set | 304 | # CONFIG_RFKILL is not set |
| 305 | # CONFIG_NET_9P is not set | ||
| 314 | 306 | ||
| 315 | # | 307 | # |
| 316 | # Device Drivers | 308 | # Device Drivers |
| @@ -325,26 +317,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 325 | # CONFIG_DEBUG_DRIVER is not set | 317 | # CONFIG_DEBUG_DRIVER is not set |
| 326 | # CONFIG_DEBUG_DEVRES is not set | 318 | # CONFIG_DEBUG_DEVRES is not set |
| 327 | # CONFIG_SYS_HYPERVISOR is not set | 319 | # CONFIG_SYS_HYPERVISOR is not set |
| 328 | |||
| 329 | # | ||
| 330 | # Connector - unified userspace <-> kernelspace linker | ||
| 331 | # | ||
| 332 | # CONFIG_CONNECTOR is not set | 320 | # CONFIG_CONNECTOR is not set |
| 333 | # CONFIG_MTD is not set | 321 | # CONFIG_MTD is not set |
| 334 | 322 | CONFIG_OF_DEVICE=y | |
| 335 | # | ||
| 336 | # Parallel port support | ||
| 337 | # | ||
| 338 | # CONFIG_PARPORT is not set | 323 | # CONFIG_PARPORT is not set |
| 339 | 324 | CONFIG_BLK_DEV=y | |
| 340 | # | ||
| 341 | # Plug and Play support | ||
| 342 | # | ||
| 343 | # CONFIG_PNPACPI is not set | ||
| 344 | |||
| 345 | # | ||
| 346 | # Block devices | ||
| 347 | # | ||
| 348 | # CONFIG_BLK_DEV_FD is not set | 325 | # CONFIG_BLK_DEV_FD is not set |
| 349 | # CONFIG_BLK_CPQ_DA is not set | 326 | # CONFIG_BLK_CPQ_DA is not set |
| 350 | # CONFIG_BLK_CPQ_CISS_DA is not set | 327 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -361,14 +338,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 361 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 338 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 362 | # CONFIG_CDROM_PKTCDVD is not set | 339 | # CONFIG_CDROM_PKTCDVD is not set |
| 363 | # CONFIG_ATA_OVER_ETH is not set | 340 | # CONFIG_ATA_OVER_ETH is not set |
| 364 | 341 | CONFIG_MISC_DEVICES=y | |
| 365 | # | ||
| 366 | # Misc devices | ||
| 367 | # | ||
| 368 | # CONFIG_PHANTOM is not set | 342 | # CONFIG_PHANTOM is not set |
| 343 | # CONFIG_EEPROM_93CX6 is not set | ||
| 369 | # CONFIG_SGI_IOC4 is not set | 344 | # CONFIG_SGI_IOC4 is not set |
| 370 | # CONFIG_TIFM_CORE is not set | 345 | # CONFIG_TIFM_CORE is not set |
| 371 | # CONFIG_BLINK is not set | ||
| 372 | CONFIG_IDE=y | 346 | CONFIG_IDE=y |
| 373 | CONFIG_IDE_MAX_HWIFS=4 | 347 | CONFIG_IDE_MAX_HWIFS=4 |
| 374 | CONFIG_BLK_DEV_IDE=y | 348 | CONFIG_BLK_DEV_IDE=y |
| @@ -433,12 +407,9 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 433 | # | 407 | # |
| 434 | # CONFIG_RAID_ATTRS is not set | 408 | # CONFIG_RAID_ATTRS is not set |
| 435 | # CONFIG_SCSI is not set | 409 | # CONFIG_SCSI is not set |
| 410 | # CONFIG_SCSI_DMA is not set | ||
| 436 | # CONFIG_SCSI_NETLINK is not set | 411 | # CONFIG_SCSI_NETLINK is not set |
| 437 | # CONFIG_ATA is not set | 412 | # CONFIG_ATA is not set |
| 438 | |||
| 439 | # | ||
| 440 | # Multi-device support (RAID and LVM) | ||
| 441 | # | ||
| 442 | # CONFIG_MD is not set | 413 | # CONFIG_MD is not set |
| 443 | 414 | ||
| 444 | # | 415 | # |
| @@ -451,19 +422,13 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 451 | # | 422 | # |
| 452 | # CONFIG_FIREWIRE is not set | 423 | # CONFIG_FIREWIRE is not set |
| 453 | # CONFIG_IEEE1394 is not set | 424 | # CONFIG_IEEE1394 is not set |
| 454 | |||
| 455 | # | ||
| 456 | # I2O device support | ||
| 457 | # | ||
| 458 | # CONFIG_I2O is not set | 425 | # CONFIG_I2O is not set |
| 459 | # CONFIG_MACINTOSH_DRIVERS is not set | 426 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 460 | |||
| 461 | # | ||
| 462 | # Network device support | ||
| 463 | # | ||
| 464 | CONFIG_NETDEVICES=y | 427 | CONFIG_NETDEVICES=y |
| 428 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 465 | # CONFIG_DUMMY is not set | 429 | # CONFIG_DUMMY is not set |
| 466 | # CONFIG_BONDING is not set | 430 | # CONFIG_BONDING is not set |
| 431 | # CONFIG_MACVLAN is not set | ||
| 467 | # CONFIG_EQUALIZER is not set | 432 | # CONFIG_EQUALIZER is not set |
| 468 | # CONFIG_TUN is not set | 433 | # CONFIG_TUN is not set |
| 469 | # CONFIG_ARCNET is not set | 434 | # CONFIG_ARCNET is not set |
| @@ -480,21 +445,14 @@ CONFIG_PHYLIB=y | |||
| 480 | # CONFIG_VITESSE_PHY is not set | 445 | # CONFIG_VITESSE_PHY is not set |
| 481 | # CONFIG_SMSC_PHY is not set | 446 | # CONFIG_SMSC_PHY is not set |
| 482 | # CONFIG_BROADCOM_PHY is not set | 447 | # CONFIG_BROADCOM_PHY is not set |
| 448 | # CONFIG_ICPLUS_PHY is not set | ||
| 483 | # CONFIG_FIXED_PHY is not set | 449 | # CONFIG_FIXED_PHY is not set |
| 484 | |||
| 485 | # | ||
| 486 | # Ethernet (10 or 100Mbit) | ||
| 487 | # | ||
| 488 | CONFIG_NET_ETHERNET=y | 450 | CONFIG_NET_ETHERNET=y |
| 489 | CONFIG_MII=y | 451 | CONFIG_MII=y |
| 490 | # CONFIG_HAPPYMEAL is not set | 452 | # CONFIG_HAPPYMEAL is not set |
| 491 | # CONFIG_SUNGEM is not set | 453 | # CONFIG_SUNGEM is not set |
| 492 | # CONFIG_CASSINI is not set | 454 | # CONFIG_CASSINI is not set |
| 493 | # CONFIG_NET_VENDOR_3COM is not set | 455 | # CONFIG_NET_VENDOR_3COM is not set |
| 494 | |||
| 495 | # | ||
| 496 | # Tulip family network device support | ||
| 497 | # | ||
| 498 | # CONFIG_NET_TULIP is not set | 456 | # CONFIG_NET_TULIP is not set |
| 499 | # CONFIG_HP100 is not set | 457 | # CONFIG_HP100 is not set |
| 500 | # CONFIG_NET_PCI is not set | 458 | # CONFIG_NET_PCI is not set |
| @@ -511,7 +469,6 @@ CONFIG_E1000_NAPI=y | |||
| 511 | # CONFIG_SIS190 is not set | 469 | # CONFIG_SIS190 is not set |
| 512 | # CONFIG_SKGE is not set | 470 | # CONFIG_SKGE is not set |
| 513 | # CONFIG_SKY2 is not set | 471 | # CONFIG_SKY2 is not set |
| 514 | # CONFIG_SK98LIN is not set | ||
| 515 | # CONFIG_VIA_VELOCITY is not set | 472 | # CONFIG_VIA_VELOCITY is not set |
| 516 | # CONFIG_TIGON3 is not set | 473 | # CONFIG_TIGON3 is not set |
| 517 | # CONFIG_BNX2 is not set | 474 | # CONFIG_BNX2 is not set |
| @@ -543,15 +500,7 @@ CONFIG_NETDEV_10000=y | |||
| 543 | # CONFIG_NETCONSOLE is not set | 500 | # CONFIG_NETCONSOLE is not set |
| 544 | # CONFIG_NETPOLL is not set | 501 | # CONFIG_NETPOLL is not set |
| 545 | # CONFIG_NET_POLL_CONTROLLER is not set | 502 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 546 | |||
| 547 | # | ||
| 548 | # ISDN subsystem | ||
| 549 | # | ||
| 550 | # CONFIG_ISDN is not set | 503 | # CONFIG_ISDN is not set |
| 551 | |||
| 552 | # | ||
| 553 | # Telephony Support | ||
| 554 | # | ||
| 555 | # CONFIG_PHONE is not set | 504 | # CONFIG_PHONE is not set |
| 556 | 505 | ||
| 557 | # | 506 | # |
| @@ -614,10 +563,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 614 | CONFIG_UNIX98_PTYS=y | 563 | CONFIG_UNIX98_PTYS=y |
| 615 | CONFIG_LEGACY_PTYS=y | 564 | CONFIG_LEGACY_PTYS=y |
| 616 | CONFIG_LEGACY_PTY_COUNT=256 | 565 | CONFIG_LEGACY_PTY_COUNT=256 |
| 617 | |||
| 618 | # | ||
| 619 | # IPMI | ||
| 620 | # | ||
| 621 | # CONFIG_IPMI_HANDLER is not set | 566 | # CONFIG_IPMI_HANDLER is not set |
| 622 | # CONFIG_WATCHDOG is not set | 567 | # CONFIG_WATCHDOG is not set |
| 623 | # CONFIG_HW_RANDOM is not set | 568 | # CONFIG_HW_RANDOM is not set |
| @@ -629,10 +574,6 @@ CONFIG_GEN_RTC=y | |||
| 629 | # CONFIG_AGP is not set | 574 | # CONFIG_AGP is not set |
| 630 | # CONFIG_DRM is not set | 575 | # CONFIG_DRM is not set |
| 631 | # CONFIG_RAW_DRIVER is not set | 576 | # CONFIG_RAW_DRIVER is not set |
| 632 | |||
| 633 | # | ||
| 634 | # TPM devices | ||
| 635 | # | ||
| 636 | # CONFIG_TCG_TPM is not set | 577 | # CONFIG_TCG_TPM is not set |
| 637 | CONFIG_DEVPORT=y | 578 | CONFIG_DEVPORT=y |
| 638 | # CONFIG_I2C is not set | 579 | # CONFIG_I2C is not set |
| @@ -642,20 +583,24 @@ CONFIG_DEVPORT=y | |||
| 642 | # | 583 | # |
| 643 | # CONFIG_SPI is not set | 584 | # CONFIG_SPI is not set |
| 644 | # CONFIG_SPI_MASTER is not set | 585 | # CONFIG_SPI_MASTER is not set |
| 645 | |||
| 646 | # | ||
| 647 | # Dallas's 1-wire bus | ||
| 648 | # | ||
| 649 | # CONFIG_W1 is not set | 586 | # CONFIG_W1 is not set |
| 587 | # CONFIG_POWER_SUPPLY is not set | ||
| 650 | CONFIG_HWMON=y | 588 | CONFIG_HWMON=y |
| 651 | # CONFIG_HWMON_VID is not set | 589 | # CONFIG_HWMON_VID is not set |
| 652 | # CONFIG_SENSORS_ABITUGURU is not set | 590 | # CONFIG_SENSORS_ABITUGURU is not set |
| 591 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 653 | # CONFIG_SENSORS_F71805F is not set | 592 | # CONFIG_SENSORS_F71805F is not set |
| 593 | # CONFIG_SENSORS_IT87 is not set | ||
| 594 | # CONFIG_SENSORS_PC87360 is not set | ||
| 654 | # CONFIG_SENSORS_PC87427 is not set | 595 | # CONFIG_SENSORS_PC87427 is not set |
| 596 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 655 | # CONFIG_SENSORS_SMSC47M1 is not set | 597 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 656 | # CONFIG_SENSORS_SMSC47B397 is not set | 598 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 599 | # CONFIG_SENSORS_VIA686A is not set | ||
| 657 | # CONFIG_SENSORS_VT1211 is not set | 600 | # CONFIG_SENSORS_VT1211 is not set |
| 601 | # CONFIG_SENSORS_VT8231 is not set | ||
| 658 | # CONFIG_SENSORS_W83627HF is not set | 602 | # CONFIG_SENSORS_W83627HF is not set |
| 603 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 659 | # CONFIG_HWMON_DEBUG_CHIP is not set | 604 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 660 | 605 | ||
| 661 | # | 606 | # |
| @@ -680,6 +625,7 @@ CONFIG_DAB=y | |||
| 680 | # | 625 | # |
| 681 | # CONFIG_DISPLAY_SUPPORT is not set | 626 | # CONFIG_DISPLAY_SUPPORT is not set |
| 682 | # CONFIG_VGASTATE is not set | 627 | # CONFIG_VGASTATE is not set |
| 628 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 683 | # CONFIG_FB is not set | 629 | # CONFIG_FB is not set |
| 684 | # CONFIG_FB_IBM_GXT4500 is not set | 630 | # CONFIG_FB_IBM_GXT4500 is not set |
| 685 | 631 | ||
| @@ -687,16 +633,10 @@ CONFIG_DAB=y | |||
| 687 | # Sound | 633 | # Sound |
| 688 | # | 634 | # |
| 689 | # CONFIG_SOUND is not set | 635 | # CONFIG_SOUND is not set |
| 690 | 636 | CONFIG_HID_SUPPORT=y | |
| 691 | # | ||
| 692 | # HID Devices | ||
| 693 | # | ||
| 694 | CONFIG_HID=y | 637 | CONFIG_HID=y |
| 695 | # CONFIG_HID_DEBUG is not set | 638 | # CONFIG_HID_DEBUG is not set |
| 696 | 639 | CONFIG_USB_SUPPORT=y | |
| 697 | # | ||
| 698 | # USB support | ||
| 699 | # | ||
| 700 | CONFIG_USB_ARCH_HAS_HCD=y | 640 | CONFIG_USB_ARCH_HAS_HCD=y |
| 701 | CONFIG_USB_ARCH_HAS_OHCI=y | 641 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 702 | CONFIG_USB_ARCH_HAS_EHCI=y | 642 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -711,32 +651,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 711 | # | 651 | # |
| 712 | # CONFIG_USB_GADGET is not set | 652 | # CONFIG_USB_GADGET is not set |
| 713 | # CONFIG_MMC is not set | 653 | # CONFIG_MMC is not set |
| 714 | |||
| 715 | # | ||
| 716 | # LED devices | ||
| 717 | # | ||
| 718 | # CONFIG_NEW_LEDS is not set | 654 | # CONFIG_NEW_LEDS is not set |
| 719 | |||
| 720 | # | ||
| 721 | # LED drivers | ||
| 722 | # | ||
| 723 | |||
| 724 | # | ||
| 725 | # LED Triggers | ||
| 726 | # | ||
| 727 | |||
| 728 | # | ||
| 729 | # InfiniBand support | ||
| 730 | # | ||
| 731 | # CONFIG_INFINIBAND is not set | 655 | # CONFIG_INFINIBAND is not set |
| 732 | 656 | # CONFIG_EDAC is not set | |
| 733 | # | ||
| 734 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 735 | # | ||
| 736 | |||
| 737 | # | ||
| 738 | # Real Time Clock | ||
| 739 | # | ||
| 740 | # CONFIG_RTC_CLASS is not set | 657 | # CONFIG_RTC_CLASS is not set |
| 741 | 658 | ||
| 742 | # | 659 | # |
| @@ -753,6 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 753 | # | 670 | # |
| 754 | 671 | ||
| 755 | # | 672 | # |
| 673 | # Userspace I/O | ||
| 674 | # | ||
| 675 | # CONFIG_UIO is not set | ||
| 676 | |||
| 677 | # | ||
| 756 | # File systems | 678 | # File systems |
| 757 | # | 679 | # |
| 758 | CONFIG_EXT2_FS=y | 680 | CONFIG_EXT2_FS=y |
| @@ -845,7 +767,6 @@ CONFIG_SUNRPC=y | |||
| 845 | # CONFIG_NCP_FS is not set | 767 | # CONFIG_NCP_FS is not set |
| 846 | # CONFIG_CODA_FS is not set | 768 | # CONFIG_CODA_FS is not set |
| 847 | # CONFIG_AFS_FS is not set | 769 | # CONFIG_AFS_FS is not set |
| 848 | # CONFIG_9P_FS is not set | ||
| 849 | 770 | ||
| 850 | # | 771 | # |
| 851 | # Partition Types | 772 | # Partition Types |
| @@ -884,6 +805,7 @@ CONFIG_BITREVERSE=y | |||
| 884 | # CONFIG_CRC16 is not set | 805 | # CONFIG_CRC16 is not set |
| 885 | # CONFIG_CRC_ITU_T is not set | 806 | # CONFIG_CRC_ITU_T is not set |
| 886 | CONFIG_CRC32=y | 807 | CONFIG_CRC32=y |
| 808 | # CONFIG_CRC7 is not set | ||
| 887 | # CONFIG_LIBCRC32C is not set | 809 | # CONFIG_LIBCRC32C is not set |
| 888 | CONFIG_PLIST=y | 810 | CONFIG_PLIST=y |
| 889 | CONFIG_HAS_IOMEM=y | 811 | CONFIG_HAS_IOMEM=y |
| @@ -907,6 +829,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 907 | CONFIG_DEBUG_KERNEL=y | 829 | CONFIG_DEBUG_KERNEL=y |
| 908 | # CONFIG_DEBUG_SHIRQ is not set | 830 | # CONFIG_DEBUG_SHIRQ is not set |
| 909 | CONFIG_DETECT_SOFTLOCKUP=y | 831 | CONFIG_DETECT_SOFTLOCKUP=y |
| 832 | CONFIG_SCHED_DEBUG=y | ||
| 910 | # CONFIG_SCHEDSTATS is not set | 833 | # CONFIG_SCHEDSTATS is not set |
| 911 | # CONFIG_TIMER_STATS is not set | 834 | # CONFIG_TIMER_STATS is not set |
| 912 | # CONFIG_DEBUG_SLAB is not set | 835 | # CONFIG_DEBUG_SLAB is not set |
| @@ -928,7 +851,6 @@ CONFIG_FORCED_INLINING=y | |||
| 928 | # CONFIG_DEBUG_PAGEALLOC is not set | 851 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 929 | # CONFIG_DEBUGGER is not set | 852 | # CONFIG_DEBUGGER is not set |
| 930 | # CONFIG_BDI_SWITCH is not set | 853 | # CONFIG_BDI_SWITCH is not set |
| 931 | # CONFIG_BOOTX_TEXT is not set | ||
| 932 | # CONFIG_PPC_EARLY_DEBUG is not set | 854 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 933 | 855 | ||
| 934 | # | 856 | # |
| @@ -936,8 +858,4 @@ CONFIG_FORCED_INLINING=y | |||
| 936 | # | 858 | # |
| 937 | # CONFIG_KEYS is not set | 859 | # CONFIG_KEYS is not set |
| 938 | # CONFIG_SECURITY is not set | 860 | # CONFIG_SECURITY is not set |
| 939 | |||
| 940 | # | ||
| 941 | # Cryptographic options | ||
| 942 | # | ||
| 943 | # CONFIG_CRYPTO is not set | 861 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index 1ac94a605b05..b2f389dcaded 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
| @@ -1,9 +1,26 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:57:00 2007 | 4 | # Wed Aug 29 16:16:23 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_ALTIVEC=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | CONFIG_SMP=y | ||
| 23 | CONFIG_NR_CPUS=2 | ||
| 7 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| @@ -14,61 +31,41 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 31 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 32 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 33 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 34 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 35 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 36 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 37 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 23 | CONFIG_PPC_UDBG_16550=y | 42 | CONFIG_PPC_UDBG_16550=y |
| 24 | CONFIG_GENERIC_TBSYNC=y | 43 | CONFIG_GENERIC_TBSYNC=y |
| 25 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 45 | CONFIG_GENERIC_BUG=y |
| 27 | CONFIG_DEFAULT_UIMAGE=y | 46 | CONFIG_DEFAULT_UIMAGE=y |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | # CONFIG_CLASSIC32 is not set | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | CONFIG_PPC_86xx=y | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | CONFIG_ALTIVEC=y | ||
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | CONFIG_SMP=y | ||
| 50 | CONFIG_NR_CPUS=2 | ||
| 51 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 52 | 50 | ||
| 53 | # | 51 | # |
| 54 | # Code maturity level options | 52 | # General setup |
| 55 | # | 53 | # |
| 56 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 57 | CONFIG_LOCK_KERNEL=y | 55 | CONFIG_LOCK_KERNEL=y |
| 58 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 59 | |||
| 60 | # | ||
| 61 | # General setup | ||
| 62 | # | ||
| 63 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 64 | # CONFIG_LOCALVERSION_AUTO is not set | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 65 | # CONFIG_SWAP is not set | 59 | CONFIG_SWAP=y |
| 66 | # CONFIG_SYSVIPC is not set | 60 | CONFIG_SYSVIPC=y |
| 67 | # CONFIG_POSIX_MQUEUE is not set | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 68 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | CONFIG_POSIX_MQUEUE=y |
| 63 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 64 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 69 | # CONFIG_TASKSTATS is not set | 65 | # CONFIG_TASKSTATS is not set |
| 70 | # CONFIG_UTS_NS is not set | 66 | # CONFIG_USER_NS is not set |
| 71 | # CONFIG_AUDIT is not set | 67 | CONFIG_AUDIT=y |
| 68 | # CONFIG_AUDITSYSCALL is not set | ||
| 72 | CONFIG_IKCONFIG=y | 69 | CONFIG_IKCONFIG=y |
| 73 | CONFIG_IKCONFIG_PROC=y | 70 | CONFIG_IKCONFIG_PROC=y |
| 74 | CONFIG_LOG_BUF_SHIFT=14 | 71 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -82,12 +79,12 @@ CONFIG_SYSCTL=y | |||
| 82 | CONFIG_EMBEDDED=y | 79 | CONFIG_EMBEDDED=y |
| 83 | CONFIG_SYSCTL_SYSCALL=y | 80 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_KALLSYMS=y | 81 | CONFIG_KALLSYMS=y |
| 85 | # CONFIG_KALLSYMS_ALL is not set | 82 | CONFIG_KALLSYMS_ALL=y |
| 86 | CONFIG_KALLSYMS_EXTRA_PASS=y | 83 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 87 | CONFIG_HOTPLUG=y | 84 | CONFIG_HOTPLUG=y |
| 88 | CONFIG_PRINTK=y | 85 | CONFIG_PRINTK=y |
| 89 | CONFIG_BUG=y | 86 | CONFIG_BUG=y |
| 90 | # CONFIG_ELF_CORE is not set | 87 | CONFIG_ELF_CORE=y |
| 91 | CONFIG_BASE_FULL=y | 88 | CONFIG_BASE_FULL=y |
| 92 | CONFIG_FUTEX=y | 89 | CONFIG_FUTEX=y |
| 93 | CONFIG_ANON_INODES=y | 90 | CONFIG_ANON_INODES=y |
| @@ -103,36 +100,40 @@ CONFIG_SLAB=y | |||
| 103 | CONFIG_RT_MUTEXES=y | 100 | CONFIG_RT_MUTEXES=y |
| 104 | # CONFIG_TINY_SHMEM is not set | 101 | # CONFIG_TINY_SHMEM is not set |
| 105 | CONFIG_BASE_SMALL=0 | 102 | CONFIG_BASE_SMALL=0 |
| 106 | 103 | CONFIG_MODULES=y | |
| 107 | # | 104 | CONFIG_MODULE_UNLOAD=y |
| 108 | # Loadable module support | 105 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 109 | # | 106 | CONFIG_MODVERSIONS=y |
| 110 | # CONFIG_MODULES is not set | 107 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 111 | 108 | CONFIG_KMOD=y | |
| 112 | # | 109 | CONFIG_STOP_MACHINE=y |
| 113 | # Block layer | ||
| 114 | # | ||
| 115 | CONFIG_BLOCK=y | 110 | CONFIG_BLOCK=y |
| 116 | # CONFIG_LBD is not set | 111 | CONFIG_LBD=y |
| 117 | # CONFIG_BLK_DEV_IO_TRACE is not set | 112 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 118 | # CONFIG_LSF is not set | 113 | # CONFIG_LSF is not set |
| 114 | # CONFIG_BLK_DEV_BSG is not set | ||
| 119 | 115 | ||
| 120 | # | 116 | # |
| 121 | # IO Schedulers | 117 | # IO Schedulers |
| 122 | # | 118 | # |
| 123 | CONFIG_IOSCHED_NOOP=y | 119 | CONFIG_IOSCHED_NOOP=y |
| 124 | # CONFIG_IOSCHED_AS is not set | 120 | CONFIG_IOSCHED_AS=y |
| 125 | CONFIG_IOSCHED_DEADLINE=y | 121 | CONFIG_IOSCHED_DEADLINE=y |
| 126 | # CONFIG_IOSCHED_CFQ is not set | 122 | CONFIG_IOSCHED_CFQ=y |
| 127 | # CONFIG_DEFAULT_AS is not set | 123 | # CONFIG_DEFAULT_AS is not set |
| 128 | CONFIG_DEFAULT_DEADLINE=y | 124 | # CONFIG_DEFAULT_DEADLINE is not set |
| 129 | # CONFIG_DEFAULT_CFQ is not set | 125 | CONFIG_DEFAULT_CFQ=y |
| 130 | # CONFIG_DEFAULT_NOOP is not set | 126 | # CONFIG_DEFAULT_NOOP is not set |
| 131 | CONFIG_DEFAULT_IOSCHED="deadline" | 127 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 132 | 128 | ||
| 133 | # | 129 | # |
| 134 | # Platform support | 130 | # Platform support |
| 135 | # | 131 | # |
| 132 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
| 133 | # CONFIG_EMBEDDED6xx is not set | ||
| 134 | # CONFIG_PPC_82xx is not set | ||
| 135 | # CONFIG_PPC_83xx is not set | ||
| 136 | CONFIG_PPC_86xx=y | ||
| 136 | # CONFIG_PPC_MPC52xx is not set | 137 | # CONFIG_PPC_MPC52xx is not set |
| 137 | # CONFIG_PPC_MPC5200 is not set | 138 | # CONFIG_PPC_MPC5200 is not set |
| 138 | # CONFIG_PPC_CELL is not set | 139 | # CONFIG_PPC_CELL is not set |
| @@ -151,6 +152,7 @@ CONFIG_PPC_I8259=y | |||
| 151 | # CONFIG_GENERIC_IOMAP is not set | 152 | # CONFIG_GENERIC_IOMAP is not set |
| 152 | # CONFIG_CPU_FREQ is not set | 153 | # CONFIG_CPU_FREQ is not set |
| 153 | # CONFIG_CPM2 is not set | 154 | # CONFIG_CPM2 is not set |
| 155 | CONFIG_FSL_ULI1575=y | ||
| 154 | 156 | ||
| 155 | # | 157 | # |
| 156 | # Kernel options | 158 | # Kernel options |
| @@ -166,7 +168,7 @@ CONFIG_PREEMPT_NONE=y | |||
| 166 | # CONFIG_PREEMPT is not set | 168 | # CONFIG_PREEMPT is not set |
| 167 | CONFIG_PREEMPT_BKL=y | 169 | CONFIG_PREEMPT_BKL=y |
| 168 | CONFIG_BINFMT_ELF=y | 170 | CONFIG_BINFMT_ELF=y |
| 169 | # CONFIG_BINFMT_MISC is not set | 171 | CONFIG_BINFMT_MISC=m |
| 170 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 172 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 171 | # CONFIG_IRQ_ALL_CPUS is not set | 173 | # CONFIG_IRQ_ALL_CPUS is not set |
| 172 | CONFIG_ARCH_FLATMEM_ENABLE=y | 174 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| @@ -181,10 +183,12 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 181 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 183 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 182 | # CONFIG_RESOURCES_64BIT is not set | 184 | # CONFIG_RESOURCES_64BIT is not set |
| 183 | CONFIG_ZONE_DMA_FLAG=1 | 185 | CONFIG_ZONE_DMA_FLAG=1 |
| 186 | CONFIG_BOUNCE=y | ||
| 187 | CONFIG_VIRT_TO_BUS=y | ||
| 184 | CONFIG_PROC_DEVICETREE=y | 188 | CONFIG_PROC_DEVICETREE=y |
| 185 | # CONFIG_CMDLINE_BOOL is not set | 189 | # CONFIG_CMDLINE_BOOL is not set |
| 186 | # CONFIG_PM is not set | 190 | # CONFIG_PM is not set |
| 187 | # CONFIG_SECCOMP is not set | 191 | CONFIG_SECCOMP=y |
| 188 | # CONFIG_WANT_DEVICE_TREE is not set | 192 | # CONFIG_WANT_DEVICE_TREE is not set |
| 189 | CONFIG_ISA_DMA_API=y | 193 | CONFIG_ISA_DMA_API=y |
| 190 | 194 | ||
| @@ -194,11 +198,11 @@ CONFIG_ISA_DMA_API=y | |||
| 194 | CONFIG_ZONE_DMA=y | 198 | CONFIG_ZONE_DMA=y |
| 195 | CONFIG_GENERIC_ISA_DMA=y | 199 | CONFIG_GENERIC_ISA_DMA=y |
| 196 | CONFIG_PPC_INDIRECT_PCI=y | 200 | CONFIG_PPC_INDIRECT_PCI=y |
| 197 | CONFIG_PPC_INDIRECT_PCI_BE=y | ||
| 198 | CONFIG_FSL_SOC=y | 201 | CONFIG_FSL_SOC=y |
| 199 | CONFIG_FSL_PCIE=y | 202 | CONFIG_FSL_PCI=y |
| 200 | CONFIG_PCI=y | 203 | CONFIG_PCI=y |
| 201 | CONFIG_PCI_DOMAINS=y | 204 | CONFIG_PCI_DOMAINS=y |
| 205 | CONFIG_PCI_SYSCALL=y | ||
| 202 | # CONFIG_PCIEPORTBUS is not set | 206 | # CONFIG_PCIEPORTBUS is not set |
| 203 | CONFIG_ARCH_SUPPORTS_MSI=y | 207 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 204 | # CONFIG_PCI_MSI is not set | 208 | # CONFIG_PCI_MSI is not set |
| @@ -239,27 +243,37 @@ CONFIG_XFRM=y | |||
| 239 | CONFIG_XFRM_USER=y | 243 | CONFIG_XFRM_USER=y |
| 240 | # CONFIG_XFRM_SUB_POLICY is not set | 244 | # CONFIG_XFRM_SUB_POLICY is not set |
| 241 | # CONFIG_XFRM_MIGRATE is not set | 245 | # CONFIG_XFRM_MIGRATE is not set |
| 242 | # CONFIG_NET_KEY is not set | 246 | CONFIG_NET_KEY=m |
| 247 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 243 | CONFIG_INET=y | 248 | CONFIG_INET=y |
| 244 | # CONFIG_IP_MULTICAST is not set | 249 | CONFIG_IP_MULTICAST=y |
| 245 | # CONFIG_IP_ADVANCED_ROUTER is not set | 250 | CONFIG_IP_ADVANCED_ROUTER=y |
| 251 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 252 | # CONFIG_IP_FIB_TRIE is not set | ||
| 246 | CONFIG_IP_FIB_HASH=y | 253 | CONFIG_IP_FIB_HASH=y |
| 254 | CONFIG_IP_MULTIPLE_TABLES=y | ||
| 255 | CONFIG_IP_ROUTE_MULTIPATH=y | ||
| 256 | CONFIG_IP_ROUTE_VERBOSE=y | ||
| 247 | CONFIG_IP_PNP=y | 257 | CONFIG_IP_PNP=y |
| 248 | CONFIG_IP_PNP_DHCP=y | 258 | CONFIG_IP_PNP_DHCP=y |
| 249 | CONFIG_IP_PNP_BOOTP=y | 259 | CONFIG_IP_PNP_BOOTP=y |
| 250 | CONFIG_IP_PNP_RARP=y | 260 | CONFIG_IP_PNP_RARP=y |
| 251 | # CONFIG_NET_IPIP is not set | 261 | CONFIG_NET_IPIP=y |
| 252 | # CONFIG_NET_IPGRE is not set | 262 | CONFIG_NET_IPGRE=y |
| 253 | # CONFIG_ARPD is not set | 263 | CONFIG_NET_IPGRE_BROADCAST=y |
| 264 | CONFIG_IP_MROUTE=y | ||
| 265 | CONFIG_IP_PIMSM_V1=y | ||
| 266 | CONFIG_IP_PIMSM_V2=y | ||
| 267 | CONFIG_ARPD=y | ||
| 254 | # CONFIG_SYN_COOKIES is not set | 268 | # CONFIG_SYN_COOKIES is not set |
| 255 | # CONFIG_INET_AH is not set | 269 | # CONFIG_INET_AH is not set |
| 256 | # CONFIG_INET_ESP is not set | 270 | # CONFIG_INET_ESP is not set |
| 257 | # CONFIG_INET_IPCOMP is not set | 271 | # CONFIG_INET_IPCOMP is not set |
| 258 | # CONFIG_INET_XFRM_TUNNEL is not set | 272 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 259 | CONFIG_INET_TUNNEL=y | 273 | CONFIG_INET_TUNNEL=y |
| 260 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 274 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 261 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 275 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 262 | CONFIG_INET_XFRM_MODE_BEET=y | 276 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 263 | CONFIG_INET_DIAG=y | 277 | CONFIG_INET_DIAG=y |
| 264 | CONFIG_INET_TCP_DIAG=y | 278 | CONFIG_INET_TCP_DIAG=y |
| 265 | # CONFIG_TCP_CONG_ADVANCED is not set | 279 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -286,7 +300,12 @@ CONFIG_IPV6_SIT=y | |||
| 286 | # CONFIG_NETWORK_SECMARK is not set | 300 | # CONFIG_NETWORK_SECMARK is not set |
| 287 | # CONFIG_NETFILTER is not set | 301 | # CONFIG_NETFILTER is not set |
| 288 | # CONFIG_IP_DCCP is not set | 302 | # CONFIG_IP_DCCP is not set |
| 289 | # CONFIG_IP_SCTP is not set | 303 | CONFIG_IP_SCTP=m |
| 304 | # CONFIG_SCTP_DBG_MSG is not set | ||
| 305 | # CONFIG_SCTP_DBG_OBJCNT is not set | ||
| 306 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 307 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 308 | CONFIG_SCTP_HMAC_MD5=y | ||
| 290 | # CONFIG_TIPC is not set | 309 | # CONFIG_TIPC is not set |
| 291 | # CONFIG_ATM is not set | 310 | # CONFIG_ATM is not set |
| 292 | # CONFIG_BRIDGE is not set | 311 | # CONFIG_BRIDGE is not set |
| @@ -313,6 +332,7 @@ CONFIG_IPV6_SIT=y | |||
| 313 | # CONFIG_IRDA is not set | 332 | # CONFIG_IRDA is not set |
| 314 | # CONFIG_BT is not set | 333 | # CONFIG_BT is not set |
| 315 | # CONFIG_AF_RXRPC is not set | 334 | # CONFIG_AF_RXRPC is not set |
| 335 | CONFIG_FIB_RULES=y | ||
| 316 | 336 | ||
| 317 | # | 337 | # |
| 318 | # Wireless | 338 | # Wireless |
| @@ -322,6 +342,7 @@ CONFIG_IPV6_SIT=y | |||
| 322 | # CONFIG_MAC80211 is not set | 342 | # CONFIG_MAC80211 is not set |
| 323 | # CONFIG_IEEE80211 is not set | 343 | # CONFIG_IEEE80211 is not set |
| 324 | # CONFIG_RFKILL is not set | 344 | # CONFIG_RFKILL is not set |
| 345 | # CONFIG_NET_9P is not set | ||
| 325 | 346 | ||
| 326 | # | 347 | # |
| 327 | # Device Drivers | 348 | # Device Drivers |
| @@ -336,26 +357,11 @@ CONFIG_FW_LOADER=y | |||
| 336 | # CONFIG_DEBUG_DRIVER is not set | 357 | # CONFIG_DEBUG_DRIVER is not set |
| 337 | # CONFIG_DEBUG_DEVRES is not set | 358 | # CONFIG_DEBUG_DEVRES is not set |
| 338 | # CONFIG_SYS_HYPERVISOR is not set | 359 | # CONFIG_SYS_HYPERVISOR is not set |
| 339 | |||
| 340 | # | ||
| 341 | # Connector - unified userspace <-> kernelspace linker | ||
| 342 | # | ||
| 343 | # CONFIG_CONNECTOR is not set | 360 | # CONFIG_CONNECTOR is not set |
| 344 | # CONFIG_MTD is not set | 361 | # CONFIG_MTD is not set |
| 345 | 362 | CONFIG_OF_DEVICE=y | |
| 346 | # | ||
| 347 | # Parallel port support | ||
| 348 | # | ||
| 349 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 350 | 364 | CONFIG_BLK_DEV=y | |
| 351 | # | ||
| 352 | # Plug and Play support | ||
| 353 | # | ||
| 354 | # CONFIG_PNPACPI is not set | ||
| 355 | |||
| 356 | # | ||
| 357 | # Block devices | ||
| 358 | # | ||
| 359 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| 360 | # CONFIG_BLK_CPQ_DA is not set | 366 | # CONFIG_BLK_CPQ_DA is not set |
| 361 | # CONFIG_BLK_CPQ_CISS_DA is not set | 367 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -364,60 +370,172 @@ CONFIG_FW_LOADER=y | |||
| 364 | # CONFIG_BLK_DEV_COW_COMMON is not set | 370 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 365 | CONFIG_BLK_DEV_LOOP=y | 371 | CONFIG_BLK_DEV_LOOP=y |
| 366 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 372 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 367 | # CONFIG_BLK_DEV_NBD is not set | 373 | CONFIG_BLK_DEV_NBD=y |
| 368 | # CONFIG_BLK_DEV_SX8 is not set | 374 | # CONFIG_BLK_DEV_SX8 is not set |
| 375 | # CONFIG_BLK_DEV_UB is not set | ||
| 369 | CONFIG_BLK_DEV_RAM=y | 376 | CONFIG_BLK_DEV_RAM=y |
| 370 | CONFIG_BLK_DEV_RAM_COUNT=16 | 377 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 371 | CONFIG_BLK_DEV_RAM_SIZE=131072 | 378 | CONFIG_BLK_DEV_RAM_SIZE=131072 |
| 372 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 379 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 373 | # CONFIG_CDROM_PKTCDVD is not set | 380 | # CONFIG_CDROM_PKTCDVD is not set |
| 374 | # CONFIG_ATA_OVER_ETH is not set | 381 | # CONFIG_ATA_OVER_ETH is not set |
| 375 | 382 | CONFIG_MISC_DEVICES=y | |
| 376 | # | ||
| 377 | # Misc devices | ||
| 378 | # | ||
| 379 | # CONFIG_PHANTOM is not set | 383 | # CONFIG_PHANTOM is not set |
| 384 | # CONFIG_EEPROM_93CX6 is not set | ||
| 380 | # CONFIG_SGI_IOC4 is not set | 385 | # CONFIG_SGI_IOC4 is not set |
| 381 | # CONFIG_TIFM_CORE is not set | 386 | # CONFIG_TIFM_CORE is not set |
| 382 | # CONFIG_BLINK is not set | ||
| 383 | # CONFIG_IDE is not set | 387 | # CONFIG_IDE is not set |
| 384 | 388 | ||
| 385 | # | 389 | # |
| 386 | # SCSI device support | 390 | # SCSI device support |
| 387 | # | 391 | # |
| 388 | # CONFIG_RAID_ATTRS is not set | 392 | # CONFIG_RAID_ATTRS is not set |
| 389 | # CONFIG_SCSI is not set | 393 | CONFIG_SCSI=y |
| 394 | CONFIG_SCSI_DMA=y | ||
| 395 | # CONFIG_SCSI_TGT is not set | ||
| 390 | # CONFIG_SCSI_NETLINK is not set | 396 | # CONFIG_SCSI_NETLINK is not set |
| 391 | # CONFIG_ATA is not set | 397 | CONFIG_SCSI_PROC_FS=y |
| 392 | 398 | ||
| 393 | # | 399 | # |
| 394 | # Multi-device support (RAID and LVM) | 400 | # SCSI support type (disk, tape, CD-ROM) |
| 395 | # | 401 | # |
| 402 | CONFIG_BLK_DEV_SD=y | ||
| 403 | CONFIG_CHR_DEV_ST=y | ||
| 404 | # CONFIG_CHR_DEV_OSST is not set | ||
| 405 | CONFIG_BLK_DEV_SR=y | ||
| 406 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 407 | CONFIG_CHR_DEV_SG=y | ||
| 408 | # CONFIG_CHR_DEV_SCH is not set | ||
| 409 | |||
| 410 | # | ||
| 411 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 412 | # | ||
| 413 | CONFIG_SCSI_MULTI_LUN=y | ||
| 414 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 415 | CONFIG_SCSI_LOGGING=y | ||
| 416 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 417 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 418 | |||
| 419 | # | ||
| 420 | # SCSI Transports | ||
| 421 | # | ||
| 422 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 423 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 424 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 425 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 426 | CONFIG_SCSI_LOWLEVEL=y | ||
| 427 | # CONFIG_ISCSI_TCP is not set | ||
| 428 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 429 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 430 | # CONFIG_SCSI_ACARD is not set | ||
| 431 | # CONFIG_SCSI_AACRAID is not set | ||
| 432 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 433 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 434 | # CONFIG_SCSI_AIC79XX is not set | ||
| 435 | # CONFIG_SCSI_AIC94XX is not set | ||
| 436 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 437 | # CONFIG_SCSI_ARCMSR is not set | ||
| 438 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 439 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 440 | # CONFIG_MEGARAID_SAS is not set | ||
| 441 | # CONFIG_SCSI_HPTIOP is not set | ||
| 442 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 443 | # CONFIG_SCSI_DMX3191D is not set | ||
| 444 | # CONFIG_SCSI_EATA is not set | ||
| 445 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 446 | # CONFIG_SCSI_GDTH is not set | ||
| 447 | # CONFIG_SCSI_IPS is not set | ||
| 448 | # CONFIG_SCSI_INITIO is not set | ||
| 449 | # CONFIG_SCSI_INIA100 is not set | ||
| 450 | # CONFIG_SCSI_STEX is not set | ||
| 451 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 452 | # CONFIG_SCSI_IPR is not set | ||
| 453 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 454 | # CONFIG_SCSI_QLA_FC is not set | ||
| 455 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 456 | # CONFIG_SCSI_LPFC is not set | ||
| 457 | # CONFIG_SCSI_DC395x is not set | ||
| 458 | # CONFIG_SCSI_DC390T is not set | ||
| 459 | # CONFIG_SCSI_NSP32 is not set | ||
| 460 | # CONFIG_SCSI_DEBUG is not set | ||
| 461 | # CONFIG_SCSI_SRP is not set | ||
| 462 | CONFIG_ATA=y | ||
| 463 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 464 | CONFIG_SATA_AHCI=y | ||
| 465 | # CONFIG_SATA_SVW is not set | ||
| 466 | # CONFIG_ATA_PIIX is not set | ||
| 467 | # CONFIG_SATA_MV is not set | ||
| 468 | # CONFIG_SATA_NV is not set | ||
| 469 | # CONFIG_PDC_ADMA is not set | ||
| 470 | # CONFIG_SATA_QSTOR is not set | ||
| 471 | # CONFIG_SATA_PROMISE is not set | ||
| 472 | # CONFIG_SATA_SX4 is not set | ||
| 473 | # CONFIG_SATA_SIL is not set | ||
| 474 | # CONFIG_SATA_SIL24 is not set | ||
| 475 | # CONFIG_SATA_SIS is not set | ||
| 476 | # CONFIG_SATA_ULI is not set | ||
| 477 | # CONFIG_SATA_VIA is not set | ||
| 478 | # CONFIG_SATA_VITESSE is not set | ||
| 479 | # CONFIG_SATA_INIC162X is not set | ||
| 480 | CONFIG_PATA_ALI=y | ||
| 481 | # CONFIG_PATA_AMD is not set | ||
| 482 | # CONFIG_PATA_ARTOP is not set | ||
| 483 | # CONFIG_PATA_ATIIXP is not set | ||
| 484 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 485 | # CONFIG_PATA_CMD64X is not set | ||
| 486 | # CONFIG_PATA_CS5520 is not set | ||
| 487 | # CONFIG_PATA_CS5530 is not set | ||
| 488 | # CONFIG_PATA_CYPRESS is not set | ||
| 489 | # CONFIG_PATA_EFAR is not set | ||
| 490 | # CONFIG_ATA_GENERIC is not set | ||
| 491 | # CONFIG_PATA_HPT366 is not set | ||
| 492 | # CONFIG_PATA_HPT37X is not set | ||
| 493 | # CONFIG_PATA_HPT3X2N is not set | ||
| 494 | # CONFIG_PATA_HPT3X3 is not set | ||
| 495 | # CONFIG_PATA_IT821X is not set | ||
| 496 | # CONFIG_PATA_IT8213 is not set | ||
| 497 | # CONFIG_PATA_JMICRON is not set | ||
| 498 | # CONFIG_PATA_TRIFLEX is not set | ||
| 499 | # CONFIG_PATA_MARVELL is not set | ||
| 500 | # CONFIG_PATA_MPIIX is not set | ||
| 501 | # CONFIG_PATA_OLDPIIX is not set | ||
| 502 | # CONFIG_PATA_NETCELL is not set | ||
| 503 | # CONFIG_PATA_NS87410 is not set | ||
| 504 | # CONFIG_PATA_OPTI is not set | ||
| 505 | # CONFIG_PATA_OPTIDMA is not set | ||
| 506 | # CONFIG_PATA_PDC_OLD is not set | ||
| 507 | # CONFIG_PATA_RADISYS is not set | ||
| 508 | # CONFIG_PATA_RZ1000 is not set | ||
| 509 | # CONFIG_PATA_SC1200 is not set | ||
| 510 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 511 | # CONFIG_PATA_PDC2027X is not set | ||
| 512 | # CONFIG_PATA_SIL680 is not set | ||
| 513 | # CONFIG_PATA_SIS is not set | ||
| 514 | # CONFIG_PATA_VIA is not set | ||
| 515 | # CONFIG_PATA_WINBOND is not set | ||
| 516 | # CONFIG_PATA_PLATFORM is not set | ||
| 396 | # CONFIG_MD is not set | 517 | # CONFIG_MD is not set |
| 397 | 518 | ||
| 398 | # | 519 | # |
| 399 | # Fusion MPT device support | 520 | # Fusion MPT device support |
| 400 | # | 521 | # |
| 401 | # CONFIG_FUSION is not set | 522 | # CONFIG_FUSION is not set |
| 523 | # CONFIG_FUSION_SPI is not set | ||
| 524 | # CONFIG_FUSION_FC is not set | ||
| 525 | # CONFIG_FUSION_SAS is not set | ||
| 402 | 526 | ||
| 403 | # | 527 | # |
| 404 | # IEEE 1394 (FireWire) support | 528 | # IEEE 1394 (FireWire) support |
| 405 | # | 529 | # |
| 406 | # CONFIG_FIREWIRE is not set | 530 | # CONFIG_FIREWIRE is not set |
| 407 | # CONFIG_IEEE1394 is not set | 531 | # CONFIG_IEEE1394 is not set |
| 408 | |||
| 409 | # | ||
| 410 | # I2O device support | ||
| 411 | # | ||
| 412 | # CONFIG_I2O is not set | 532 | # CONFIG_I2O is not set |
| 413 | # CONFIG_MACINTOSH_DRIVERS is not set | 533 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 414 | |||
| 415 | # | ||
| 416 | # Network device support | ||
| 417 | # | ||
| 418 | CONFIG_NETDEVICES=y | 534 | CONFIG_NETDEVICES=y |
| 535 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 419 | CONFIG_DUMMY=y | 536 | CONFIG_DUMMY=y |
| 420 | # CONFIG_BONDING is not set | 537 | # CONFIG_BONDING is not set |
| 538 | # CONFIG_MACVLAN is not set | ||
| 421 | # CONFIG_EQUALIZER is not set | 539 | # CONFIG_EQUALIZER is not set |
| 422 | # CONFIG_TUN is not set | 540 | # CONFIG_TUN is not set |
| 423 | # CONFIG_ARCNET is not set | 541 | # CONFIG_ARCNET is not set |
| @@ -434,21 +552,14 @@ CONFIG_PHYLIB=y | |||
| 434 | CONFIG_VITESSE_PHY=y | 552 | CONFIG_VITESSE_PHY=y |
| 435 | # CONFIG_SMSC_PHY is not set | 553 | # CONFIG_SMSC_PHY is not set |
| 436 | # CONFIG_BROADCOM_PHY is not set | 554 | # CONFIG_BROADCOM_PHY is not set |
| 555 | # CONFIG_ICPLUS_PHY is not set | ||
| 437 | # CONFIG_FIXED_PHY is not set | 556 | # CONFIG_FIXED_PHY is not set |
| 438 | |||
| 439 | # | ||
| 440 | # Ethernet (10 or 100Mbit) | ||
| 441 | # | ||
| 442 | CONFIG_NET_ETHERNET=y | 557 | CONFIG_NET_ETHERNET=y |
| 443 | CONFIG_MII=y | 558 | CONFIG_MII=y |
| 444 | # CONFIG_HAPPYMEAL is not set | 559 | # CONFIG_HAPPYMEAL is not set |
| 445 | # CONFIG_SUNGEM is not set | 560 | # CONFIG_SUNGEM is not set |
| 446 | # CONFIG_CASSINI is not set | 561 | # CONFIG_CASSINI is not set |
| 447 | # CONFIG_NET_VENDOR_3COM is not set | 562 | # CONFIG_NET_VENDOR_3COM is not set |
| 448 | |||
| 449 | # | ||
| 450 | # Tulip family network device support | ||
| 451 | # | ||
| 452 | # CONFIG_NET_TULIP is not set | 563 | # CONFIG_NET_TULIP is not set |
| 453 | # CONFIG_HP100 is not set | 564 | # CONFIG_HP100 is not set |
| 454 | # CONFIG_NET_PCI is not set | 565 | # CONFIG_NET_PCI is not set |
| @@ -463,12 +574,11 @@ CONFIG_NETDEV_1000=y | |||
| 463 | # CONFIG_SIS190 is not set | 574 | # CONFIG_SIS190 is not set |
| 464 | # CONFIG_SKGE is not set | 575 | # CONFIG_SKGE is not set |
| 465 | # CONFIG_SKY2 is not set | 576 | # CONFIG_SKY2 is not set |
| 466 | # CONFIG_SK98LIN is not set | ||
| 467 | # CONFIG_VIA_VELOCITY is not set | 577 | # CONFIG_VIA_VELOCITY is not set |
| 468 | # CONFIG_TIGON3 is not set | 578 | # CONFIG_TIGON3 is not set |
| 469 | # CONFIG_BNX2 is not set | 579 | # CONFIG_BNX2 is not set |
| 470 | CONFIG_GIANFAR=y | 580 | CONFIG_GIANFAR=y |
| 471 | # CONFIG_GFAR_NAPI is not set | 581 | CONFIG_GFAR_NAPI=y |
| 472 | # CONFIG_QLA3XXX is not set | 582 | # CONFIG_QLA3XXX is not set |
| 473 | # CONFIG_ATL1 is not set | 583 | # CONFIG_ATL1 is not set |
| 474 | CONFIG_NETDEV_10000=y | 584 | CONFIG_NETDEV_10000=y |
| @@ -486,24 +596,27 @@ CONFIG_NETDEV_10000=y | |||
| 486 | # | 596 | # |
| 487 | # CONFIG_WLAN_PRE80211 is not set | 597 | # CONFIG_WLAN_PRE80211 is not set |
| 488 | # CONFIG_WLAN_80211 is not set | 598 | # CONFIG_WLAN_80211 is not set |
| 599 | |||
| 600 | # | ||
| 601 | # USB Network Adapters | ||
| 602 | # | ||
| 603 | # CONFIG_USB_CATC is not set | ||
| 604 | # CONFIG_USB_KAWETH is not set | ||
| 605 | # CONFIG_USB_PEGASUS is not set | ||
| 606 | # CONFIG_USB_RTL8150 is not set | ||
| 607 | # CONFIG_USB_USBNET_MII is not set | ||
| 608 | # CONFIG_USB_USBNET is not set | ||
| 489 | # CONFIG_WAN is not set | 609 | # CONFIG_WAN is not set |
| 490 | # CONFIG_FDDI is not set | 610 | # CONFIG_FDDI is not set |
| 491 | # CONFIG_HIPPI is not set | 611 | # CONFIG_HIPPI is not set |
| 492 | # CONFIG_PPP is not set | 612 | # CONFIG_PPP is not set |
| 493 | # CONFIG_SLIP is not set | 613 | # CONFIG_SLIP is not set |
| 614 | # CONFIG_NET_FC is not set | ||
| 494 | # CONFIG_SHAPER is not set | 615 | # CONFIG_SHAPER is not set |
| 495 | # CONFIG_NETCONSOLE is not set | 616 | # CONFIG_NETCONSOLE is not set |
| 496 | # CONFIG_NETPOLL is not set | 617 | # CONFIG_NETPOLL is not set |
| 497 | # CONFIG_NET_POLL_CONTROLLER is not set | 618 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 498 | |||
| 499 | # | ||
| 500 | # ISDN subsystem | ||
| 501 | # | ||
| 502 | # CONFIG_ISDN is not set | 619 | # CONFIG_ISDN is not set |
| 503 | |||
| 504 | # | ||
| 505 | # Telephony Support | ||
| 506 | # | ||
| 507 | # CONFIG_PHONE is not set | 620 | # CONFIG_PHONE is not set |
| 508 | 621 | ||
| 509 | # | 622 | # |
| @@ -575,25 +688,19 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 575 | # CONFIG_SERIAL_JSM is not set | 688 | # CONFIG_SERIAL_JSM is not set |
| 576 | # CONFIG_SERIAL_OF_PLATFORM is not set | 689 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 577 | CONFIG_UNIX98_PTYS=y | 690 | CONFIG_UNIX98_PTYS=y |
| 578 | # CONFIG_LEGACY_PTYS is not set | 691 | CONFIG_LEGACY_PTYS=y |
| 579 | 692 | CONFIG_LEGACY_PTY_COUNT=256 | |
| 580 | # | ||
| 581 | # IPMI | ||
| 582 | # | ||
| 583 | # CONFIG_IPMI_HANDLER is not set | 693 | # CONFIG_IPMI_HANDLER is not set |
| 584 | # CONFIG_WATCHDOG is not set | 694 | # CONFIG_WATCHDOG is not set |
| 585 | # CONFIG_HW_RANDOM is not set | 695 | # CONFIG_HW_RANDOM is not set |
| 586 | # CONFIG_NVRAM is not set | 696 | CONFIG_NVRAM=y |
| 587 | # CONFIG_GEN_RTC is not set | 697 | CONFIG_GEN_RTC=y |
| 698 | CONFIG_GEN_RTC_X=y | ||
| 588 | # CONFIG_R3964 is not set | 699 | # CONFIG_R3964 is not set |
| 589 | # CONFIG_APPLICOM is not set | 700 | # CONFIG_APPLICOM is not set |
| 590 | # CONFIG_AGP is not set | 701 | # CONFIG_AGP is not set |
| 591 | # CONFIG_DRM is not set | 702 | # CONFIG_DRM is not set |
| 592 | # CONFIG_RAW_DRIVER is not set | 703 | # CONFIG_RAW_DRIVER is not set |
| 593 | |||
| 594 | # | ||
| 595 | # TPM devices | ||
| 596 | # | ||
| 597 | # CONFIG_TCG_TPM is not set | 704 | # CONFIG_TCG_TPM is not set |
| 598 | CONFIG_DEVPORT=y | 705 | CONFIG_DEVPORT=y |
| 599 | CONFIG_I2C=y | 706 | CONFIG_I2C=y |
| @@ -628,6 +735,9 @@ CONFIG_I2C_MPC=y | |||
| 628 | # CONFIG_I2C_SIS5595 is not set | 735 | # CONFIG_I2C_SIS5595 is not set |
| 629 | # CONFIG_I2C_SIS630 is not set | 736 | # CONFIG_I2C_SIS630 is not set |
| 630 | # CONFIG_I2C_SIS96X is not set | 737 | # CONFIG_I2C_SIS96X is not set |
| 738 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 739 | # CONFIG_I2C_STUB is not set | ||
| 740 | # CONFIG_I2C_TINY_USB is not set | ||
| 631 | # CONFIG_I2C_VIA is not set | 741 | # CONFIG_I2C_VIA is not set |
| 632 | # CONFIG_I2C_VIAPRO is not set | 742 | # CONFIG_I2C_VIAPRO is not set |
| 633 | # CONFIG_I2C_VOODOO3 is not set | 743 | # CONFIG_I2C_VOODOO3 is not set |
| @@ -637,12 +747,14 @@ CONFIG_I2C_MPC=y | |||
| 637 | # | 747 | # |
| 638 | # CONFIG_SENSORS_DS1337 is not set | 748 | # CONFIG_SENSORS_DS1337 is not set |
| 639 | # CONFIG_SENSORS_DS1374 is not set | 749 | # CONFIG_SENSORS_DS1374 is not set |
| 750 | # CONFIG_DS1682 is not set | ||
| 640 | CONFIG_SENSORS_EEPROM=y | 751 | CONFIG_SENSORS_EEPROM=y |
| 641 | # CONFIG_SENSORS_PCF8574 is not set | 752 | # CONFIG_SENSORS_PCF8574 is not set |
| 642 | # CONFIG_SENSORS_PCA9539 is not set | 753 | # CONFIG_SENSORS_PCA9539 is not set |
| 643 | # CONFIG_SENSORS_PCF8591 is not set | 754 | # CONFIG_SENSORS_PCF8591 is not set |
| 644 | # CONFIG_SENSORS_M41T00 is not set | 755 | # CONFIG_SENSORS_M41T00 is not set |
| 645 | # CONFIG_SENSORS_MAX6875 is not set | 756 | # CONFIG_SENSORS_MAX6875 is not set |
| 757 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 646 | # CONFIG_I2C_DEBUG_CORE is not set | 758 | # CONFIG_I2C_DEBUG_CORE is not set |
| 647 | # CONFIG_I2C_DEBUG_ALGO is not set | 759 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 648 | # CONFIG_I2C_DEBUG_BUS is not set | 760 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -653,11 +765,8 @@ CONFIG_SENSORS_EEPROM=y | |||
| 653 | # | 765 | # |
| 654 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
| 655 | # CONFIG_SPI_MASTER is not set | 767 | # CONFIG_SPI_MASTER is not set |
| 656 | |||
| 657 | # | ||
| 658 | # Dallas's 1-wire bus | ||
| 659 | # | ||
| 660 | # CONFIG_W1 is not set | 768 | # CONFIG_W1 is not set |
| 769 | # CONFIG_POWER_SUPPLY is not set | ||
| 661 | # CONFIG_HWMON is not set | 770 | # CONFIG_HWMON is not set |
| 662 | 771 | ||
| 663 | # | 772 | # |
| @@ -669,8 +778,108 @@ CONFIG_SENSORS_EEPROM=y | |||
| 669 | # Multimedia devices | 778 | # Multimedia devices |
| 670 | # | 779 | # |
| 671 | # CONFIG_VIDEO_DEV is not set | 780 | # CONFIG_VIDEO_DEV is not set |
| 672 | # CONFIG_DVB_CORE is not set | 781 | CONFIG_DVB_CORE=m |
| 782 | # CONFIG_DVB_CORE_ATTACH is not set | ||
| 783 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
| 784 | |||
| 785 | # | ||
| 786 | # Supported SAA7146 based PCI Adapters | ||
| 787 | # | ||
| 788 | |||
| 789 | # | ||
| 790 | # Supported USB Adapters | ||
| 791 | # | ||
| 792 | # CONFIG_DVB_USB is not set | ||
| 793 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
| 794 | # CONFIG_DVB_TTUSB_DEC is not set | ||
| 795 | # CONFIG_DVB_CINERGYT2 is not set | ||
| 796 | |||
| 797 | # | ||
| 798 | # Supported FlexCopII (B2C2) Adapters | ||
| 799 | # | ||
| 800 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
| 801 | |||
| 802 | # | ||
| 803 | # Supported BT878 Adapters | ||
| 804 | # | ||
| 805 | |||
| 806 | # | ||
| 807 | # Supported Pluto2 Adapters | ||
| 808 | # | ||
| 809 | # CONFIG_DVB_PLUTO2 is not set | ||
| 810 | |||
| 811 | # | ||
| 812 | # Supported DVB Frontends | ||
| 813 | # | ||
| 814 | |||
| 815 | # | ||
| 816 | # Customise DVB Frontends | ||
| 817 | # | ||
| 818 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
| 819 | |||
| 820 | # | ||
| 821 | # DVB-S (satellite) frontends | ||
| 822 | # | ||
| 823 | # CONFIG_DVB_STV0299 is not set | ||
| 824 | # CONFIG_DVB_CX24110 is not set | ||
| 825 | # CONFIG_DVB_CX24123 is not set | ||
| 826 | # CONFIG_DVB_TDA8083 is not set | ||
| 827 | # CONFIG_DVB_MT312 is not set | ||
| 828 | # CONFIG_DVB_VES1X93 is not set | ||
| 829 | # CONFIG_DVB_S5H1420 is not set | ||
| 830 | # CONFIG_DVB_TDA10086 is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # DVB-T (terrestrial) frontends | ||
| 834 | # | ||
| 835 | # CONFIG_DVB_SP8870 is not set | ||
| 836 | # CONFIG_DVB_SP887X is not set | ||
| 837 | # CONFIG_DVB_CX22700 is not set | ||
| 838 | # CONFIG_DVB_CX22702 is not set | ||
| 839 | # CONFIG_DVB_L64781 is not set | ||
| 840 | # CONFIG_DVB_TDA1004X is not set | ||
| 841 | # CONFIG_DVB_NXT6000 is not set | ||
| 842 | # CONFIG_DVB_MT352 is not set | ||
| 843 | # CONFIG_DVB_ZL10353 is not set | ||
| 844 | # CONFIG_DVB_DIB3000MB is not set | ||
| 845 | # CONFIG_DVB_DIB3000MC is not set | ||
| 846 | # CONFIG_DVB_DIB7000M is not set | ||
| 847 | # CONFIG_DVB_DIB7000P is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # DVB-C (cable) frontends | ||
| 851 | # | ||
| 852 | # CONFIG_DVB_VES1820 is not set | ||
| 853 | # CONFIG_DVB_TDA10021 is not set | ||
| 854 | # CONFIG_DVB_TDA10023 is not set | ||
| 855 | # CONFIG_DVB_STV0297 is not set | ||
| 856 | |||
| 857 | # | ||
| 858 | # ATSC (North American/Korean Terrestrial/Cable DTV) frontends | ||
| 859 | # | ||
| 860 | # CONFIG_DVB_NXT200X is not set | ||
| 861 | # CONFIG_DVB_OR51211 is not set | ||
| 862 | # CONFIG_DVB_OR51132 is not set | ||
| 863 | # CONFIG_DVB_BCM3510 is not set | ||
| 864 | # CONFIG_DVB_LGDT330X is not set | ||
| 865 | |||
| 866 | # | ||
| 867 | # Tuners/PLL support | ||
| 868 | # | ||
| 869 | # CONFIG_DVB_PLL is not set | ||
| 870 | # CONFIG_DVB_TDA826X is not set | ||
| 871 | # CONFIG_DVB_TDA827X is not set | ||
| 872 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 873 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 874 | |||
| 875 | # | ||
| 876 | # Miscellaneous devices | ||
| 877 | # | ||
| 878 | # CONFIG_DVB_LNBP21 is not set | ||
| 879 | # CONFIG_DVB_ISL6421 is not set | ||
| 880 | # CONFIG_DVB_TUA6100 is not set | ||
| 673 | CONFIG_DAB=y | 881 | CONFIG_DAB=y |
| 882 | # CONFIG_USB_DABUSB is not set | ||
| 674 | 883 | ||
| 675 | # | 884 | # |
| 676 | # Graphics support | 885 | # Graphics support |
| @@ -682,6 +891,7 @@ CONFIG_DAB=y | |||
| 682 | # | 891 | # |
| 683 | # CONFIG_DISPLAY_SUPPORT is not set | 892 | # CONFIG_DISPLAY_SUPPORT is not set |
| 684 | # CONFIG_VGASTATE is not set | 893 | # CONFIG_VGASTATE is not set |
| 894 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 685 | # CONFIG_FB is not set | 895 | # CONFIG_FB is not set |
| 686 | # CONFIG_FB_IBM_GXT4500 is not set | 896 | # CONFIG_FB_IBM_GXT4500 is not set |
| 687 | 897 | ||
| @@ -695,58 +905,293 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 695 | # | 905 | # |
| 696 | # Sound | 906 | # Sound |
| 697 | # | 907 | # |
| 698 | # CONFIG_SOUND is not set | 908 | CONFIG_SOUND=y |
| 699 | 909 | ||
| 700 | # | 910 | # |
| 701 | # HID Devices | 911 | # Advanced Linux Sound Architecture |
| 702 | # | 912 | # |
| 913 | CONFIG_SND=y | ||
| 914 | CONFIG_SND_TIMER=y | ||
| 915 | CONFIG_SND_PCM=y | ||
| 916 | # CONFIG_SND_SEQUENCER is not set | ||
| 917 | # CONFIG_SND_MIXER_OSS is not set | ||
| 918 | # CONFIG_SND_PCM_OSS is not set | ||
| 919 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 920 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 921 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 922 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 923 | # CONFIG_SND_DEBUG is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # Generic devices | ||
| 927 | # | ||
| 928 | CONFIG_SND_AC97_CODEC=y | ||
| 929 | # CONFIG_SND_DUMMY is not set | ||
| 930 | # CONFIG_SND_MTPAV is not set | ||
| 931 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 932 | # CONFIG_SND_MPU401 is not set | ||
| 933 | |||
| 934 | # | ||
| 935 | # PCI devices | ||
| 936 | # | ||
| 937 | # CONFIG_SND_AD1889 is not set | ||
| 938 | # CONFIG_SND_ALS300 is not set | ||
| 939 | # CONFIG_SND_ALS4000 is not set | ||
| 940 | # CONFIG_SND_ALI5451 is not set | ||
| 941 | # CONFIG_SND_ATIIXP is not set | ||
| 942 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 943 | # CONFIG_SND_AU8810 is not set | ||
| 944 | # CONFIG_SND_AU8820 is not set | ||
| 945 | # CONFIG_SND_AU8830 is not set | ||
| 946 | # CONFIG_SND_AZT3328 is not set | ||
| 947 | # CONFIG_SND_BT87X is not set | ||
| 948 | # CONFIG_SND_CA0106 is not set | ||
| 949 | # CONFIG_SND_CMIPCI is not set | ||
| 950 | # CONFIG_SND_CS4281 is not set | ||
| 951 | # CONFIG_SND_CS46XX is not set | ||
| 952 | # CONFIG_SND_CS5530 is not set | ||
| 953 | # CONFIG_SND_DARLA20 is not set | ||
| 954 | # CONFIG_SND_GINA20 is not set | ||
| 955 | # CONFIG_SND_LAYLA20 is not set | ||
| 956 | # CONFIG_SND_DARLA24 is not set | ||
| 957 | # CONFIG_SND_GINA24 is not set | ||
| 958 | # CONFIG_SND_LAYLA24 is not set | ||
| 959 | # CONFIG_SND_MONA is not set | ||
| 960 | # CONFIG_SND_MIA is not set | ||
| 961 | # CONFIG_SND_ECHO3G is not set | ||
| 962 | # CONFIG_SND_INDIGO is not set | ||
| 963 | # CONFIG_SND_INDIGOIO is not set | ||
| 964 | # CONFIG_SND_INDIGODJ is not set | ||
| 965 | # CONFIG_SND_EMU10K1 is not set | ||
| 966 | # CONFIG_SND_EMU10K1X is not set | ||
| 967 | # CONFIG_SND_ENS1370 is not set | ||
| 968 | # CONFIG_SND_ENS1371 is not set | ||
| 969 | # CONFIG_SND_ES1938 is not set | ||
| 970 | # CONFIG_SND_ES1968 is not set | ||
| 971 | # CONFIG_SND_FM801 is not set | ||
| 972 | # CONFIG_SND_HDA_INTEL is not set | ||
| 973 | # CONFIG_SND_HDSP is not set | ||
| 974 | # CONFIG_SND_HDSPM is not set | ||
| 975 | # CONFIG_SND_ICE1712 is not set | ||
| 976 | # CONFIG_SND_ICE1724 is not set | ||
| 977 | CONFIG_SND_INTEL8X0=y | ||
| 978 | # CONFIG_SND_INTEL8X0M is not set | ||
| 979 | # CONFIG_SND_KORG1212 is not set | ||
| 980 | # CONFIG_SND_MAESTRO3 is not set | ||
| 981 | # CONFIG_SND_MIXART is not set | ||
| 982 | # CONFIG_SND_NM256 is not set | ||
| 983 | # CONFIG_SND_PCXHR is not set | ||
| 984 | # CONFIG_SND_RIPTIDE is not set | ||
| 985 | # CONFIG_SND_RME32 is not set | ||
| 986 | # CONFIG_SND_RME96 is not set | ||
| 987 | # CONFIG_SND_RME9652 is not set | ||
| 988 | # CONFIG_SND_SONICVIBES is not set | ||
| 989 | # CONFIG_SND_TRIDENT is not set | ||
| 990 | # CONFIG_SND_VIA82XX is not set | ||
| 991 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 992 | # CONFIG_SND_VX222 is not set | ||
| 993 | # CONFIG_SND_YMFPCI is not set | ||
| 994 | # CONFIG_SND_AC97_POWER_SAVE is not set | ||
| 995 | |||
| 996 | # | ||
| 997 | # ALSA PowerMac devices | ||
| 998 | # | ||
| 999 | |||
| 1000 | # | ||
| 1001 | # ALSA PowerPC devices | ||
| 1002 | # | ||
| 1003 | |||
| 1004 | # | ||
| 1005 | # USB devices | ||
| 1006 | # | ||
| 1007 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1008 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1009 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1010 | |||
| 1011 | # | ||
| 1012 | # System on Chip audio support | ||
| 1013 | # | ||
| 1014 | # CONFIG_SND_SOC is not set | ||
| 1015 | |||
| 1016 | # | ||
| 1017 | # SoC Audio support for SuperH | ||
| 1018 | # | ||
| 1019 | |||
| 1020 | # | ||
| 1021 | # Open Sound System | ||
| 1022 | # | ||
| 1023 | # CONFIG_SOUND_PRIME is not set | ||
| 1024 | CONFIG_AC97_BUS=y | ||
| 1025 | CONFIG_HID_SUPPORT=y | ||
| 703 | CONFIG_HID=y | 1026 | CONFIG_HID=y |
| 704 | # CONFIG_HID_DEBUG is not set | 1027 | # CONFIG_HID_DEBUG is not set |
| 705 | 1028 | ||
| 706 | # | 1029 | # |
| 707 | # USB support | 1030 | # USB Input Devices |
| 708 | # | 1031 | # |
| 1032 | CONFIG_USB_HID=y | ||
| 1033 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1034 | # CONFIG_HID_FF is not set | ||
| 1035 | # CONFIG_USB_HIDDEV is not set | ||
| 1036 | CONFIG_USB_SUPPORT=y | ||
| 709 | CONFIG_USB_ARCH_HAS_HCD=y | 1037 | CONFIG_USB_ARCH_HAS_HCD=y |
| 710 | CONFIG_USB_ARCH_HAS_OHCI=y | 1038 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 711 | CONFIG_USB_ARCH_HAS_EHCI=y | 1039 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 712 | # CONFIG_USB is not set | 1040 | CONFIG_USB=y |
| 1041 | # CONFIG_USB_DEBUG is not set | ||
| 1042 | |||
| 1043 | # | ||
| 1044 | # Miscellaneous USB options | ||
| 1045 | # | ||
| 1046 | CONFIG_USB_DEVICEFS=y | ||
| 1047 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1048 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1049 | # CONFIG_USB_OTG is not set | ||
| 1050 | |||
| 1051 | # | ||
| 1052 | # USB Host Controller Drivers | ||
| 1053 | # | ||
| 1054 | CONFIG_USB_EHCI_HCD=y | ||
| 1055 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1056 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
| 1057 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
| 1058 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1059 | CONFIG_USB_OHCI_HCD=y | ||
| 1060 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
| 1061 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | ||
| 1062 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | ||
| 1063 | CONFIG_USB_OHCI_HCD_PCI=y | ||
| 1064 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | ||
| 1065 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | ||
| 1066 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 1067 | # CONFIG_USB_UHCI_HCD is not set | ||
| 1068 | # CONFIG_USB_SL811_HCD is not set | ||
| 1069 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1070 | |||
| 1071 | # | ||
| 1072 | # USB Device Class drivers | ||
| 1073 | # | ||
| 1074 | # CONFIG_USB_ACM is not set | ||
| 1075 | # CONFIG_USB_PRINTER is not set | ||
| 713 | 1076 | ||
| 714 | # | 1077 | # |
| 715 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1078 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 716 | # | 1079 | # |
| 717 | 1080 | ||
| 718 | # | 1081 | # |
| 719 | # USB Gadget Support | 1082 | # may also be needed; see USB_STORAGE Help for more information |
| 720 | # | 1083 | # |
| 721 | # CONFIG_USB_GADGET is not set | 1084 | CONFIG_USB_STORAGE=y |
| 722 | # CONFIG_MMC is not set | 1085 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1086 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1087 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1088 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1089 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1090 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1091 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1092 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1093 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1094 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1095 | # CONFIG_USB_LIBUSUAL is not set | ||
| 723 | 1096 | ||
| 724 | # | 1097 | # |
| 725 | # LED devices | 1098 | # USB Imaging devices |
| 1099 | # | ||
| 1100 | # CONFIG_USB_MDC800 is not set | ||
| 1101 | # CONFIG_USB_MICROTEK is not set | ||
| 1102 | CONFIG_USB_MON=y | ||
| 1103 | |||
| 1104 | # | ||
| 1105 | # USB port drivers | ||
| 726 | # | 1106 | # |
| 727 | # CONFIG_NEW_LEDS is not set | ||
| 728 | 1107 | ||
| 729 | # | 1108 | # |
| 730 | # LED drivers | 1109 | # USB Serial Converter support |
| 731 | # | 1110 | # |
| 1111 | # CONFIG_USB_SERIAL is not set | ||
| 732 | 1112 | ||
| 733 | # | 1113 | # |
| 734 | # LED Triggers | 1114 | # USB Miscellaneous drivers |
| 735 | # | 1115 | # |
| 1116 | # CONFIG_USB_EMI62 is not set | ||
| 1117 | # CONFIG_USB_EMI26 is not set | ||
| 1118 | # CONFIG_USB_ADUTUX is not set | ||
| 1119 | # CONFIG_USB_AUERSWALD is not set | ||
| 1120 | # CONFIG_USB_RIO500 is not set | ||
| 1121 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1122 | # CONFIG_USB_LCD is not set | ||
| 1123 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1124 | # CONFIG_USB_LED is not set | ||
| 1125 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1126 | # CONFIG_USB_CYTHERM is not set | ||
| 1127 | # CONFIG_USB_PHIDGET is not set | ||
| 1128 | # CONFIG_USB_IDMOUSE is not set | ||
| 1129 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1130 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1131 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1132 | # CONFIG_USB_LD is not set | ||
| 1133 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1134 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1135 | # CONFIG_USB_TEST is not set | ||
| 736 | 1136 | ||
| 737 | # | 1137 | # |
| 738 | # InfiniBand support | 1138 | # USB DSL modem support |
| 739 | # | 1139 | # |
| 1140 | |||
| 1141 | # | ||
| 1142 | # USB Gadget Support | ||
| 1143 | # | ||
| 1144 | # CONFIG_USB_GADGET is not set | ||
| 1145 | # CONFIG_MMC is not set | ||
| 1146 | # CONFIG_NEW_LEDS is not set | ||
| 740 | # CONFIG_INFINIBAND is not set | 1147 | # CONFIG_INFINIBAND is not set |
| 1148 | # CONFIG_EDAC is not set | ||
| 1149 | CONFIG_RTC_LIB=y | ||
| 1150 | CONFIG_RTC_CLASS=y | ||
| 1151 | CONFIG_RTC_HCTOSYS=y | ||
| 1152 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1153 | # CONFIG_RTC_DEBUG is not set | ||
| 1154 | |||
| 1155 | # | ||
| 1156 | # RTC interfaces | ||
| 1157 | # | ||
| 1158 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1159 | CONFIG_RTC_INTF_PROC=y | ||
| 1160 | CONFIG_RTC_INTF_DEV=y | ||
| 1161 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1162 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1163 | |||
| 1164 | # | ||
| 1165 | # I2C RTC drivers | ||
| 1166 | # | ||
| 1167 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1168 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1169 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1170 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1171 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1172 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1173 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1174 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1175 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1176 | |||
| 1177 | # | ||
| 1178 | # SPI RTC drivers | ||
| 1179 | # | ||
| 741 | 1180 | ||
| 742 | # | 1181 | # |
| 743 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1182 | # Platform RTC drivers |
| 744 | # | 1183 | # |
| 1184 | CONFIG_RTC_DRV_CMOS=y | ||
| 1185 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1186 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1187 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1188 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1189 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1190 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 745 | 1191 | ||
| 746 | # | 1192 | # |
| 747 | # Real Time Clock | 1193 | # on-CPU RTC drivers |
| 748 | # | 1194 | # |
| 749 | # CONFIG_RTC_CLASS is not set | ||
| 750 | 1195 | ||
| 751 | # | 1196 | # |
| 752 | # DMA Engine support | 1197 | # DMA Engine support |
| @@ -762,6 +1207,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 762 | # | 1207 | # |
| 763 | 1208 | ||
| 764 | # | 1209 | # |
| 1210 | # Userspace I/O | ||
| 1211 | # | ||
| 1212 | # CONFIG_UIO is not set | ||
| 1213 | |||
| 1214 | # | ||
| 765 | # File systems | 1215 | # File systems |
| 766 | # | 1216 | # |
| 767 | CONFIG_EXT2_FS=y | 1217 | CONFIG_EXT2_FS=y |
| @@ -783,9 +1233,10 @@ CONFIG_FS_MBCACHE=y | |||
| 783 | # CONFIG_OCFS2_FS is not set | 1233 | # CONFIG_OCFS2_FS is not set |
| 784 | # CONFIG_MINIX_FS is not set | 1234 | # CONFIG_MINIX_FS is not set |
| 785 | # CONFIG_ROMFS_FS is not set | 1235 | # CONFIG_ROMFS_FS is not set |
| 786 | # CONFIG_INOTIFY is not set | 1236 | CONFIG_INOTIFY=y |
| 1237 | CONFIG_INOTIFY_USER=y | ||
| 787 | # CONFIG_QUOTA is not set | 1238 | # CONFIG_QUOTA is not set |
| 788 | # CONFIG_DNOTIFY is not set | 1239 | CONFIG_DNOTIFY=y |
| 789 | # CONFIG_AUTOFS_FS is not set | 1240 | # CONFIG_AUTOFS_FS is not set |
| 790 | # CONFIG_AUTOFS4_FS is not set | 1241 | # CONFIG_AUTOFS4_FS is not set |
| 791 | # CONFIG_FUSE_FS is not set | 1242 | # CONFIG_FUSE_FS is not set |
| @@ -793,15 +1244,23 @@ CONFIG_FS_MBCACHE=y | |||
| 793 | # | 1244 | # |
| 794 | # CD-ROM/DVD Filesystems | 1245 | # CD-ROM/DVD Filesystems |
| 795 | # | 1246 | # |
| 796 | # CONFIG_ISO9660_FS is not set | 1247 | CONFIG_ISO9660_FS=m |
| 797 | # CONFIG_UDF_FS is not set | 1248 | CONFIG_JOLIET=y |
| 1249 | CONFIG_ZISOFS=y | ||
| 1250 | CONFIG_UDF_FS=m | ||
| 1251 | CONFIG_UDF_NLS=y | ||
| 798 | 1252 | ||
| 799 | # | 1253 | # |
| 800 | # DOS/FAT/NT Filesystems | 1254 | # DOS/FAT/NT Filesystems |
| 801 | # | 1255 | # |
| 802 | # CONFIG_MSDOS_FS is not set | 1256 | CONFIG_FAT_FS=y |
| 803 | # CONFIG_VFAT_FS is not set | 1257 | CONFIG_MSDOS_FS=m |
| 804 | # CONFIG_NTFS_FS is not set | 1258 | CONFIG_VFAT_FS=y |
| 1259 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1260 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1261 | CONFIG_NTFS_FS=y | ||
| 1262 | # CONFIG_NTFS_DEBUG is not set | ||
| 1263 | # CONFIG_NTFS_RW is not set | ||
| 805 | 1264 | ||
| 806 | # | 1265 | # |
| 807 | # Pseudo filesystems | 1266 | # Pseudo filesystems |
| @@ -819,19 +1278,23 @@ CONFIG_RAMFS=y | |||
| 819 | # | 1278 | # |
| 820 | # Miscellaneous filesystems | 1279 | # Miscellaneous filesystems |
| 821 | # | 1280 | # |
| 822 | # CONFIG_ADFS_FS is not set | 1281 | CONFIG_ADFS_FS=m |
| 823 | # CONFIG_AFFS_FS is not set | 1282 | # CONFIG_ADFS_FS_RW is not set |
| 824 | # CONFIG_HFS_FS is not set | 1283 | CONFIG_AFFS_FS=m |
| 825 | # CONFIG_HFSPLUS_FS is not set | 1284 | CONFIG_HFS_FS=m |
| 826 | # CONFIG_BEFS_FS is not set | 1285 | CONFIG_HFSPLUS_FS=m |
| 827 | # CONFIG_BFS_FS is not set | 1286 | CONFIG_BEFS_FS=m |
| 828 | # CONFIG_EFS_FS is not set | 1287 | # CONFIG_BEFS_DEBUG is not set |
| 829 | # CONFIG_CRAMFS is not set | 1288 | CONFIG_BFS_FS=m |
| 830 | # CONFIG_VXFS_FS is not set | 1289 | CONFIG_EFS_FS=m |
| 831 | # CONFIG_HPFS_FS is not set | 1290 | CONFIG_CRAMFS=y |
| 832 | # CONFIG_QNX4FS_FS is not set | 1291 | CONFIG_VXFS_FS=m |
| 833 | # CONFIG_SYSV_FS is not set | 1292 | CONFIG_HPFS_FS=m |
| 834 | # CONFIG_UFS_FS is not set | 1293 | CONFIG_QNX4FS_FS=m |
| 1294 | CONFIG_SYSV_FS=m | ||
| 1295 | CONFIG_UFS_FS=m | ||
| 1296 | # CONFIG_UFS_FS_WRITE is not set | ||
| 1297 | # CONFIG_UFS_DEBUG is not set | ||
| 835 | 1298 | ||
| 836 | # | 1299 | # |
| 837 | # Network File Systems | 1300 | # Network File Systems |
| @@ -839,7 +1302,7 @@ CONFIG_RAMFS=y | |||
| 839 | CONFIG_NFS_FS=y | 1302 | CONFIG_NFS_FS=y |
| 840 | CONFIG_NFS_V3=y | 1303 | CONFIG_NFS_V3=y |
| 841 | # CONFIG_NFS_V3_ACL is not set | 1304 | # CONFIG_NFS_V3_ACL is not set |
| 842 | # CONFIG_NFS_V4 is not set | 1305 | CONFIG_NFS_V4=y |
| 843 | # CONFIG_NFS_DIRECTIO is not set | 1306 | # CONFIG_NFS_DIRECTIO is not set |
| 844 | CONFIG_NFSD=y | 1307 | CONFIG_NFSD=y |
| 845 | # CONFIG_NFSD_V3 is not set | 1308 | # CONFIG_NFSD_V3 is not set |
| @@ -850,15 +1313,15 @@ CONFIG_LOCKD_V4=y | |||
| 850 | CONFIG_EXPORTFS=y | 1313 | CONFIG_EXPORTFS=y |
| 851 | CONFIG_NFS_COMMON=y | 1314 | CONFIG_NFS_COMMON=y |
| 852 | CONFIG_SUNRPC=y | 1315 | CONFIG_SUNRPC=y |
| 1316 | CONFIG_SUNRPC_GSS=y | ||
| 853 | # CONFIG_SUNRPC_BIND34 is not set | 1317 | # CONFIG_SUNRPC_BIND34 is not set |
| 854 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1318 | CONFIG_RPCSEC_GSS_KRB5=y |
| 855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1319 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 856 | # CONFIG_SMB_FS is not set | 1320 | # CONFIG_SMB_FS is not set |
| 857 | # CONFIG_CIFS is not set | 1321 | # CONFIG_CIFS is not set |
| 858 | # CONFIG_NCP_FS is not set | 1322 | # CONFIG_NCP_FS is not set |
| 859 | # CONFIG_CODA_FS is not set | 1323 | # CONFIG_CODA_FS is not set |
| 860 | # CONFIG_AFS_FS is not set | 1324 | # CONFIG_AFS_FS is not set |
| 861 | # CONFIG_9P_FS is not set | ||
| 862 | 1325 | ||
| 863 | # | 1326 | # |
| 864 | # Partition Types | 1327 | # Partition Types |
| @@ -868,14 +1331,13 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 868 | # CONFIG_OSF_PARTITION is not set | 1331 | # CONFIG_OSF_PARTITION is not set |
| 869 | # CONFIG_AMIGA_PARTITION is not set | 1332 | # CONFIG_AMIGA_PARTITION is not set |
| 870 | # CONFIG_ATARI_PARTITION is not set | 1333 | # CONFIG_ATARI_PARTITION is not set |
| 871 | # CONFIG_MAC_PARTITION is not set | 1334 | CONFIG_MAC_PARTITION=y |
| 872 | CONFIG_MSDOS_PARTITION=y | 1335 | CONFIG_MSDOS_PARTITION=y |
| 873 | # CONFIG_BSD_DISKLABEL is not set | 1336 | # CONFIG_BSD_DISKLABEL is not set |
| 874 | # CONFIG_MINIX_SUBPARTITION is not set | 1337 | # CONFIG_MINIX_SUBPARTITION is not set |
| 875 | # CONFIG_SOLARIS_X86_PARTITION is not set | 1338 | # CONFIG_SOLARIS_X86_PARTITION is not set |
| 876 | # CONFIG_UNIXWARE_DISKLABEL is not set | 1339 | # CONFIG_UNIXWARE_DISKLABEL is not set |
| 877 | CONFIG_LDM_PARTITION=y | 1340 | # CONFIG_LDM_PARTITION is not set |
| 878 | # CONFIG_LDM_DEBUG is not set | ||
| 879 | # CONFIG_SGI_PARTITION is not set | 1341 | # CONFIG_SGI_PARTITION is not set |
| 880 | # CONFIG_ULTRIX_PARTITION is not set | 1342 | # CONFIG_ULTRIX_PARTITION is not set |
| 881 | # CONFIG_SUN_PARTITION is not set | 1343 | # CONFIG_SUN_PARTITION is not set |
| @@ -925,7 +1387,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 925 | # CONFIG_NLS_ISO8859_15 is not set | 1387 | # CONFIG_NLS_ISO8859_15 is not set |
| 926 | # CONFIG_NLS_KOI8_R is not set | 1388 | # CONFIG_NLS_KOI8_R is not set |
| 927 | # CONFIG_NLS_KOI8_U is not set | 1389 | # CONFIG_NLS_KOI8_U is not set |
| 928 | # CONFIG_NLS_UTF8 is not set | 1390 | CONFIG_NLS_UTF8=m |
| 929 | 1391 | ||
| 930 | # | 1392 | # |
| 931 | # Distributed Lock Manager | 1393 | # Distributed Lock Manager |
| @@ -941,7 +1403,9 @@ CONFIG_BITREVERSE=y | |||
| 941 | # CONFIG_CRC16 is not set | 1403 | # CONFIG_CRC16 is not set |
| 942 | # CONFIG_CRC_ITU_T is not set | 1404 | # CONFIG_CRC_ITU_T is not set |
| 943 | CONFIG_CRC32=y | 1405 | CONFIG_CRC32=y |
| 944 | # CONFIG_LIBCRC32C is not set | 1406 | # CONFIG_CRC7 is not set |
| 1407 | CONFIG_LIBCRC32C=m | ||
| 1408 | CONFIG_ZLIB_INFLATE=y | ||
| 945 | CONFIG_PLIST=y | 1409 | CONFIG_PLIST=y |
| 946 | CONFIG_HAS_IOMEM=y | 1410 | CONFIG_HAS_IOMEM=y |
| 947 | CONFIG_HAS_IOPORT=y | 1411 | CONFIG_HAS_IOPORT=y |
| @@ -951,6 +1415,7 @@ CONFIG_HAS_DMA=y | |||
| 951 | # Instrumentation Support | 1415 | # Instrumentation Support |
| 952 | # | 1416 | # |
| 953 | # CONFIG_PROFILING is not set | 1417 | # CONFIG_PROFILING is not set |
| 1418 | # CONFIG_KPROBES is not set | ||
| 954 | 1419 | ||
| 955 | # | 1420 | # |
| 956 | # Kernel hacking | 1421 | # Kernel hacking |
| @@ -964,6 +1429,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 964 | CONFIG_DEBUG_KERNEL=y | 1429 | CONFIG_DEBUG_KERNEL=y |
| 965 | # CONFIG_DEBUG_SHIRQ is not set | 1430 | # CONFIG_DEBUG_SHIRQ is not set |
| 966 | CONFIG_DETECT_SOFTLOCKUP=y | 1431 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1432 | CONFIG_SCHED_DEBUG=y | ||
| 967 | # CONFIG_SCHEDSTATS is not set | 1433 | # CONFIG_SCHEDSTATS is not set |
| 968 | # CONFIG_TIMER_STATS is not set | 1434 | # CONFIG_TIMER_STATS is not set |
| 969 | # CONFIG_DEBUG_SLAB is not set | 1435 | # CONFIG_DEBUG_SLAB is not set |
| @@ -976,17 +1442,17 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 976 | # CONFIG_DEBUG_KOBJECT is not set | 1442 | # CONFIG_DEBUG_KOBJECT is not set |
| 977 | # CONFIG_DEBUG_HIGHMEM is not set | 1443 | # CONFIG_DEBUG_HIGHMEM is not set |
| 978 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1444 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 979 | # CONFIG_DEBUG_INFO is not set | 1445 | CONFIG_DEBUG_INFO=y |
| 980 | # CONFIG_DEBUG_VM is not set | 1446 | # CONFIG_DEBUG_VM is not set |
| 981 | # CONFIG_DEBUG_LIST is not set | 1447 | # CONFIG_DEBUG_LIST is not set |
| 982 | CONFIG_FORCED_INLINING=y | 1448 | CONFIG_FORCED_INLINING=y |
| 1449 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 983 | # CONFIG_FAULT_INJECTION is not set | 1450 | # CONFIG_FAULT_INJECTION is not set |
| 984 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1451 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 985 | # CONFIG_DEBUG_STACK_USAGE is not set | 1452 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 986 | # CONFIG_DEBUG_PAGEALLOC is not set | 1453 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 987 | # CONFIG_DEBUGGER is not set | 1454 | # CONFIG_DEBUGGER is not set |
| 988 | # CONFIG_BDI_SWITCH is not set | 1455 | # CONFIG_BDI_SWITCH is not set |
| 989 | # CONFIG_BOOTX_TEXT is not set | ||
| 990 | # CONFIG_PPC_EARLY_DEBUG is not set | 1456 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 991 | 1457 | ||
| 992 | # | 1458 | # |
| @@ -994,8 +1460,42 @@ CONFIG_FORCED_INLINING=y | |||
| 994 | # | 1460 | # |
| 995 | # CONFIG_KEYS is not set | 1461 | # CONFIG_KEYS is not set |
| 996 | # CONFIG_SECURITY is not set | 1462 | # CONFIG_SECURITY is not set |
| 997 | 1463 | CONFIG_CRYPTO=y | |
| 998 | # | 1464 | CONFIG_CRYPTO_ALGAPI=y |
| 999 | # Cryptographic options | 1465 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1000 | # | 1466 | CONFIG_CRYPTO_HASH=y |
| 1001 | # CONFIG_CRYPTO is not set | 1467 | CONFIG_CRYPTO_MANAGER=y |
| 1468 | CONFIG_CRYPTO_HMAC=y | ||
| 1469 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1470 | # CONFIG_CRYPTO_NULL is not set | ||
| 1471 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1472 | CONFIG_CRYPTO_MD5=y | ||
| 1473 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1474 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1475 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1476 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1477 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1478 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1479 | # CONFIG_CRYPTO_ECB is not set | ||
| 1480 | CONFIG_CRYPTO_CBC=y | ||
| 1481 | CONFIG_CRYPTO_PCBC=m | ||
| 1482 | # CONFIG_CRYPTO_LRW is not set | ||
| 1483 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1484 | CONFIG_CRYPTO_DES=y | ||
| 1485 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1486 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1487 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1488 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1489 | # CONFIG_CRYPTO_AES is not set | ||
| 1490 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1491 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1492 | # CONFIG_CRYPTO_TEA is not set | ||
| 1493 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1494 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1495 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1496 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1497 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1498 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1499 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1500 | # CONFIG_CRYPTO_TEST is not set | ||
| 1501 | CONFIG_CRYPTO_HW=y | ||
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index e6b18ea8f643..143a0cd83327 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_defconfig | |||
| @@ -1,9 +1,22 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:57:00 2007 | 4 | # Tue Aug 28 21:24:44 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | CONFIG_PPC_8xx=y | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_8xx=y | ||
| 18 | # CONFIG_PPC_MM_SLICES is not set | ||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 7 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 21 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 22 | CONFIG_MMU=y |
| @@ -14,56 +27,37 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 27 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 28 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 29 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 30 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 31 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 32 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 33 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 34 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 35 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 36 | CONFIG_PPC_OF=y |
| 37 | CONFIG_OF=y | ||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 38 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 39 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 40 | CONFIG_AUDIT_ARCH=y |
| 26 | # CONFIG_DEFAULT_UIMAGE is not set | 41 | # CONFIG_DEFAULT_UIMAGE is not set |
| 27 | |||
| 28 | # | ||
| 29 | # Processor support | ||
| 30 | # | ||
| 31 | # CONFIG_CLASSIC32 is not set | ||
| 32 | # CONFIG_PPC_82xx is not set | ||
| 33 | # CONFIG_PPC_83xx is not set | ||
| 34 | # CONFIG_PPC_85xx is not set | ||
| 35 | # CONFIG_PPC_86xx is not set | ||
| 36 | CONFIG_PPC_8xx=y | ||
| 37 | # CONFIG_40x is not set | ||
| 38 | # CONFIG_44x is not set | ||
| 39 | # CONFIG_E200 is not set | ||
| 40 | CONFIG_8xx=y | ||
| 41 | # CONFIG_PPC_DCR_NATIVE is not set | 42 | # CONFIG_PPC_DCR_NATIVE is not set |
| 42 | # CONFIG_PPC_DCR_MMIO is not set | 43 | # CONFIG_PPC_DCR_MMIO is not set |
| 43 | # CONFIG_PPC_MM_SLICES is not set | ||
| 44 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 45 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 44 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 46 | 45 | ||
| 47 | # | 46 | # |
| 48 | # Code maturity level options | 47 | # General setup |
| 49 | # | 48 | # |
| 50 | CONFIG_EXPERIMENTAL=y | 49 | CONFIG_EXPERIMENTAL=y |
| 51 | CONFIG_BROKEN_ON_SMP=y | 50 | CONFIG_BROKEN_ON_SMP=y |
| 52 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 51 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 53 | |||
| 54 | # | ||
| 55 | # General setup | ||
| 56 | # | ||
| 57 | CONFIG_LOCALVERSION="" | 52 | CONFIG_LOCALVERSION="" |
| 58 | CONFIG_LOCALVERSION_AUTO=y | 53 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | # CONFIG_SWAP is not set | 54 | # CONFIG_SWAP is not set |
| 60 | CONFIG_SYSVIPC=y | 55 | CONFIG_SYSVIPC=y |
| 61 | # CONFIG_IPC_NS is not set | ||
| 62 | CONFIG_SYSVIPC_SYSCTL=y | 56 | CONFIG_SYSVIPC_SYSCTL=y |
| 63 | # CONFIG_POSIX_MQUEUE is not set | 57 | # CONFIG_POSIX_MQUEUE is not set |
| 64 | # CONFIG_BSD_PROCESS_ACCT is not set | 58 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 65 | # CONFIG_TASKSTATS is not set | 59 | # CONFIG_TASKSTATS is not set |
| 66 | # CONFIG_UTS_NS is not set | 60 | # CONFIG_USER_NS is not set |
| 67 | # CONFIG_AUDIT is not set | 61 | # CONFIG_AUDIT is not set |
| 68 | # CONFIG_IKCONFIG is not set | 62 | # CONFIG_IKCONFIG is not set |
| 69 | CONFIG_LOG_BUF_SHIFT=14 | 63 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -95,19 +89,12 @@ CONFIG_SLAB=y | |||
| 95 | CONFIG_RT_MUTEXES=y | 89 | CONFIG_RT_MUTEXES=y |
| 96 | # CONFIG_TINY_SHMEM is not set | 90 | # CONFIG_TINY_SHMEM is not set |
| 97 | CONFIG_BASE_SMALL=1 | 91 | CONFIG_BASE_SMALL=1 |
| 98 | |||
| 99 | # | ||
| 100 | # Loadable module support | ||
| 101 | # | ||
| 102 | # CONFIG_MODULES is not set | 92 | # CONFIG_MODULES is not set |
| 103 | |||
| 104 | # | ||
| 105 | # Block layer | ||
| 106 | # | ||
| 107 | CONFIG_BLOCK=y | 93 | CONFIG_BLOCK=y |
| 108 | # CONFIG_LBD is not set | 94 | # CONFIG_LBD is not set |
| 109 | # CONFIG_BLK_DEV_IO_TRACE is not set | 95 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 110 | # CONFIG_LSF is not set | 96 | # CONFIG_LSF is not set |
| 97 | # CONFIG_BLK_DEV_BSG is not set | ||
| 111 | 98 | ||
| 112 | # | 99 | # |
| 113 | # IO Schedulers | 100 | # IO Schedulers |
| @@ -159,6 +146,7 @@ CONFIG_NO_UCODE_PATCH=y | |||
| 159 | # CONFIG_GENERIC_IOMAP is not set | 146 | # CONFIG_GENERIC_IOMAP is not set |
| 160 | # CONFIG_CPU_FREQ is not set | 147 | # CONFIG_CPU_FREQ is not set |
| 161 | # CONFIG_CPM2 is not set | 148 | # CONFIG_CPM2 is not set |
| 149 | # CONFIG_FSL_ULI1575 is not set | ||
| 162 | 150 | ||
| 163 | # | 151 | # |
| 164 | # Kernel options | 152 | # Kernel options |
| @@ -188,6 +176,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 176 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 189 | # CONFIG_RESOURCES_64BIT is not set | 177 | # CONFIG_RESOURCES_64BIT is not set |
| 190 | CONFIG_ZONE_DMA_FLAG=1 | 178 | CONFIG_ZONE_DMA_FLAG=1 |
| 179 | CONFIG_BOUNCE=y | ||
| 180 | CONFIG_VIRT_TO_BUS=y | ||
| 191 | # CONFIG_PROC_DEVICETREE is not set | 181 | # CONFIG_PROC_DEVICETREE is not set |
| 192 | # CONFIG_CMDLINE_BOOL is not set | 182 | # CONFIG_CMDLINE_BOOL is not set |
| 193 | # CONFIG_PM is not set | 183 | # CONFIG_PM is not set |
| @@ -202,6 +192,7 @@ CONFIG_ZONE_DMA=y | |||
| 202 | CONFIG_FSL_SOC=y | 192 | CONFIG_FSL_SOC=y |
| 203 | # CONFIG_PCI is not set | 193 | # CONFIG_PCI is not set |
| 204 | # CONFIG_PCI_DOMAINS is not set | 194 | # CONFIG_PCI_DOMAINS is not set |
| 195 | # CONFIG_PCI_SYSCALL is not set | ||
| 205 | # CONFIG_PCI_QSPAN is not set | 196 | # CONFIG_PCI_QSPAN is not set |
| 206 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 197 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 207 | 198 | ||
| @@ -310,6 +301,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 310 | # CONFIG_MAC80211 is not set | 301 | # CONFIG_MAC80211 is not set |
| 311 | # CONFIG_IEEE80211 is not set | 302 | # CONFIG_IEEE80211 is not set |
| 312 | # CONFIG_RFKILL is not set | 303 | # CONFIG_RFKILL is not set |
| 304 | # CONFIG_NET_9P is not set | ||
| 313 | 305 | ||
| 314 | # | 306 | # |
| 315 | # Device Drivers | 307 | # Device Drivers |
| @@ -321,26 +313,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 321 | CONFIG_STANDALONE=y | 313 | CONFIG_STANDALONE=y |
| 322 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 314 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 323 | # CONFIG_SYS_HYPERVISOR is not set | 315 | # CONFIG_SYS_HYPERVISOR is not set |
| 324 | |||
| 325 | # | ||
| 326 | # Connector - unified userspace <-> kernelspace linker | ||
| 327 | # | ||
| 328 | # CONFIG_CONNECTOR is not set | 316 | # CONFIG_CONNECTOR is not set |
| 329 | # CONFIG_MTD is not set | 317 | # CONFIG_MTD is not set |
| 330 | 318 | CONFIG_OF_DEVICE=y | |
| 331 | # | ||
| 332 | # Parallel port support | ||
| 333 | # | ||
| 334 | # CONFIG_PARPORT is not set | 319 | # CONFIG_PARPORT is not set |
| 335 | 320 | CONFIG_BLK_DEV=y | |
| 336 | # | ||
| 337 | # Plug and Play support | ||
| 338 | # | ||
| 339 | # CONFIG_PNPACPI is not set | ||
| 340 | |||
| 341 | # | ||
| 342 | # Block devices | ||
| 343 | # | ||
| 344 | # CONFIG_BLK_DEV_FD is not set | 321 | # CONFIG_BLK_DEV_FD is not set |
| 345 | # CONFIG_BLK_DEV_COW_COMMON is not set | 322 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 346 | CONFIG_BLK_DEV_LOOP=y | 323 | CONFIG_BLK_DEV_LOOP=y |
| @@ -349,11 +326,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 349 | # CONFIG_BLK_DEV_RAM is not set | 326 | # CONFIG_BLK_DEV_RAM is not set |
| 350 | # CONFIG_CDROM_PKTCDVD is not set | 327 | # CONFIG_CDROM_PKTCDVD is not set |
| 351 | # CONFIG_ATA_OVER_ETH is not set | 328 | # CONFIG_ATA_OVER_ETH is not set |
| 352 | 329 | CONFIG_MISC_DEVICES=y | |
| 353 | # | 330 | # CONFIG_EEPROM_93CX6 is not set |
| 354 | # Misc devices | ||
| 355 | # | ||
| 356 | # CONFIG_BLINK is not set | ||
| 357 | # CONFIG_IDE is not set | 331 | # CONFIG_IDE is not set |
| 358 | 332 | ||
| 359 | # | 333 | # |
| @@ -361,21 +335,16 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 361 | # | 335 | # |
| 362 | # CONFIG_RAID_ATTRS is not set | 336 | # CONFIG_RAID_ATTRS is not set |
| 363 | # CONFIG_SCSI is not set | 337 | # CONFIG_SCSI is not set |
| 338 | # CONFIG_SCSI_DMA is not set | ||
| 364 | # CONFIG_SCSI_NETLINK is not set | 339 | # CONFIG_SCSI_NETLINK is not set |
| 365 | # CONFIG_ATA is not set | 340 | # CONFIG_ATA is not set |
| 366 | |||
| 367 | # | ||
| 368 | # Multi-device support (RAID and LVM) | ||
| 369 | # | ||
| 370 | # CONFIG_MD is not set | 341 | # CONFIG_MD is not set |
| 371 | # CONFIG_MACINTOSH_DRIVERS is not set | 342 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 372 | |||
| 373 | # | ||
| 374 | # Network device support | ||
| 375 | # | ||
| 376 | CONFIG_NETDEVICES=y | 343 | CONFIG_NETDEVICES=y |
| 344 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 377 | # CONFIG_DUMMY is not set | 345 | # CONFIG_DUMMY is not set |
| 378 | # CONFIG_BONDING is not set | 346 | # CONFIG_BONDING is not set |
| 347 | # CONFIG_MACVLAN is not set | ||
| 379 | # CONFIG_EQUALIZER is not set | 348 | # CONFIG_EQUALIZER is not set |
| 380 | # CONFIG_TUN is not set | 349 | # CONFIG_TUN is not set |
| 381 | CONFIG_PHYLIB=y | 350 | CONFIG_PHYLIB=y |
| @@ -391,16 +360,12 @@ CONFIG_PHYLIB=y | |||
| 391 | # CONFIG_VITESSE_PHY is not set | 360 | # CONFIG_VITESSE_PHY is not set |
| 392 | # CONFIG_SMSC_PHY is not set | 361 | # CONFIG_SMSC_PHY is not set |
| 393 | # CONFIG_BROADCOM_PHY is not set | 362 | # CONFIG_BROADCOM_PHY is not set |
| 363 | # CONFIG_ICPLUS_PHY is not set | ||
| 394 | CONFIG_FIXED_PHY=y | 364 | CONFIG_FIXED_PHY=y |
| 395 | CONFIG_FIXED_MII_10_FDX=y | 365 | CONFIG_FIXED_MII_10_FDX=y |
| 396 | CONFIG_FIXED_MII_100_FDX=y | 366 | CONFIG_FIXED_MII_100_FDX=y |
| 397 | |||
| 398 | # | ||
| 399 | # Ethernet (10 or 100Mbit) | ||
| 400 | # | ||
| 401 | CONFIG_NET_ETHERNET=y | 367 | CONFIG_NET_ETHERNET=y |
| 402 | CONFIG_MII=y | 368 | CONFIG_MII=y |
| 403 | # CONFIG_FEC_8XX is not set | ||
| 404 | CONFIG_FS_ENET=y | 369 | CONFIG_FS_ENET=y |
| 405 | CONFIG_FS_ENET_HAS_SCC=y | 370 | CONFIG_FS_ENET_HAS_SCC=y |
| 406 | CONFIG_FS_ENET_HAS_FEC=y | 371 | CONFIG_FS_ENET_HAS_FEC=y |
| @@ -419,15 +384,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # CONFIG_NETCONSOLE is not set | 384 | # CONFIG_NETCONSOLE is not set |
| 420 | # CONFIG_NETPOLL is not set | 385 | # CONFIG_NETPOLL is not set |
| 421 | # CONFIG_NET_POLL_CONTROLLER is not set | 386 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 422 | |||
| 423 | # | ||
| 424 | # ISDN subsystem | ||
| 425 | # | ||
| 426 | # CONFIG_ISDN is not set | 387 | # CONFIG_ISDN is not set |
| 427 | |||
| 428 | # | ||
| 429 | # Telephony Support | ||
| 430 | # | ||
| 431 | # CONFIG_PHONE is not set | 388 | # CONFIG_PHONE is not set |
| 432 | 389 | ||
| 433 | # | 390 | # |
| @@ -511,10 +468,6 @@ CONFIG_SERIAL_CPM_SMC1=y | |||
| 511 | CONFIG_SERIAL_CPM_SMC2=y | 468 | CONFIG_SERIAL_CPM_SMC2=y |
| 512 | CONFIG_UNIX98_PTYS=y | 469 | CONFIG_UNIX98_PTYS=y |
| 513 | # CONFIG_LEGACY_PTYS is not set | 470 | # CONFIG_LEGACY_PTYS is not set |
| 514 | |||
| 515 | # | ||
| 516 | # IPMI | ||
| 517 | # | ||
| 518 | # CONFIG_IPMI_HANDLER is not set | 471 | # CONFIG_IPMI_HANDLER is not set |
| 519 | # CONFIG_WATCHDOG is not set | 472 | # CONFIG_WATCHDOG is not set |
| 520 | CONFIG_HW_RANDOM=y | 473 | CONFIG_HW_RANDOM=y |
| @@ -523,10 +476,6 @@ CONFIG_GEN_RTC=y | |||
| 523 | # CONFIG_GEN_RTC_X is not set | 476 | # CONFIG_GEN_RTC_X is not set |
| 524 | # CONFIG_R3964 is not set | 477 | # CONFIG_R3964 is not set |
| 525 | # CONFIG_RAW_DRIVER is not set | 478 | # CONFIG_RAW_DRIVER is not set |
| 526 | |||
| 527 | # | ||
| 528 | # TPM devices | ||
| 529 | # | ||
| 530 | # CONFIG_TCG_TPM is not set | 479 | # CONFIG_TCG_TPM is not set |
| 531 | # CONFIG_I2C is not set | 480 | # CONFIG_I2C is not set |
| 532 | 481 | ||
| @@ -535,20 +484,21 @@ CONFIG_GEN_RTC=y | |||
| 535 | # | 484 | # |
| 536 | # CONFIG_SPI is not set | 485 | # CONFIG_SPI is not set |
| 537 | # CONFIG_SPI_MASTER is not set | 486 | # CONFIG_SPI_MASTER is not set |
| 538 | |||
| 539 | # | ||
| 540 | # Dallas's 1-wire bus | ||
| 541 | # | ||
| 542 | # CONFIG_W1 is not set | 487 | # CONFIG_W1 is not set |
| 488 | # CONFIG_POWER_SUPPLY is not set | ||
| 543 | CONFIG_HWMON=y | 489 | CONFIG_HWMON=y |
| 544 | # CONFIG_HWMON_VID is not set | 490 | # CONFIG_HWMON_VID is not set |
| 545 | # CONFIG_SENSORS_ABITUGURU is not set | 491 | # CONFIG_SENSORS_ABITUGURU is not set |
| 492 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 546 | # CONFIG_SENSORS_F71805F is not set | 493 | # CONFIG_SENSORS_F71805F is not set |
| 494 | # CONFIG_SENSORS_IT87 is not set | ||
| 495 | # CONFIG_SENSORS_PC87360 is not set | ||
| 547 | # CONFIG_SENSORS_PC87427 is not set | 496 | # CONFIG_SENSORS_PC87427 is not set |
| 548 | # CONFIG_SENSORS_SMSC47M1 is not set | 497 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 549 | # CONFIG_SENSORS_SMSC47B397 is not set | 498 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 550 | # CONFIG_SENSORS_VT1211 is not set | 499 | # CONFIG_SENSORS_VT1211 is not set |
| 551 | # CONFIG_SENSORS_W83627HF is not set | 500 | # CONFIG_SENSORS_W83627HF is not set |
| 501 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 552 | # CONFIG_HWMON_DEBUG_CHIP is not set | 502 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 553 | 503 | ||
| 554 | # | 504 | # |
| @@ -573,6 +523,7 @@ CONFIG_DAB=y | |||
| 573 | # | 523 | # |
| 574 | # CONFIG_DISPLAY_SUPPORT is not set | 524 | # CONFIG_DISPLAY_SUPPORT is not set |
| 575 | # CONFIG_VGASTATE is not set | 525 | # CONFIG_VGASTATE is not set |
| 526 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 576 | # CONFIG_FB is not set | 527 | # CONFIG_FB is not set |
| 577 | # CONFIG_FB_IBM_GXT4500 is not set | 528 | # CONFIG_FB_IBM_GXT4500 is not set |
| 578 | 529 | ||
| @@ -580,16 +531,10 @@ CONFIG_DAB=y | |||
| 580 | # Sound | 531 | # Sound |
| 581 | # | 532 | # |
| 582 | # CONFIG_SOUND is not set | 533 | # CONFIG_SOUND is not set |
| 583 | 534 | CONFIG_HID_SUPPORT=y | |
| 584 | # | ||
| 585 | # HID Devices | ||
| 586 | # | ||
| 587 | CONFIG_HID=y | 535 | CONFIG_HID=y |
| 588 | # CONFIG_HID_DEBUG is not set | 536 | # CONFIG_HID_DEBUG is not set |
| 589 | 537 | CONFIG_USB_SUPPORT=y | |
| 590 | # | ||
| 591 | # USB support | ||
| 592 | # | ||
| 593 | # CONFIG_USB_ARCH_HAS_HCD is not set | 538 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 594 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 539 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 595 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 540 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -603,31 +548,8 @@ CONFIG_HID=y | |||
| 603 | # | 548 | # |
| 604 | # CONFIG_USB_GADGET is not set | 549 | # CONFIG_USB_GADGET is not set |
| 605 | # CONFIG_MMC is not set | 550 | # CONFIG_MMC is not set |
| 606 | |||
| 607 | # | ||
| 608 | # LED devices | ||
| 609 | # | ||
| 610 | # CONFIG_NEW_LEDS is not set | 551 | # CONFIG_NEW_LEDS is not set |
| 611 | 552 | # CONFIG_EDAC is not set | |
| 612 | # | ||
| 613 | # LED drivers | ||
| 614 | # | ||
| 615 | |||
| 616 | # | ||
| 617 | # LED Triggers | ||
| 618 | # | ||
| 619 | |||
| 620 | # | ||
| 621 | # InfiniBand support | ||
| 622 | # | ||
| 623 | |||
| 624 | # | ||
| 625 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 626 | # | ||
| 627 | |||
| 628 | # | ||
| 629 | # Real Time Clock | ||
| 630 | # | ||
| 631 | # CONFIG_RTC_CLASS is not set | 553 | # CONFIG_RTC_CLASS is not set |
| 632 | 554 | ||
| 633 | # | 555 | # |
| @@ -644,6 +566,11 @@ CONFIG_HID=y | |||
| 644 | # | 566 | # |
| 645 | 567 | ||
| 646 | # | 568 | # |
| 569 | # Userspace I/O | ||
| 570 | # | ||
| 571 | # CONFIG_UIO is not set | ||
| 572 | |||
| 573 | # | ||
| 647 | # File systems | 574 | # File systems |
| 648 | # | 575 | # |
| 649 | CONFIG_EXT2_FS=y | 576 | CONFIG_EXT2_FS=y |
| @@ -740,7 +667,6 @@ CONFIG_SUNRPC=y | |||
| 740 | # CONFIG_NCP_FS is not set | 667 | # CONFIG_NCP_FS is not set |
| 741 | # CONFIG_CODA_FS is not set | 668 | # CONFIG_CODA_FS is not set |
| 742 | # CONFIG_AFS_FS is not set | 669 | # CONFIG_AFS_FS is not set |
| 743 | # CONFIG_9P_FS is not set | ||
| 744 | 670 | ||
| 745 | # | 671 | # |
| 746 | # Partition Types | 672 | # Partition Types |
| @@ -783,6 +709,7 @@ CONFIG_CRC_CCITT=y | |||
| 783 | # CONFIG_CRC16 is not set | 709 | # CONFIG_CRC16 is not set |
| 784 | # CONFIG_CRC_ITU_T is not set | 710 | # CONFIG_CRC_ITU_T is not set |
| 785 | CONFIG_CRC32=y | 711 | CONFIG_CRC32=y |
| 712 | # CONFIG_CRC7 is not set | ||
| 786 | # CONFIG_LIBCRC32C is not set | 713 | # CONFIG_LIBCRC32C is not set |
| 787 | CONFIG_ZLIB_INFLATE=y | 714 | CONFIG_ZLIB_INFLATE=y |
| 788 | CONFIG_PLIST=y | 715 | CONFIG_PLIST=y |
| @@ -805,7 +732,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 805 | # CONFIG_DEBUG_FS is not set | 732 | # CONFIG_DEBUG_FS is not set |
| 806 | # CONFIG_HEADERS_CHECK is not set | 733 | # CONFIG_HEADERS_CHECK is not set |
| 807 | # CONFIG_DEBUG_KERNEL is not set | 734 | # CONFIG_DEBUG_KERNEL is not set |
| 808 | # CONFIG_BOOTX_TEXT is not set | ||
| 809 | # CONFIG_PPC_EARLY_DEBUG is not set | 735 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 810 | 736 | ||
| 811 | # | 737 | # |
| @@ -813,8 +739,4 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 813 | # | 739 | # |
| 814 | # CONFIG_KEYS is not set | 740 | # CONFIG_KEYS is not set |
| 815 | # CONFIG_SECURITY is not set | 741 | # CONFIG_SECURITY is not set |
| 816 | |||
| 817 | # | ||
| 818 | # Cryptographic options | ||
| 819 | # | ||
| 820 | # CONFIG_CRYPTO is not set | 742 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index fc4f9b766aa7..d27e1f8c38fa 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig | |||
| @@ -1,9 +1,22 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc7 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Sun Jul 1 23:57:01 2007 | 4 | # Tue Aug 28 21:24:45 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | CONFIG_PPC_8xx=y | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_8xx=y | ||
| 18 | # CONFIG_PPC_MM_SLICES is not set | ||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 7 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 21 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 22 | CONFIG_MMU=y |
| @@ -14,56 +27,37 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 27 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 28 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 29 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 30 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 31 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 32 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 33 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 34 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 35 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 36 | CONFIG_PPC_OF=y |
| 37 | CONFIG_OF=y | ||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 38 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 39 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 40 | CONFIG_AUDIT_ARCH=y |
| 26 | # CONFIG_DEFAULT_UIMAGE is not set | 41 | # CONFIG_DEFAULT_UIMAGE is not set |
| 27 | |||
| 28 | # | ||
| 29 | # Processor support | ||
| 30 | # | ||
| 31 | # CONFIG_CLASSIC32 is not set | ||
| 32 | # CONFIG_PPC_82xx is not set | ||
| 33 | # CONFIG_PPC_83xx is not set | ||
| 34 | # CONFIG_PPC_85xx is not set | ||
| 35 | # CONFIG_PPC_86xx is not set | ||
| 36 | CONFIG_PPC_8xx=y | ||
| 37 | # CONFIG_40x is not set | ||
| 38 | # CONFIG_44x is not set | ||
| 39 | # CONFIG_E200 is not set | ||
| 40 | CONFIG_8xx=y | ||
| 41 | # CONFIG_PPC_DCR_NATIVE is not set | 42 | # CONFIG_PPC_DCR_NATIVE is not set |
| 42 | # CONFIG_PPC_DCR_MMIO is not set | 43 | # CONFIG_PPC_DCR_MMIO is not set |
| 43 | # CONFIG_PPC_MM_SLICES is not set | ||
| 44 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 45 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 44 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 46 | 45 | ||
| 47 | # | 46 | # |
| 48 | # Code maturity level options | 47 | # General setup |
| 49 | # | 48 | # |
| 50 | CONFIG_EXPERIMENTAL=y | 49 | CONFIG_EXPERIMENTAL=y |
| 51 | CONFIG_BROKEN_ON_SMP=y | 50 | CONFIG_BROKEN_ON_SMP=y |
| 52 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 51 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 53 | |||
| 54 | # | ||
| 55 | # General setup | ||
| 56 | # | ||
| 57 | CONFIG_LOCALVERSION="" | 52 | CONFIG_LOCALVERSION="" |
| 58 | CONFIG_LOCALVERSION_AUTO=y | 53 | CONFIG_LOCALVERSION_AUTO=y |
| 59 | # CONFIG_SWAP is not set | 54 | # CONFIG_SWAP is not set |
| 60 | CONFIG_SYSVIPC=y | 55 | CONFIG_SYSVIPC=y |
| 61 | # CONFIG_IPC_NS is not set | ||
| 62 | CONFIG_SYSVIPC_SYSCTL=y | 56 | CONFIG_SYSVIPC_SYSCTL=y |
| 63 | # CONFIG_POSIX_MQUEUE is not set | 57 | # CONFIG_POSIX_MQUEUE is not set |
| 64 | # CONFIG_BSD_PROCESS_ACCT is not set | 58 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 65 | # CONFIG_TASKSTATS is not set | 59 | # CONFIG_TASKSTATS is not set |
| 66 | # CONFIG_UTS_NS is not set | 60 | # CONFIG_USER_NS is not set |
| 67 | # CONFIG_AUDIT is not set | 61 | # CONFIG_AUDIT is not set |
| 68 | # CONFIG_IKCONFIG is not set | 62 | # CONFIG_IKCONFIG is not set |
| 69 | CONFIG_LOG_BUF_SHIFT=14 | 63 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -95,19 +89,12 @@ CONFIG_SLAB=y | |||
| 95 | CONFIG_RT_MUTEXES=y | 89 | CONFIG_RT_MUTEXES=y |
| 96 | # CONFIG_TINY_SHMEM is not set | 90 | # CONFIG_TINY_SHMEM is not set |
| 97 | CONFIG_BASE_SMALL=1 | 91 | CONFIG_BASE_SMALL=1 |
| 98 | |||
| 99 | # | ||
| 100 | # Loadable module support | ||
| 101 | # | ||
| 102 | # CONFIG_MODULES is not set | 92 | # CONFIG_MODULES is not set |
| 103 | |||
| 104 | # | ||
| 105 | # Block layer | ||
| 106 | # | ||
| 107 | CONFIG_BLOCK=y | 93 | CONFIG_BLOCK=y |
| 108 | # CONFIG_LBD is not set | 94 | # CONFIG_LBD is not set |
| 109 | # CONFIG_BLK_DEV_IO_TRACE is not set | 95 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 110 | # CONFIG_LSF is not set | 96 | # CONFIG_LSF is not set |
| 97 | # CONFIG_BLK_DEV_BSG is not set | ||
| 111 | 98 | ||
| 112 | # | 99 | # |
| 113 | # IO Schedulers | 100 | # IO Schedulers |
| @@ -166,6 +153,7 @@ CONFIG_NO_UCODE_PATCH=y | |||
| 166 | # CONFIG_GENERIC_IOMAP is not set | 153 | # CONFIG_GENERIC_IOMAP is not set |
| 167 | # CONFIG_CPU_FREQ is not set | 154 | # CONFIG_CPU_FREQ is not set |
| 168 | # CONFIG_CPM2 is not set | 155 | # CONFIG_CPM2 is not set |
| 156 | # CONFIG_FSL_ULI1575 is not set | ||
| 169 | 157 | ||
| 170 | # | 158 | # |
| 171 | # Kernel options | 159 | # Kernel options |
| @@ -195,6 +183,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 195 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 183 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 196 | # CONFIG_RESOURCES_64BIT is not set | 184 | # CONFIG_RESOURCES_64BIT is not set |
| 197 | CONFIG_ZONE_DMA_FLAG=1 | 185 | CONFIG_ZONE_DMA_FLAG=1 |
| 186 | CONFIG_BOUNCE=y | ||
| 187 | CONFIG_VIRT_TO_BUS=y | ||
| 198 | # CONFIG_PROC_DEVICETREE is not set | 188 | # CONFIG_PROC_DEVICETREE is not set |
| 199 | # CONFIG_CMDLINE_BOOL is not set | 189 | # CONFIG_CMDLINE_BOOL is not set |
| 200 | # CONFIG_PM is not set | 190 | # CONFIG_PM is not set |
| @@ -209,6 +199,7 @@ CONFIG_ZONE_DMA=y | |||
| 209 | CONFIG_FSL_SOC=y | 199 | CONFIG_FSL_SOC=y |
| 210 | # CONFIG_PCI is not set | 200 | # CONFIG_PCI is not set |
| 211 | # CONFIG_PCI_DOMAINS is not set | 201 | # CONFIG_PCI_DOMAINS is not set |
| 202 | # CONFIG_PCI_SYSCALL is not set | ||
| 212 | # CONFIG_PCI_QSPAN is not set | 203 | # CONFIG_PCI_QSPAN is not set |
| 213 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 204 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 214 | 205 | ||
| @@ -317,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 317 | # CONFIG_MAC80211 is not set | 308 | # CONFIG_MAC80211 is not set |
| 318 | # CONFIG_IEEE80211 is not set | 309 | # CONFIG_IEEE80211 is not set |
| 319 | # CONFIG_RFKILL is not set | 310 | # CONFIG_RFKILL is not set |
| 311 | # CONFIG_NET_9P is not set | ||
| 320 | 312 | ||
| 321 | # | 313 | # |
| 322 | # Device Drivers | 314 | # Device Drivers |
| @@ -328,26 +320,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 328 | CONFIG_STANDALONE=y | 320 | CONFIG_STANDALONE=y |
| 329 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 321 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 330 | # CONFIG_SYS_HYPERVISOR is not set | 322 | # CONFIG_SYS_HYPERVISOR is not set |
| 331 | |||
| 332 | # | ||
| 333 | # Connector - unified userspace <-> kernelspace linker | ||
| 334 | # | ||
| 335 | # CONFIG_CONNECTOR is not set | 323 | # CONFIG_CONNECTOR is not set |
| 336 | # CONFIG_MTD is not set | 324 | # CONFIG_MTD is not set |
| 337 | 325 | CONFIG_OF_DEVICE=y | |
| 338 | # | ||
| 339 | # Parallel port support | ||
| 340 | # | ||
| 341 | # CONFIG_PARPORT is not set | 326 | # CONFIG_PARPORT is not set |
| 342 | 327 | CONFIG_BLK_DEV=y | |
| 343 | # | ||
| 344 | # Plug and Play support | ||
| 345 | # | ||
| 346 | # CONFIG_PNPACPI is not set | ||
| 347 | |||
| 348 | # | ||
| 349 | # Block devices | ||
| 350 | # | ||
| 351 | # CONFIG_BLK_DEV_FD is not set | 328 | # CONFIG_BLK_DEV_FD is not set |
| 352 | # CONFIG_BLK_DEV_COW_COMMON is not set | 329 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 353 | CONFIG_BLK_DEV_LOOP=y | 330 | CONFIG_BLK_DEV_LOOP=y |
| @@ -356,11 +333,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 356 | # CONFIG_BLK_DEV_RAM is not set | 333 | # CONFIG_BLK_DEV_RAM is not set |
| 357 | # CONFIG_CDROM_PKTCDVD is not set | 334 | # CONFIG_CDROM_PKTCDVD is not set |
| 358 | # CONFIG_ATA_OVER_ETH is not set | 335 | # CONFIG_ATA_OVER_ETH is not set |
| 359 | 336 | CONFIG_MISC_DEVICES=y | |
| 360 | # | 337 | # CONFIG_EEPROM_93CX6 is not set |
| 361 | # Misc devices | ||
| 362 | # | ||
| 363 | # CONFIG_BLINK is not set | ||
| 364 | # CONFIG_IDE is not set | 338 | # CONFIG_IDE is not set |
| 365 | 339 | ||
| 366 | # | 340 | # |
| @@ -368,21 +342,16 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 368 | # | 342 | # |
| 369 | # CONFIG_RAID_ATTRS is not set | 343 | # CONFIG_RAID_ATTRS is not set |
| 370 | # CONFIG_SCSI is not set | 344 | # CONFIG_SCSI is not set |
| 345 | # CONFIG_SCSI_DMA is not set | ||
| 371 | # CONFIG_SCSI_NETLINK is not set | 346 | # CONFIG_SCSI_NETLINK is not set |
| 372 | # CONFIG_ATA is not set | 347 | # CONFIG_ATA is not set |
| 373 | |||
| 374 | # | ||
| 375 | # Multi-device support (RAID and LVM) | ||
| 376 | # | ||
| 377 | # CONFIG_MD is not set | 348 | # CONFIG_MD is not set |
| 378 | # CONFIG_MACINTOSH_DRIVERS is not set | 349 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 379 | |||
| 380 | # | ||
| 381 | # Network device support | ||
| 382 | # | ||
| 383 | CONFIG_NETDEVICES=y | 350 | CONFIG_NETDEVICES=y |
| 351 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 384 | # CONFIG_DUMMY is not set | 352 | # CONFIG_DUMMY is not set |
| 385 | # CONFIG_BONDING is not set | 353 | # CONFIG_BONDING is not set |
| 354 | # CONFIG_MACVLAN is not set | ||
| 386 | # CONFIG_EQUALIZER is not set | 355 | # CONFIG_EQUALIZER is not set |
| 387 | # CONFIG_TUN is not set | 356 | # CONFIG_TUN is not set |
| 388 | CONFIG_PHYLIB=y | 357 | CONFIG_PHYLIB=y |
| @@ -398,16 +367,12 @@ CONFIG_DAVICOM_PHY=y | |||
| 398 | # CONFIG_VITESSE_PHY is not set | 367 | # CONFIG_VITESSE_PHY is not set |
| 399 | # CONFIG_SMSC_PHY is not set | 368 | # CONFIG_SMSC_PHY is not set |
| 400 | # CONFIG_BROADCOM_PHY is not set | 369 | # CONFIG_BROADCOM_PHY is not set |
| 370 | # CONFIG_ICPLUS_PHY is not set | ||
| 401 | CONFIG_FIXED_PHY=y | 371 | CONFIG_FIXED_PHY=y |
| 402 | CONFIG_FIXED_MII_10_FDX=y | 372 | CONFIG_FIXED_MII_10_FDX=y |
| 403 | # CONFIG_FIXED_MII_100_FDX is not set | 373 | # CONFIG_FIXED_MII_100_FDX is not set |
| 404 | |||
| 405 | # | ||
| 406 | # Ethernet (10 or 100Mbit) | ||
| 407 | # | ||
| 408 | CONFIG_NET_ETHERNET=y | 374 | CONFIG_NET_ETHERNET=y |
| 409 | CONFIG_MII=y | 375 | CONFIG_MII=y |
| 410 | # CONFIG_FEC_8XX is not set | ||
| 411 | CONFIG_FS_ENET=y | 376 | CONFIG_FS_ENET=y |
| 412 | CONFIG_FS_ENET_HAS_SCC=y | 377 | CONFIG_FS_ENET_HAS_SCC=y |
| 413 | CONFIG_FS_ENET_HAS_FEC=y | 378 | CONFIG_FS_ENET_HAS_FEC=y |
| @@ -426,15 +391,7 @@ CONFIG_NETDEV_10000=y | |||
| 426 | # CONFIG_NETCONSOLE is not set | 391 | # CONFIG_NETCONSOLE is not set |
| 427 | # CONFIG_NETPOLL is not set | 392 | # CONFIG_NETPOLL is not set |
| 428 | # CONFIG_NET_POLL_CONTROLLER is not set | 393 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 429 | |||
| 430 | # | ||
| 431 | # ISDN subsystem | ||
| 432 | # | ||
| 433 | # CONFIG_ISDN is not set | 394 | # CONFIG_ISDN is not set |
| 434 | |||
| 435 | # | ||
| 436 | # Telephony Support | ||
| 437 | # | ||
| 438 | # CONFIG_PHONE is not set | 395 | # CONFIG_PHONE is not set |
| 439 | 396 | ||
| 440 | # | 397 | # |
| @@ -518,10 +475,6 @@ CONFIG_SERIAL_CPM_SMC1=y | |||
| 518 | CONFIG_SERIAL_CPM_SMC2=y | 475 | CONFIG_SERIAL_CPM_SMC2=y |
| 519 | CONFIG_UNIX98_PTYS=y | 476 | CONFIG_UNIX98_PTYS=y |
| 520 | # CONFIG_LEGACY_PTYS is not set | 477 | # CONFIG_LEGACY_PTYS is not set |
| 521 | |||
| 522 | # | ||
| 523 | # IPMI | ||
| 524 | # | ||
| 525 | # CONFIG_IPMI_HANDLER is not set | 478 | # CONFIG_IPMI_HANDLER is not set |
| 526 | # CONFIG_WATCHDOG is not set | 479 | # CONFIG_WATCHDOG is not set |
| 527 | CONFIG_HW_RANDOM=y | 480 | CONFIG_HW_RANDOM=y |
| @@ -530,10 +483,6 @@ CONFIG_GEN_RTC=y | |||
| 530 | # CONFIG_GEN_RTC_X is not set | 483 | # CONFIG_GEN_RTC_X is not set |
| 531 | # CONFIG_R3964 is not set | 484 | # CONFIG_R3964 is not set |
| 532 | # CONFIG_RAW_DRIVER is not set | 485 | # CONFIG_RAW_DRIVER is not set |
| 533 | |||
| 534 | # | ||
| 535 | # TPM devices | ||
| 536 | # | ||
| 537 | # CONFIG_TCG_TPM is not set | 486 | # CONFIG_TCG_TPM is not set |
| 538 | # CONFIG_I2C is not set | 487 | # CONFIG_I2C is not set |
| 539 | 488 | ||
| @@ -542,20 +491,21 @@ CONFIG_GEN_RTC=y | |||
| 542 | # | 491 | # |
| 543 | # CONFIG_SPI is not set | 492 | # CONFIG_SPI is not set |
| 544 | # CONFIG_SPI_MASTER is not set | 493 | # CONFIG_SPI_MASTER is not set |
| 545 | |||
| 546 | # | ||
| 547 | # Dallas's 1-wire bus | ||
| 548 | # | ||
| 549 | # CONFIG_W1 is not set | 494 | # CONFIG_W1 is not set |
| 495 | # CONFIG_POWER_SUPPLY is not set | ||
| 550 | CONFIG_HWMON=y | 496 | CONFIG_HWMON=y |
| 551 | # CONFIG_HWMON_VID is not set | 497 | # CONFIG_HWMON_VID is not set |
| 552 | # CONFIG_SENSORS_ABITUGURU is not set | 498 | # CONFIG_SENSORS_ABITUGURU is not set |
| 499 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 553 | # CONFIG_SENSORS_F71805F is not set | 500 | # CONFIG_SENSORS_F71805F is not set |
| 501 | # CONFIG_SENSORS_IT87 is not set | ||
| 502 | # CONFIG_SENSORS_PC87360 is not set | ||
| 554 | # CONFIG_SENSORS_PC87427 is not set | 503 | # CONFIG_SENSORS_PC87427 is not set |
| 555 | # CONFIG_SENSORS_SMSC47M1 is not set | 504 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 556 | # CONFIG_SENSORS_SMSC47B397 is not set | 505 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 557 | # CONFIG_SENSORS_VT1211 is not set | 506 | # CONFIG_SENSORS_VT1211 is not set |
| 558 | # CONFIG_SENSORS_W83627HF is not set | 507 | # CONFIG_SENSORS_W83627HF is not set |
| 508 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 559 | # CONFIG_HWMON_DEBUG_CHIP is not set | 509 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 560 | 510 | ||
| 561 | # | 511 | # |
| @@ -580,6 +530,7 @@ CONFIG_DAB=y | |||
| 580 | # | 530 | # |
| 581 | # CONFIG_DISPLAY_SUPPORT is not set | 531 | # CONFIG_DISPLAY_SUPPORT is not set |
| 582 | # CONFIG_VGASTATE is not set | 532 | # CONFIG_VGASTATE is not set |
| 533 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 583 | # CONFIG_FB is not set | 534 | # CONFIG_FB is not set |
| 584 | # CONFIG_FB_IBM_GXT4500 is not set | 535 | # CONFIG_FB_IBM_GXT4500 is not set |
| 585 | 536 | ||
| @@ -587,16 +538,10 @@ CONFIG_DAB=y | |||
| 587 | # Sound | 538 | # Sound |
| 588 | # | 539 | # |
| 589 | # CONFIG_SOUND is not set | 540 | # CONFIG_SOUND is not set |
| 590 | 541 | CONFIG_HID_SUPPORT=y | |
| 591 | # | ||
| 592 | # HID Devices | ||
| 593 | # | ||
| 594 | CONFIG_HID=y | 542 | CONFIG_HID=y |
| 595 | # CONFIG_HID_DEBUG is not set | 543 | # CONFIG_HID_DEBUG is not set |
| 596 | 544 | CONFIG_USB_SUPPORT=y | |
| 597 | # | ||
| 598 | # USB support | ||
| 599 | # | ||
| 600 | # CONFIG_USB_ARCH_HAS_HCD is not set | 545 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 601 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 546 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 602 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 547 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| @@ -610,31 +555,8 @@ CONFIG_HID=y | |||
| 610 | # | 555 | # |
| 611 | # CONFIG_USB_GADGET is not set | 556 | # CONFIG_USB_GADGET is not set |
| 612 | # CONFIG_MMC is not set | 557 | # CONFIG_MMC is not set |
| 613 | |||
| 614 | # | ||
| 615 | # LED devices | ||
| 616 | # | ||
| 617 | # CONFIG_NEW_LEDS is not set | 558 | # CONFIG_NEW_LEDS is not set |
| 618 | 559 | # CONFIG_EDAC is not set | |
| 619 | # | ||
| 620 | # LED drivers | ||
| 621 | # | ||
| 622 | |||
| 623 | # | ||
| 624 | # LED Triggers | ||
| 625 | # | ||
| 626 | |||
| 627 | # | ||
| 628 | # InfiniBand support | ||
| 629 | # | ||
| 630 | |||
| 631 | # | ||
| 632 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 633 | # | ||
| 634 | |||
| 635 | # | ||
| 636 | # Real Time Clock | ||
| 637 | # | ||
| 638 | # CONFIG_RTC_CLASS is not set | 560 | # CONFIG_RTC_CLASS is not set |
| 639 | 561 | ||
| 640 | # | 562 | # |
| @@ -651,6 +573,11 @@ CONFIG_HID=y | |||
| 651 | # | 573 | # |
| 652 | 574 | ||
| 653 | # | 575 | # |
| 576 | # Userspace I/O | ||
| 577 | # | ||
| 578 | # CONFIG_UIO is not set | ||
| 579 | |||
| 580 | # | ||
| 654 | # File systems | 581 | # File systems |
| 655 | # | 582 | # |
| 656 | CONFIG_EXT2_FS=y | 583 | CONFIG_EXT2_FS=y |
| @@ -747,7 +674,6 @@ CONFIG_SUNRPC=y | |||
| 747 | # CONFIG_NCP_FS is not set | 674 | # CONFIG_NCP_FS is not set |
| 748 | # CONFIG_CODA_FS is not set | 675 | # CONFIG_CODA_FS is not set |
| 749 | # CONFIG_AFS_FS is not set | 676 | # CONFIG_AFS_FS is not set |
| 750 | # CONFIG_9P_FS is not set | ||
| 751 | 677 | ||
| 752 | # | 678 | # |
| 753 | # Partition Types | 679 | # Partition Types |
| @@ -790,6 +716,7 @@ CONFIG_CRC_CCITT=y | |||
| 790 | # CONFIG_CRC16 is not set | 716 | # CONFIG_CRC16 is not set |
| 791 | # CONFIG_CRC_ITU_T is not set | 717 | # CONFIG_CRC_ITU_T is not set |
| 792 | CONFIG_CRC32=y | 718 | CONFIG_CRC32=y |
| 719 | # CONFIG_CRC7 is not set | ||
| 793 | # CONFIG_LIBCRC32C is not set | 720 | # CONFIG_LIBCRC32C is not set |
| 794 | CONFIG_ZLIB_INFLATE=y | 721 | CONFIG_ZLIB_INFLATE=y |
| 795 | CONFIG_PLIST=y | 722 | CONFIG_PLIST=y |
| @@ -812,7 +739,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 812 | # CONFIG_DEBUG_FS is not set | 739 | # CONFIG_DEBUG_FS is not set |
| 813 | # CONFIG_HEADERS_CHECK is not set | 740 | # CONFIG_HEADERS_CHECK is not set |
| 814 | # CONFIG_DEBUG_KERNEL is not set | 741 | # CONFIG_DEBUG_KERNEL is not set |
| 815 | # CONFIG_BOOTX_TEXT is not set | ||
| 816 | # CONFIG_PPC_EARLY_DEBUG is not set | 742 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 817 | 743 | ||
| 818 | # | 744 | # |
| @@ -820,8 +746,4 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 820 | # | 746 | # |
| 821 | # CONFIG_KEYS is not set | 747 | # CONFIG_KEYS is not set |
| 822 | # CONFIG_SECURITY is not set | 748 | # CONFIG_SECURITY is not set |
| 823 | |||
| 824 | # | ||
| 825 | # Cryptographic options | ||
| 826 | # | ||
| 827 | # CONFIG_CRYPTO is not set | 749 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 905998b925ea..295207030c60 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig | |||
| @@ -1,9 +1,22 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 13:51:39 2007 | 4 | # Thu Aug 30 16:40:47 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_POWER4_ONLY=y | ||
| 12 | CONFIG_POWER4=y | ||
| 13 | CONFIG_PPC_FPU=y | ||
| 14 | CONFIG_ALTIVEC=y | ||
| 15 | CONFIG_PPC_STD_MMU=y | ||
| 16 | CONFIG_PPC_MM_SLICES=y | ||
| 17 | # CONFIG_VIRT_CPU_ACCOUNTING is not set | ||
| 18 | CONFIG_SMP=y | ||
| 19 | CONFIG_NR_CPUS=2 | ||
| 7 | CONFIG_64BIT=y | 20 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 21 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 22 | CONFIG_MMU=y |
| @@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 28 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 29 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 30 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 31 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 32 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 33 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 34 | CONFIG_COMPAT=y |
| @@ -22,49 +36,32 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 36 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 37 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 38 | CONFIG_PPC_OF=y |
| 39 | CONFIG_OF=y | ||
| 25 | CONFIG_PPC_UDBG_16550=y | 40 | CONFIG_PPC_UDBG_16550=y |
| 26 | # CONFIG_GENERIC_TBSYNC is not set | 41 | # CONFIG_GENERIC_TBSYNC is not set |
| 27 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 43 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 44 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | |||
| 31 | # | ||
| 32 | # Processor support | ||
| 33 | # | ||
| 34 | CONFIG_POWER4_ONLY=y | ||
| 35 | CONFIG_POWER4=y | ||
| 36 | CONFIG_PPC_FPU=y | ||
| 37 | # CONFIG_PPC_DCR_NATIVE is not set | 45 | # CONFIG_PPC_DCR_NATIVE is not set |
| 38 | # CONFIG_PPC_DCR_MMIO is not set | 46 | # CONFIG_PPC_DCR_MMIO is not set |
| 39 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | 47 | # CONFIG_PPC_OF_PLATFORM_PCI is not set |
| 40 | CONFIG_ALTIVEC=y | ||
| 41 | CONFIG_PPC_STD_MMU=y | ||
| 42 | CONFIG_PPC_MM_SLICES=y | ||
| 43 | # CONFIG_VIRT_CPU_ACCOUNTING is not set | ||
| 44 | CONFIG_SMP=y | ||
| 45 | CONFIG_NR_CPUS=2 | ||
| 46 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 47 | 49 | ||
| 48 | # | 50 | # |
| 49 | # Code maturity level options | 51 | # General setup |
| 50 | # | 52 | # |
| 51 | CONFIG_EXPERIMENTAL=y | 53 | CONFIG_EXPERIMENTAL=y |
| 52 | CONFIG_LOCK_KERNEL=y | 54 | CONFIG_LOCK_KERNEL=y |
| 53 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 55 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 54 | |||
| 55 | # | ||
| 56 | # General setup | ||
| 57 | # | ||
| 58 | CONFIG_LOCALVERSION="" | 56 | CONFIG_LOCALVERSION="" |
| 59 | CONFIG_LOCALVERSION_AUTO=y | 57 | CONFIG_LOCALVERSION_AUTO=y |
| 60 | CONFIG_SWAP=y | 58 | CONFIG_SWAP=y |
| 61 | CONFIG_SYSVIPC=y | 59 | CONFIG_SYSVIPC=y |
| 62 | # CONFIG_IPC_NS is not set | ||
| 63 | CONFIG_SYSVIPC_SYSCTL=y | 60 | CONFIG_SYSVIPC_SYSCTL=y |
| 64 | # CONFIG_POSIX_MQUEUE is not set | 61 | # CONFIG_POSIX_MQUEUE is not set |
| 65 | # CONFIG_BSD_PROCESS_ACCT is not set | 62 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 66 | # CONFIG_TASKSTATS is not set | 63 | # CONFIG_TASKSTATS is not set |
| 67 | # CONFIG_UTS_NS is not set | 64 | # CONFIG_USER_NS is not set |
| 68 | # CONFIG_AUDIT is not set | 65 | # CONFIG_AUDIT is not set |
| 69 | # CONFIG_IKCONFIG is not set | 66 | # CONFIG_IKCONFIG is not set |
| 70 | CONFIG_LOG_BUF_SHIFT=17 | 67 | CONFIG_LOG_BUF_SHIFT=17 |
| @@ -99,10 +96,6 @@ CONFIG_SLAB=y | |||
| 99 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
| 100 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
| 101 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
| 102 | |||
| 103 | # | ||
| 104 | # Loadable module support | ||
| 105 | # | ||
| 106 | CONFIG_MODULES=y | 99 | CONFIG_MODULES=y |
| 107 | CONFIG_MODULE_UNLOAD=y | 100 | CONFIG_MODULE_UNLOAD=y |
| 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 101 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -110,12 +103,9 @@ CONFIG_MODULE_UNLOAD=y | |||
| 110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 103 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 111 | # CONFIG_KMOD is not set | 104 | # CONFIG_KMOD is not set |
| 112 | CONFIG_STOP_MACHINE=y | 105 | CONFIG_STOP_MACHINE=y |
| 113 | |||
| 114 | # | ||
| 115 | # Block layer | ||
| 116 | # | ||
| 117 | CONFIG_BLOCK=y | 106 | CONFIG_BLOCK=y |
| 118 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 108 | # CONFIG_BLK_DEV_BSG is not set | ||
| 119 | 109 | ||
| 120 | # | 110 | # |
| 121 | # IO Schedulers | 111 | # IO Schedulers |
| @@ -135,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 125 | # |
| 136 | CONFIG_PPC_MULTIPLATFORM=y | 126 | CONFIG_PPC_MULTIPLATFORM=y |
| 137 | # CONFIG_EMBEDDED6xx is not set | 127 | # CONFIG_EMBEDDED6xx is not set |
| 138 | # CONFIG_APUS is not set | 128 | # CONFIG_PPC_82xx is not set |
| 129 | # CONFIG_PPC_83xx is not set | ||
| 130 | # CONFIG_PPC_86xx is not set | ||
| 139 | # CONFIG_PPC_PSERIES is not set | 131 | # CONFIG_PPC_PSERIES is not set |
| 140 | # CONFIG_PPC_ISERIES is not set | 132 | # CONFIG_PPC_ISERIES is not set |
| 141 | # CONFIG_PPC_MPC52xx is not set | 133 | # CONFIG_PPC_MPC52xx is not set |
| @@ -149,6 +141,7 @@ CONFIG_PPC_PASEMI=y | |||
| 149 | # | 141 | # |
| 150 | CONFIG_PPC_PASEMI_IOMMU=y | 142 | CONFIG_PPC_PASEMI_IOMMU=y |
| 151 | CONFIG_PPC_PASEMI_MDIO=y | 143 | CONFIG_PPC_PASEMI_MDIO=y |
| 144 | CONFIG_ELECTRA_IDE=y | ||
| 152 | # CONFIG_PPC_CELLEB is not set | 145 | # CONFIG_PPC_CELLEB is not set |
| 153 | # CONFIG_PPC_PS3 is not set | 146 | # CONFIG_PPC_PS3 is not set |
| 154 | # CONFIG_PPC_CELL is not set | 147 | # CONFIG_PPC_CELL is not set |
| @@ -168,6 +161,7 @@ CONFIG_MPIC=y | |||
| 168 | # CONFIG_GENERIC_IOMAP is not set | 161 | # CONFIG_GENERIC_IOMAP is not set |
| 169 | # CONFIG_CPU_FREQ is not set | 162 | # CONFIG_CPU_FREQ is not set |
| 170 | # CONFIG_CPM2 is not set | 163 | # CONFIG_CPM2 is not set |
| 164 | # CONFIG_FSL_ULI1575 is not set | ||
| 171 | 165 | ||
| 172 | # | 166 | # |
| 173 | # Kernel options | 167 | # Kernel options |
| @@ -204,6 +198,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 204 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 198 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 205 | CONFIG_RESOURCES_64BIT=y | 199 | CONFIG_RESOURCES_64BIT=y |
| 206 | CONFIG_ZONE_DMA_FLAG=1 | 200 | CONFIG_ZONE_DMA_FLAG=1 |
| 201 | CONFIG_BOUNCE=y | ||
| 207 | # CONFIG_PPC_HAS_HASH_64K is not set | 202 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 208 | # CONFIG_PPC_64K_PAGES is not set | 203 | # CONFIG_PPC_64K_PAGES is not set |
| 209 | # CONFIG_SCHED_SMT is not set | 204 | # CONFIG_SCHED_SMT is not set |
| @@ -222,6 +217,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 222 | # CONFIG_PPC_INDIRECT_PCI is not set | 217 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 223 | CONFIG_PCI=y | 218 | CONFIG_PCI=y |
| 224 | CONFIG_PCI_DOMAINS=y | 219 | CONFIG_PCI_DOMAINS=y |
| 220 | CONFIG_PCI_SYSCALL=y | ||
| 225 | # CONFIG_PCIEPORTBUS is not set | 221 | # CONFIG_PCIEPORTBUS is not set |
| 226 | CONFIG_ARCH_SUPPORTS_MSI=y | 222 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 227 | # CONFIG_PCI_MSI is not set | 223 | # CONFIG_PCI_MSI is not set |
| @@ -332,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 332 | # CONFIG_MAC80211 is not set | 328 | # CONFIG_MAC80211 is not set |
| 333 | # CONFIG_IEEE80211 is not set | 329 | # CONFIG_IEEE80211 is not set |
| 334 | # CONFIG_RFKILL is not set | 330 | # CONFIG_RFKILL is not set |
| 331 | # CONFIG_NET_9P is not set | ||
| 335 | 332 | ||
| 336 | # | 333 | # |
| 337 | # Device Drivers | 334 | # Device Drivers |
| @@ -346,10 +343,6 @@ CONFIG_FW_LOADER=y | |||
| 346 | # CONFIG_DEBUG_DRIVER is not set | 343 | # CONFIG_DEBUG_DRIVER is not set |
| 347 | # CONFIG_DEBUG_DEVRES is not set | 344 | # CONFIG_DEBUG_DEVRES is not set |
| 348 | # CONFIG_SYS_HYPERVISOR is not set | 345 | # CONFIG_SYS_HYPERVISOR is not set |
| 349 | |||
| 350 | # | ||
| 351 | # Connector - unified userspace <-> kernelspace linker | ||
| 352 | # | ||
| 353 | # CONFIG_CONNECTOR is not set | 346 | # CONFIG_CONNECTOR is not set |
| 354 | CONFIG_MTD=y | 347 | CONFIG_MTD=y |
| 355 | # CONFIG_MTD_DEBUG is not set | 348 | # CONFIG_MTD_DEBUG is not set |
| @@ -415,22 +408,10 @@ CONFIG_MTD_PHRAM=y | |||
| 415 | # UBI - Unsorted block images | 408 | # UBI - Unsorted block images |
| 416 | # | 409 | # |
| 417 | # CONFIG_MTD_UBI is not set | 410 | # CONFIG_MTD_UBI is not set |
| 418 | 411 | CONFIG_OF_DEVICE=y | |
| 419 | # | ||
| 420 | # Parallel port support | ||
| 421 | # | ||
| 422 | # CONFIG_PARPORT is not set | 412 | # CONFIG_PARPORT is not set |
| 423 | 413 | CONFIG_BLK_DEV=y | |
| 424 | # | ||
| 425 | # Plug and Play support | ||
| 426 | # | ||
| 427 | # CONFIG_PNPACPI is not set | ||
| 428 | |||
| 429 | # | ||
| 430 | # Block devices | ||
| 431 | # | ||
| 432 | # CONFIG_BLK_DEV_FD is not set | 414 | # CONFIG_BLK_DEV_FD is not set |
| 433 | # CONFIG_BLK_CPQ_DA is not set | ||
| 434 | # CONFIG_BLK_CPQ_CISS_DA is not set | 415 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 435 | # CONFIG_BLK_DEV_DAC960 is not set | 416 | # CONFIG_BLK_DEV_DAC960 is not set |
| 436 | # CONFIG_BLK_DEV_UMEM is not set | 417 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -446,14 +427,11 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
| 446 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 427 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 447 | # CONFIG_CDROM_PKTCDVD is not set | 428 | # CONFIG_CDROM_PKTCDVD is not set |
| 448 | # CONFIG_ATA_OVER_ETH is not set | 429 | # CONFIG_ATA_OVER_ETH is not set |
| 449 | 430 | CONFIG_MISC_DEVICES=y | |
| 450 | # | ||
| 451 | # Misc devices | ||
| 452 | # | ||
| 453 | # CONFIG_PHANTOM is not set | 431 | # CONFIG_PHANTOM is not set |
| 432 | # CONFIG_EEPROM_93CX6 is not set | ||
| 454 | # CONFIG_SGI_IOC4 is not set | 433 | # CONFIG_SGI_IOC4 is not set |
| 455 | # CONFIG_TIFM_CORE is not set | 434 | # CONFIG_TIFM_CORE is not set |
| 456 | # CONFIG_BLINK is not set | ||
| 457 | CONFIG_IDE=y | 435 | CONFIG_IDE=y |
| 458 | CONFIG_BLK_DEV_IDE=y | 436 | CONFIG_BLK_DEV_IDE=y |
| 459 | 437 | ||
| @@ -487,6 +465,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 487 | # | 465 | # |
| 488 | # CONFIG_RAID_ATTRS is not set | 466 | # CONFIG_RAID_ATTRS is not set |
| 489 | CONFIG_SCSI=y | 467 | CONFIG_SCSI=y |
| 468 | CONFIG_SCSI_DMA=y | ||
| 490 | # CONFIG_SCSI_TGT is not set | 469 | # CONFIG_SCSI_TGT is not set |
| 491 | # CONFIG_SCSI_NETLINK is not set | 470 | # CONFIG_SCSI_NETLINK is not set |
| 492 | CONFIG_SCSI_PROC_FS=y | 471 | CONFIG_SCSI_PROC_FS=y |
| @@ -517,12 +496,8 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 517 | # CONFIG_SCSI_SPI_ATTRS is not set | 496 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 518 | # CONFIG_SCSI_FC_ATTRS is not set | 497 | # CONFIG_SCSI_FC_ATTRS is not set |
| 519 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 498 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 520 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 521 | # CONFIG_SCSI_SAS_LIBSAS is not set | 499 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 522 | 500 | CONFIG_SCSI_LOWLEVEL=y | |
| 523 | # | ||
| 524 | # SCSI low-level drivers | ||
| 525 | # | ||
| 526 | # CONFIG_ISCSI_TCP is not set | 501 | # CONFIG_ISCSI_TCP is not set |
| 527 | CONFIG_BLK_DEV_3W_XXXX_RAID=y | 502 | CONFIG_BLK_DEV_3W_XXXX_RAID=y |
| 528 | CONFIG_SCSI_3W_9XXX=y | 503 | CONFIG_SCSI_3W_9XXX=y |
| @@ -537,7 +512,6 @@ CONFIG_SCSI_3W_9XXX=y | |||
| 537 | # CONFIG_MEGARAID_LEGACY is not set | 512 | # CONFIG_MEGARAID_LEGACY is not set |
| 538 | # CONFIG_MEGARAID_SAS is not set | 513 | # CONFIG_MEGARAID_SAS is not set |
| 539 | # CONFIG_SCSI_HPTIOP is not set | 514 | # CONFIG_SCSI_HPTIOP is not set |
| 540 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 541 | # CONFIG_SCSI_DMX3191D is not set | 515 | # CONFIG_SCSI_DMX3191D is not set |
| 542 | # CONFIG_SCSI_EATA is not set | 516 | # CONFIG_SCSI_EATA is not set |
| 543 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 517 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -556,13 +530,7 @@ CONFIG_SCSI_3W_9XXX=y | |||
| 556 | # CONFIG_SCSI_DC390T is not set | 530 | # CONFIG_SCSI_DC390T is not set |
| 557 | # CONFIG_SCSI_DEBUG is not set | 531 | # CONFIG_SCSI_DEBUG is not set |
| 558 | # CONFIG_SCSI_SRP is not set | 532 | # CONFIG_SCSI_SRP is not set |
| 559 | 533 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | |
| 560 | # | ||
| 561 | # PCMCIA SCSI adapter support | ||
| 562 | # | ||
| 563 | # CONFIG_PCMCIA_FDOMAIN is not set | ||
| 564 | # CONFIG_PCMCIA_QLOGIC is not set | ||
| 565 | # CONFIG_PCMCIA_SYM53C500 is not set | ||
| 566 | CONFIG_ATA=y | 534 | CONFIG_ATA=y |
| 567 | # CONFIG_ATA_NONSTANDARD is not set | 535 | # CONFIG_ATA_NONSTANDARD is not set |
| 568 | # CONFIG_SATA_AHCI is not set | 536 | # CONFIG_SATA_AHCI is not set |
| @@ -618,10 +586,7 @@ CONFIG_ATA_GENERIC=y | |||
| 618 | # CONFIG_PATA_SIS is not set | 586 | # CONFIG_PATA_SIS is not set |
| 619 | # CONFIG_PATA_VIA is not set | 587 | # CONFIG_PATA_VIA is not set |
| 620 | # CONFIG_PATA_WINBOND is not set | 588 | # CONFIG_PATA_WINBOND is not set |
| 621 | 589 | CONFIG_PATA_PLATFORM=y | |
| 622 | # | ||
| 623 | # Multi-device support (RAID and LVM) | ||
| 624 | # | ||
| 625 | # CONFIG_MD is not set | 590 | # CONFIG_MD is not set |
| 626 | 591 | ||
| 627 | # | 592 | # |
| @@ -658,19 +623,13 @@ CONFIG_IEEE1394_SBP2=y | |||
| 658 | # CONFIG_IEEE1394_ETH1394 is not set | 623 | # CONFIG_IEEE1394_ETH1394 is not set |
| 659 | # CONFIG_IEEE1394_DV1394 is not set | 624 | # CONFIG_IEEE1394_DV1394 is not set |
| 660 | CONFIG_IEEE1394_RAWIO=y | 625 | CONFIG_IEEE1394_RAWIO=y |
| 661 | |||
| 662 | # | ||
| 663 | # I2O device support | ||
| 664 | # | ||
| 665 | # CONFIG_I2O is not set | 626 | # CONFIG_I2O is not set |
| 666 | # CONFIG_MACINTOSH_DRIVERS is not set | 627 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 667 | |||
| 668 | # | ||
| 669 | # Network device support | ||
| 670 | # | ||
| 671 | CONFIG_NETDEVICES=y | 628 | CONFIG_NETDEVICES=y |
| 629 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 672 | CONFIG_DUMMY=y | 630 | CONFIG_DUMMY=y |
| 673 | # CONFIG_BONDING is not set | 631 | # CONFIG_BONDING is not set |
| 632 | # CONFIG_MACVLAN is not set | ||
| 674 | # CONFIG_EQUALIZER is not set | 633 | # CONFIG_EQUALIZER is not set |
| 675 | # CONFIG_TUN is not set | 634 | # CONFIG_TUN is not set |
| 676 | # CONFIG_ARCNET is not set | 635 | # CONFIG_ARCNET is not set |
| @@ -687,21 +646,14 @@ CONFIG_MARVELL_PHY=y | |||
| 687 | # CONFIG_VITESSE_PHY is not set | 646 | # CONFIG_VITESSE_PHY is not set |
| 688 | # CONFIG_SMSC_PHY is not set | 647 | # CONFIG_SMSC_PHY is not set |
| 689 | # CONFIG_BROADCOM_PHY is not set | 648 | # CONFIG_BROADCOM_PHY is not set |
| 649 | # CONFIG_ICPLUS_PHY is not set | ||
| 690 | # CONFIG_FIXED_PHY is not set | 650 | # CONFIG_FIXED_PHY is not set |
| 691 | |||
| 692 | # | ||
| 693 | # Ethernet (10 or 100Mbit) | ||
| 694 | # | ||
| 695 | CONFIG_NET_ETHERNET=y | 651 | CONFIG_NET_ETHERNET=y |
| 696 | CONFIG_MII=y | 652 | CONFIG_MII=y |
| 697 | # CONFIG_HAPPYMEAL is not set | 653 | # CONFIG_HAPPYMEAL is not set |
| 698 | # CONFIG_SUNGEM is not set | 654 | # CONFIG_SUNGEM is not set |
| 699 | # CONFIG_CASSINI is not set | 655 | # CONFIG_CASSINI is not set |
| 700 | # CONFIG_NET_VENDOR_3COM is not set | 656 | # CONFIG_NET_VENDOR_3COM is not set |
| 701 | |||
| 702 | # | ||
| 703 | # Tulip family network device support | ||
| 704 | # | ||
| 705 | # CONFIG_NET_TULIP is not set | 657 | # CONFIG_NET_TULIP is not set |
| 706 | # CONFIG_HP100 is not set | 658 | # CONFIG_HP100 is not set |
| 707 | CONFIG_NET_PCI=y | 659 | CONFIG_NET_PCI=y |
| @@ -736,7 +688,6 @@ CONFIG_E1000_NAPI=y | |||
| 736 | # CONFIG_SIS190 is not set | 688 | # CONFIG_SIS190 is not set |
| 737 | # CONFIG_SKGE is not set | 689 | # CONFIG_SKGE is not set |
| 738 | # CONFIG_SKY2 is not set | 690 | # CONFIG_SKY2 is not set |
| 739 | # CONFIG_SK98LIN is not set | ||
| 740 | # CONFIG_VIA_VELOCITY is not set | 691 | # CONFIG_VIA_VELOCITY is not set |
| 741 | CONFIG_TIGON3=y | 692 | CONFIG_TIGON3=y |
| 742 | # CONFIG_BNX2 is not set | 693 | # CONFIG_BNX2 is not set |
| @@ -779,15 +730,7 @@ CONFIG_PASEMI_MAC=y | |||
| 779 | # CONFIG_NETCONSOLE is not set | 730 | # CONFIG_NETCONSOLE is not set |
| 780 | # CONFIG_NETPOLL is not set | 731 | # CONFIG_NETPOLL is not set |
| 781 | # CONFIG_NET_POLL_CONTROLLER is not set | 732 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 782 | |||
| 783 | # | ||
| 784 | # ISDN subsystem | ||
| 785 | # | ||
| 786 | # CONFIG_ISDN is not set | 733 | # CONFIG_ISDN is not set |
| 787 | |||
| 788 | # | ||
| 789 | # Telephony Support | ||
| 790 | # | ||
| 791 | # CONFIG_PHONE is not set | 734 | # CONFIG_PHONE is not set |
| 792 | 735 | ||
| 793 | # | 736 | # |
| @@ -865,10 +808,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 865 | CONFIG_UNIX98_PTYS=y | 808 | CONFIG_UNIX98_PTYS=y |
| 866 | CONFIG_LEGACY_PTYS=y | 809 | CONFIG_LEGACY_PTYS=y |
| 867 | CONFIG_LEGACY_PTY_COUNT=4 | 810 | CONFIG_LEGACY_PTY_COUNT=4 |
| 868 | |||
| 869 | # | ||
| 870 | # IPMI | ||
| 871 | # | ||
| 872 | # CONFIG_IPMI_HANDLER is not set | 811 | # CONFIG_IPMI_HANDLER is not set |
| 873 | # CONFIG_WATCHDOG is not set | 812 | # CONFIG_WATCHDOG is not set |
| 874 | CONFIG_HW_RANDOM=y | 813 | CONFIG_HW_RANDOM=y |
| @@ -889,10 +828,6 @@ CONFIG_GEN_RTC_X=y | |||
| 889 | CONFIG_RAW_DRIVER=y | 828 | CONFIG_RAW_DRIVER=y |
| 890 | CONFIG_MAX_RAW_DEVS=256 | 829 | CONFIG_MAX_RAW_DEVS=256 |
| 891 | # CONFIG_HANGCHECK_TIMER is not set | 830 | # CONFIG_HANGCHECK_TIMER is not set |
| 892 | |||
| 893 | # | ||
| 894 | # TPM devices | ||
| 895 | # | ||
| 896 | # CONFIG_TCG_TPM is not set | 831 | # CONFIG_TCG_TPM is not set |
| 897 | CONFIG_DEVPORT=y | 832 | CONFIG_DEVPORT=y |
| 898 | CONFIG_I2C=y | 833 | CONFIG_I2C=y |
| @@ -927,6 +862,7 @@ CONFIG_I2C_PASEMI=y | |||
| 927 | # CONFIG_I2C_SIS5595 is not set | 862 | # CONFIG_I2C_SIS5595 is not set |
| 928 | # CONFIG_I2C_SIS630 is not set | 863 | # CONFIG_I2C_SIS630 is not set |
| 929 | # CONFIG_I2C_SIS96X is not set | 864 | # CONFIG_I2C_SIS96X is not set |
| 865 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 930 | # CONFIG_I2C_STUB is not set | 866 | # CONFIG_I2C_STUB is not set |
| 931 | # CONFIG_I2C_TINY_USB is not set | 867 | # CONFIG_I2C_TINY_USB is not set |
| 932 | # CONFIG_I2C_VIA is not set | 868 | # CONFIG_I2C_VIA is not set |
| @@ -938,11 +874,13 @@ CONFIG_I2C_PASEMI=y | |||
| 938 | # | 874 | # |
| 939 | # CONFIG_SENSORS_DS1337 is not set | 875 | # CONFIG_SENSORS_DS1337 is not set |
| 940 | # CONFIG_SENSORS_DS1374 is not set | 876 | # CONFIG_SENSORS_DS1374 is not set |
| 877 | # CONFIG_DS1682 is not set | ||
| 941 | CONFIG_SENSORS_EEPROM=y | 878 | CONFIG_SENSORS_EEPROM=y |
| 942 | # CONFIG_SENSORS_PCF8574 is not set | 879 | # CONFIG_SENSORS_PCF8574 is not set |
| 943 | # CONFIG_SENSORS_PCA9539 is not set | 880 | # CONFIG_SENSORS_PCA9539 is not set |
| 944 | # CONFIG_SENSORS_PCF8591 is not set | 881 | # CONFIG_SENSORS_PCF8591 is not set |
| 945 | # CONFIG_SENSORS_MAX6875 is not set | 882 | # CONFIG_SENSORS_MAX6875 is not set |
| 883 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 946 | # CONFIG_I2C_DEBUG_CORE is not set | 884 | # CONFIG_I2C_DEBUG_CORE is not set |
| 947 | # CONFIG_I2C_DEBUG_ALGO is not set | 885 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 948 | # CONFIG_I2C_DEBUG_BUS is not set | 886 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -953,14 +891,12 @@ CONFIG_SENSORS_EEPROM=y | |||
| 953 | # | 891 | # |
| 954 | # CONFIG_SPI is not set | 892 | # CONFIG_SPI is not set |
| 955 | # CONFIG_SPI_MASTER is not set | 893 | # CONFIG_SPI_MASTER is not set |
| 956 | |||
| 957 | # | ||
| 958 | # Dallas's 1-wire bus | ||
| 959 | # | ||
| 960 | # CONFIG_W1 is not set | 894 | # CONFIG_W1 is not set |
| 895 | # CONFIG_POWER_SUPPLY is not set | ||
| 961 | CONFIG_HWMON=y | 896 | CONFIG_HWMON=y |
| 962 | CONFIG_HWMON_VID=y | 897 | CONFIG_HWMON_VID=y |
| 963 | # CONFIG_SENSORS_ABITUGURU is not set | 898 | # CONFIG_SENSORS_ABITUGURU is not set |
| 899 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 964 | # CONFIG_SENSORS_AD7418 is not set | 900 | # CONFIG_SENSORS_AD7418 is not set |
| 965 | # CONFIG_SENSORS_ADM1021 is not set | 901 | # CONFIG_SENSORS_ADM1021 is not set |
| 966 | # CONFIG_SENSORS_ADM1025 is not set | 902 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -987,14 +923,17 @@ CONFIG_SENSORS_LM85=y | |||
| 987 | # CONFIG_SENSORS_LM87 is not set | 923 | # CONFIG_SENSORS_LM87 is not set |
| 988 | CONFIG_SENSORS_LM90=y | 924 | CONFIG_SENSORS_LM90=y |
| 989 | # CONFIG_SENSORS_LM92 is not set | 925 | # CONFIG_SENSORS_LM92 is not set |
| 926 | # CONFIG_SENSORS_LM93 is not set | ||
| 990 | # CONFIG_SENSORS_MAX1619 is not set | 927 | # CONFIG_SENSORS_MAX1619 is not set |
| 991 | # CONFIG_SENSORS_MAX6650 is not set | 928 | # CONFIG_SENSORS_MAX6650 is not set |
| 992 | # CONFIG_SENSORS_PC87360 is not set | 929 | # CONFIG_SENSORS_PC87360 is not set |
| 993 | # CONFIG_SENSORS_PC87427 is not set | 930 | # CONFIG_SENSORS_PC87427 is not set |
| 994 | # CONFIG_SENSORS_SIS5595 is not set | 931 | # CONFIG_SENSORS_SIS5595 is not set |
| 932 | # CONFIG_SENSORS_DME1737 is not set | ||
| 995 | # CONFIG_SENSORS_SMSC47M1 is not set | 933 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 996 | # CONFIG_SENSORS_SMSC47M192 is not set | 934 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 997 | # CONFIG_SENSORS_SMSC47B397 is not set | 935 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 936 | # CONFIG_SENSORS_THMC50 is not set | ||
| 998 | # CONFIG_SENSORS_VIA686A is not set | 937 | # CONFIG_SENSORS_VIA686A is not set |
| 999 | # CONFIG_SENSORS_VT1211 is not set | 938 | # CONFIG_SENSORS_VT1211 is not set |
| 1000 | # CONFIG_SENSORS_VT8231 is not set | 939 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -1024,14 +963,15 @@ CONFIG_DAB=y | |||
| 1024 | # Graphics support | 963 | # Graphics support |
| 1025 | # | 964 | # |
| 1026 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 965 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1027 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1028 | CONFIG_LCD_CLASS_DEVICE=m | 966 | CONFIG_LCD_CLASS_DEVICE=m |
| 967 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1029 | 968 | ||
| 1030 | # | 969 | # |
| 1031 | # Display device support | 970 | # Display device support |
| 1032 | # | 971 | # |
| 1033 | # CONFIG_DISPLAY_SUPPORT is not set | 972 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1034 | CONFIG_VGASTATE=y | 973 | CONFIG_VGASTATE=y |
| 974 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1035 | CONFIG_FB=y | 975 | CONFIG_FB=y |
| 1036 | CONFIG_FIRMWARE_EDID=y | 976 | CONFIG_FIRMWARE_EDID=y |
| 1037 | CONFIG_FB_DDC=y | 977 | CONFIG_FB_DDC=y |
| @@ -1094,6 +1034,7 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y | |||
| 1094 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | 1034 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
| 1095 | CONFIG_DUMMY_CONSOLE=y | 1035 | CONFIG_DUMMY_CONSOLE=y |
| 1096 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1036 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1037 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1097 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1038 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1098 | # CONFIG_FONTS is not set | 1039 | # CONFIG_FONTS is not set |
| 1099 | CONFIG_FONT_8x8=y | 1040 | CONFIG_FONT_8x8=y |
| @@ -1156,6 +1097,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1156 | # CONFIG_SND_CMIPCI is not set | 1097 | # CONFIG_SND_CMIPCI is not set |
| 1157 | # CONFIG_SND_CS4281 is not set | 1098 | # CONFIG_SND_CS4281 is not set |
| 1158 | # CONFIG_SND_CS46XX is not set | 1099 | # CONFIG_SND_CS46XX is not set |
| 1100 | # CONFIG_SND_CS5530 is not set | ||
| 1159 | # CONFIG_SND_DARLA20 is not set | 1101 | # CONFIG_SND_DARLA20 is not set |
| 1160 | # CONFIG_SND_GINA20 is not set | 1102 | # CONFIG_SND_GINA20 is not set |
| 1161 | # CONFIG_SND_LAYLA20 is not set | 1103 | # CONFIG_SND_LAYLA20 is not set |
| @@ -1203,6 +1145,10 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1203 | # | 1145 | # |
| 1204 | 1146 | ||
| 1205 | # | 1147 | # |
| 1148 | # ALSA PowerPC devices | ||
| 1149 | # | ||
| 1150 | |||
| 1151 | # | ||
| 1206 | # USB devices | 1152 | # USB devices |
| 1207 | # | 1153 | # |
| 1208 | CONFIG_SND_USB_AUDIO=y | 1154 | CONFIG_SND_USB_AUDIO=y |
| @@ -1221,13 +1167,14 @@ CONFIG_SND_USB_USX2Y=y | |||
| 1221 | # CONFIG_SND_SOC is not set | 1167 | # CONFIG_SND_SOC is not set |
| 1222 | 1168 | ||
| 1223 | # | 1169 | # |
| 1224 | # Open Sound System | 1170 | # SoC Audio support for SuperH |
| 1225 | # | 1171 | # |
| 1226 | # CONFIG_SOUND_PRIME is not set | ||
| 1227 | 1172 | ||
| 1228 | # | 1173 | # |
| 1229 | # HID Devices | 1174 | # Open Sound System |
| 1230 | # | 1175 | # |
| 1176 | # CONFIG_SOUND_PRIME is not set | ||
| 1177 | CONFIG_HID_SUPPORT=y | ||
| 1231 | CONFIG_HID=y | 1178 | CONFIG_HID=y |
| 1232 | # CONFIG_HID_DEBUG is not set | 1179 | # CONFIG_HID_DEBUG is not set |
| 1233 | 1180 | ||
| @@ -1238,10 +1185,7 @@ CONFIG_USB_HID=y | |||
| 1238 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1185 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1239 | # CONFIG_HID_FF is not set | 1186 | # CONFIG_HID_FF is not set |
| 1240 | # CONFIG_USB_HIDDEV is not set | 1187 | # CONFIG_USB_HIDDEV is not set |
| 1241 | 1188 | CONFIG_USB_SUPPORT=y | |
| 1242 | # | ||
| 1243 | # USB support | ||
| 1244 | # | ||
| 1245 | CONFIG_USB_ARCH_HAS_HCD=y | 1189 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1246 | CONFIG_USB_ARCH_HAS_OHCI=y | 1190 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1247 | CONFIG_USB_ARCH_HAS_EHCI=y | 1191 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1263,7 +1207,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 1263 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 1207 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 1264 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1208 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1265 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1209 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1266 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1267 | # CONFIG_USB_ISP116X_HCD is not set | 1210 | # CONFIG_USB_ISP116X_HCD is not set |
| 1268 | CONFIG_USB_OHCI_HCD=y | 1211 | CONFIG_USB_OHCI_HCD=y |
| 1269 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1212 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -1276,6 +1219,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1276 | CONFIG_USB_UHCI_HCD=y | 1219 | CONFIG_USB_UHCI_HCD=y |
| 1277 | CONFIG_USB_SL811_HCD=y | 1220 | CONFIG_USB_SL811_HCD=y |
| 1278 | # CONFIG_USB_SL811_CS is not set | 1221 | # CONFIG_USB_SL811_CS is not set |
| 1222 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1279 | 1223 | ||
| 1280 | # | 1224 | # |
| 1281 | # USB Device Class drivers | 1225 | # USB Device Class drivers |
| @@ -1354,32 +1298,16 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1354 | # | 1298 | # |
| 1355 | # CONFIG_USB_GADGET is not set | 1299 | # CONFIG_USB_GADGET is not set |
| 1356 | # CONFIG_MMC is not set | 1300 | # CONFIG_MMC is not set |
| 1357 | |||
| 1358 | # | ||
| 1359 | # LED devices | ||
| 1360 | # | ||
| 1361 | # CONFIG_NEW_LEDS is not set | 1301 | # CONFIG_NEW_LEDS is not set |
| 1362 | |||
| 1363 | # | ||
| 1364 | # LED drivers | ||
| 1365 | # | ||
| 1366 | |||
| 1367 | # | ||
| 1368 | # LED Triggers | ||
| 1369 | # | ||
| 1370 | |||
| 1371 | # | ||
| 1372 | # InfiniBand support | ||
| 1373 | # | ||
| 1374 | # CONFIG_INFINIBAND is not set | 1302 | # CONFIG_INFINIBAND is not set |
| 1303 | CONFIG_EDAC=y | ||
| 1375 | 1304 | ||
| 1376 | # | 1305 | # |
| 1377 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1306 | # Reporting subsystems |
| 1378 | # | ||
| 1379 | |||
| 1380 | # | ||
| 1381 | # Real Time Clock | ||
| 1382 | # | 1307 | # |
| 1308 | # CONFIG_EDAC_DEBUG is not set | ||
| 1309 | CONFIG_EDAC_MM_EDAC=y | ||
| 1310 | CONFIG_EDAC_PASEMI=y | ||
| 1383 | CONFIG_RTC_LIB=y | 1311 | CONFIG_RTC_LIB=y |
| 1384 | CONFIG_RTC_CLASS=y | 1312 | CONFIG_RTC_CLASS=y |
| 1385 | CONFIG_RTC_HCTOSYS=y | 1313 | CONFIG_RTC_HCTOSYS=y |
| @@ -1406,6 +1334,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1406 | # CONFIG_RTC_DRV_X1205 is not set | 1334 | # CONFIG_RTC_DRV_X1205 is not set |
| 1407 | # CONFIG_RTC_DRV_PCF8563 is not set | 1335 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1408 | # CONFIG_RTC_DRV_PCF8583 is not set | 1336 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1337 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1409 | 1338 | ||
| 1410 | # | 1339 | # |
| 1411 | # SPI RTC drivers | 1340 | # SPI RTC drivers |
| @@ -1414,9 +1343,12 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1414 | # | 1343 | # |
| 1415 | # Platform RTC drivers | 1344 | # Platform RTC drivers |
| 1416 | # | 1345 | # |
| 1346 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1417 | # CONFIG_RTC_DRV_DS1553 is not set | 1347 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1348 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1418 | # CONFIG_RTC_DRV_DS1742 is not set | 1349 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1419 | # CONFIG_RTC_DRV_M48T86 is not set | 1350 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1351 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1420 | # CONFIG_RTC_DRV_V3020 is not set | 1352 | # CONFIG_RTC_DRV_V3020 is not set |
| 1421 | 1353 | ||
| 1422 | # | 1354 | # |
| @@ -1437,6 +1369,11 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1437 | # | 1369 | # |
| 1438 | 1370 | ||
| 1439 | # | 1371 | # |
| 1372 | # Userspace I/O | ||
| 1373 | # | ||
| 1374 | # CONFIG_UIO is not set | ||
| 1375 | |||
| 1376 | # | ||
| 1440 | # File systems | 1377 | # File systems |
| 1441 | # | 1378 | # |
| 1442 | CONFIG_EXT2_FS=y | 1379 | CONFIG_EXT2_FS=y |
| @@ -1541,7 +1478,6 @@ CONFIG_SUNRPC=y | |||
| 1541 | # CONFIG_NCP_FS is not set | 1478 | # CONFIG_NCP_FS is not set |
| 1542 | # CONFIG_CODA_FS is not set | 1479 | # CONFIG_CODA_FS is not set |
| 1543 | # CONFIG_AFS_FS is not set | 1480 | # CONFIG_AFS_FS is not set |
| 1544 | # CONFIG_9P_FS is not set | ||
| 1545 | 1481 | ||
| 1546 | # | 1482 | # |
| 1547 | # Partition Types | 1483 | # Partition Types |
| @@ -1623,6 +1559,7 @@ CONFIG_CRC_CCITT=y | |||
| 1623 | # CONFIG_CRC16 is not set | 1559 | # CONFIG_CRC16 is not set |
| 1624 | # CONFIG_CRC_ITU_T is not set | 1560 | # CONFIG_CRC_ITU_T is not set |
| 1625 | CONFIG_CRC32=y | 1561 | CONFIG_CRC32=y |
| 1562 | # CONFIG_CRC7 is not set | ||
| 1626 | # CONFIG_LIBCRC32C is not set | 1563 | # CONFIG_LIBCRC32C is not set |
| 1627 | CONFIG_PLIST=y | 1564 | CONFIG_PLIST=y |
| 1628 | CONFIG_HAS_IOMEM=y | 1565 | CONFIG_HAS_IOMEM=y |
| @@ -1648,6 +1585,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1648 | CONFIG_DEBUG_KERNEL=y | 1585 | CONFIG_DEBUG_KERNEL=y |
| 1649 | # CONFIG_DEBUG_SHIRQ is not set | 1586 | # CONFIG_DEBUG_SHIRQ is not set |
| 1650 | CONFIG_DETECT_SOFTLOCKUP=y | 1587 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1588 | CONFIG_SCHED_DEBUG=y | ||
| 1651 | # CONFIG_SCHEDSTATS is not set | 1589 | # CONFIG_SCHEDSTATS is not set |
| 1652 | # CONFIG_TIMER_STATS is not set | 1590 | # CONFIG_TIMER_STATS is not set |
| 1653 | # CONFIG_DEBUG_SLAB is not set | 1591 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1681,10 +1619,6 @@ CONFIG_XMON_DISASSEMBLY=y | |||
| 1681 | # | 1619 | # |
| 1682 | # CONFIG_KEYS is not set | 1620 | # CONFIG_KEYS is not set |
| 1683 | # CONFIG_SECURITY is not set | 1621 | # CONFIG_SECURITY is not set |
| 1684 | |||
| 1685 | # | ||
| 1686 | # Cryptographic options | ||
| 1687 | # | ||
| 1688 | CONFIG_CRYPTO=y | 1622 | CONFIG_CRYPTO=y |
| 1689 | CONFIG_CRYPTO_ALGAPI=y | 1623 | CONFIG_CRYPTO_ALGAPI=y |
| 1690 | CONFIG_CRYPTO_BLKCIPHER=y | 1624 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1723,7 +1657,4 @@ CONFIG_CRYPTO_DES=y | |||
| 1723 | # CONFIG_CRYPTO_CRC32C is not set | 1657 | # CONFIG_CRYPTO_CRC32C is not set |
| 1724 | # CONFIG_CRYPTO_CAMELLIA is not set | 1658 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1725 | # CONFIG_CRYPTO_TEST is not set | 1659 | # CONFIG_CRYPTO_TEST is not set |
| 1726 | 1660 | # CONFIG_CRYPTO_HW is not set | |
| 1727 | # | ||
| 1728 | # Hardware crypto devices | ||
| 1729 | # | ||
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 08525d6fb1f1..cfc9c6573a3c 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
| @@ -1,10 +1,25 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 14:11:36 2007 | 4 | # Thu Aug 30 16:44:46 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC_PM_NEEDS_RTC_LIB=y | 7 | |
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_ALTIVEC=y | ||
| 19 | CONFIG_PPC_STD_MMU=y | ||
| 20 | CONFIG_PPC_STD_MMU_32=y | ||
| 21 | # CONFIG_PPC_MM_SLICES is not set | ||
| 22 | # CONFIG_SMP is not set | ||
| 8 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 9 | CONFIG_PPC_MERGE=y | 24 | CONFIG_PPC_MERGE=y |
| 10 | CONFIG_MMU=y | 25 | CONFIG_MMU=y |
| @@ -15,62 +30,39 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 30 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 32 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 33 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 18 | CONFIG_PPC=y | 34 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 35 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_GENERIC_NVRAM=y | 36 | CONFIG_GENERIC_NVRAM=y |
| 21 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 22 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 23 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 24 | # CONFIG_PPC_UDBG_16550 is not set | 41 | # CONFIG_PPC_UDBG_16550 is not set |
| 25 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 26 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 27 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 28 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 45 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 46 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | |||
| 31 | # | ||
| 32 | # Processor support | ||
| 33 | # | ||
| 34 | CONFIG_CLASSIC32=y | ||
| 35 | # CONFIG_PPC_82xx is not set | ||
| 36 | # CONFIG_PPC_83xx is not set | ||
| 37 | # CONFIG_PPC_85xx is not set | ||
| 38 | # CONFIG_PPC_86xx is not set | ||
| 39 | # CONFIG_PPC_8xx is not set | ||
| 40 | # CONFIG_40x is not set | ||
| 41 | # CONFIG_44x is not set | ||
| 42 | # CONFIG_E200 is not set | ||
| 43 | CONFIG_6xx=y | ||
| 44 | CONFIG_PPC_FPU=y | ||
| 45 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 46 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 47 | CONFIG_ALTIVEC=y | ||
| 48 | CONFIG_PPC_STD_MMU=y | ||
| 49 | CONFIG_PPC_STD_MMU_32=y | ||
| 50 | # CONFIG_PPC_MM_SLICES is not set | ||
| 51 | # CONFIG_SMP is not set | ||
| 52 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 53 | 50 | ||
| 54 | # | 51 | # |
| 55 | # Code maturity level options | 52 | # General setup |
| 56 | # | 53 | # |
| 57 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 58 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 59 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 60 | |||
| 61 | # | ||
| 62 | # General setup | ||
| 63 | # | ||
| 64 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 65 | # CONFIG_LOCALVERSION_AUTO is not set | 58 | # CONFIG_LOCALVERSION_AUTO is not set |
| 66 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 67 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 68 | # CONFIG_IPC_NS is not set | ||
| 69 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 70 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 71 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 72 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 73 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 74 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 75 | CONFIG_IKCONFIG=y | 67 | CONFIG_IKCONFIG=y |
| 76 | CONFIG_IKCONFIG_PROC=y | 68 | CONFIG_IKCONFIG_PROC=y |
| @@ -105,24 +97,17 @@ CONFIG_SLAB=y | |||
| 105 | CONFIG_RT_MUTEXES=y | 97 | CONFIG_RT_MUTEXES=y |
| 106 | # CONFIG_TINY_SHMEM is not set | 98 | # CONFIG_TINY_SHMEM is not set |
| 107 | CONFIG_BASE_SMALL=0 | 99 | CONFIG_BASE_SMALL=0 |
| 108 | |||
| 109 | # | ||
| 110 | # Loadable module support | ||
| 111 | # | ||
| 112 | CONFIG_MODULES=y | 100 | CONFIG_MODULES=y |
| 113 | CONFIG_MODULE_UNLOAD=y | 101 | CONFIG_MODULE_UNLOAD=y |
| 114 | CONFIG_MODULE_FORCE_UNLOAD=y | 102 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 115 | # CONFIG_MODVERSIONS is not set | 103 | # CONFIG_MODVERSIONS is not set |
| 116 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 104 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 117 | CONFIG_KMOD=y | 105 | CONFIG_KMOD=y |
| 118 | |||
| 119 | # | ||
| 120 | # Block layer | ||
| 121 | # | ||
| 122 | CONFIG_BLOCK=y | 106 | CONFIG_BLOCK=y |
| 123 | CONFIG_LBD=y | 107 | CONFIG_LBD=y |
| 124 | # CONFIG_BLK_DEV_IO_TRACE is not set | 108 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 125 | CONFIG_LSF=y | 109 | CONFIG_LSF=y |
| 110 | CONFIG_BLK_DEV_BSG=y | ||
| 126 | 111 | ||
| 127 | # | 112 | # |
| 128 | # IO Schedulers | 113 | # IO Schedulers |
| @@ -142,7 +127,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 142 | # | 127 | # |
| 143 | CONFIG_PPC_MULTIPLATFORM=y | 128 | CONFIG_PPC_MULTIPLATFORM=y |
| 144 | # CONFIG_EMBEDDED6xx is not set | 129 | # CONFIG_EMBEDDED6xx is not set |
| 145 | # CONFIG_APUS is not set | 130 | # CONFIG_PPC_82xx is not set |
| 131 | # CONFIG_PPC_83xx is not set | ||
| 132 | # CONFIG_PPC_86xx is not set | ||
| 133 | CONFIG_CLASSIC32=y | ||
| 146 | # CONFIG_PPC_CHRP is not set | 134 | # CONFIG_PPC_CHRP is not set |
| 147 | # CONFIG_PPC_MPC52xx is not set | 135 | # CONFIG_PPC_MPC52xx is not set |
| 148 | # CONFIG_PPC_MPC5200 is not set | 136 | # CONFIG_PPC_MPC5200 is not set |
| @@ -182,6 +170,7 @@ CONFIG_CPU_FREQ_PMAC=y | |||
| 182 | CONFIG_PPC601_SYNC_FIX=y | 170 | CONFIG_PPC601_SYNC_FIX=y |
| 183 | # CONFIG_TAU is not set | 171 | # CONFIG_TAU is not set |
| 184 | # CONFIG_CPM2 is not set | 172 | # CONFIG_CPM2 is not set |
| 173 | # CONFIG_FSL_ULI1575 is not set | ||
| 185 | 174 | ||
| 186 | # | 175 | # |
| 187 | # Kernel options | 176 | # Kernel options |
| @@ -211,13 +200,17 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 200 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 201 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 202 | CONFIG_ZONE_DMA_FLAG=1 |
| 203 | CONFIG_BOUNCE=y | ||
| 204 | CONFIG_VIRT_TO_BUS=y | ||
| 214 | CONFIG_PROC_DEVICETREE=y | 205 | CONFIG_PROC_DEVICETREE=y |
| 215 | # CONFIG_CMDLINE_BOOL is not set | 206 | # CONFIG_CMDLINE_BOOL is not set |
| 216 | CONFIG_PM=y | 207 | CONFIG_PM=y |
| 217 | # CONFIG_PM_LEGACY is not set | 208 | # CONFIG_PM_LEGACY is not set |
| 218 | CONFIG_PM_DEBUG=y | 209 | CONFIG_PM_DEBUG=y |
| 210 | # CONFIG_PM_VERBOSE is not set | ||
| 219 | # CONFIG_DISABLE_CONSOLE_SUSPEND is not set | 211 | # CONFIG_DISABLE_CONSOLE_SUSPEND is not set |
| 220 | CONFIG_PM_SYSFS_DEPRECATED=y | 212 | CONFIG_PM_SLEEP=y |
| 213 | CONFIG_SUSPEND=y | ||
| 221 | CONFIG_HIBERNATION=y | 214 | CONFIG_HIBERNATION=y |
| 222 | CONFIG_PM_STD_PARTITION="" | 215 | CONFIG_PM_STD_PARTITION="" |
| 223 | CONFIG_APM_EMULATION=y | 216 | CONFIG_APM_EMULATION=y |
| @@ -231,9 +224,9 @@ CONFIG_ISA_DMA_API=y | |||
| 231 | CONFIG_ZONE_DMA=y | 224 | CONFIG_ZONE_DMA=y |
| 232 | CONFIG_GENERIC_ISA_DMA=y | 225 | CONFIG_GENERIC_ISA_DMA=y |
| 233 | CONFIG_PPC_INDIRECT_PCI=y | 226 | CONFIG_PPC_INDIRECT_PCI=y |
| 234 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 235 | CONFIG_PCI=y | 227 | CONFIG_PCI=y |
| 236 | CONFIG_PCI_DOMAINS=y | 228 | CONFIG_PCI_DOMAINS=y |
| 229 | CONFIG_PCI_SYSCALL=y | ||
| 237 | # CONFIG_PCIEPORTBUS is not set | 230 | # CONFIG_PCIEPORTBUS is not set |
| 238 | CONFIG_ARCH_SUPPORTS_MSI=y | 231 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 239 | # CONFIG_PCI_MSI is not set | 232 | # CONFIG_PCI_MSI is not set |
| @@ -336,6 +329,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 336 | # CONFIG_NF_CONNTRACK_MARK is not set | 329 | # CONFIG_NF_CONNTRACK_MARK is not set |
| 337 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 330 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 338 | # CONFIG_NF_CT_PROTO_SCTP is not set | 331 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 332 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 339 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 333 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| 340 | CONFIG_NF_CONNTRACK_FTP=m | 334 | CONFIG_NF_CONNTRACK_FTP=m |
| 341 | # CONFIG_NF_CONNTRACK_H323 is not set | 335 | # CONFIG_NF_CONNTRACK_H323 is not set |
| @@ -353,9 +347,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 353 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 347 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 354 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 348 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 355 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 349 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 350 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
| 356 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 351 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 357 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 352 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 358 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set | 353 | # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set |
| 354 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
| 359 | # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set | 355 | # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set |
| 360 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 356 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 361 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 357 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| @@ -376,6 +372,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m | |||
| 376 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 372 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 377 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 373 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 378 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 374 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 375 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
| 379 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 376 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set |
| 380 | 377 | ||
| 381 | # | 378 | # |
| @@ -559,6 +556,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m | |||
| 559 | CONFIG_IEEE80211_CRYPT_TKIP=m | 556 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 560 | # CONFIG_IEEE80211_SOFTMAC is not set | 557 | # CONFIG_IEEE80211_SOFTMAC is not set |
| 561 | # CONFIG_RFKILL is not set | 558 | # CONFIG_RFKILL is not set |
| 559 | # CONFIG_NET_9P is not set | ||
| 562 | 560 | ||
| 563 | # | 561 | # |
| 564 | # Device Drivers | 562 | # Device Drivers |
| @@ -573,27 +571,12 @@ CONFIG_FW_LOADER=y | |||
| 573 | # CONFIG_DEBUG_DRIVER is not set | 571 | # CONFIG_DEBUG_DRIVER is not set |
| 574 | # CONFIG_DEBUG_DEVRES is not set | 572 | # CONFIG_DEBUG_DEVRES is not set |
| 575 | # CONFIG_SYS_HYPERVISOR is not set | 573 | # CONFIG_SYS_HYPERVISOR is not set |
| 576 | |||
| 577 | # | ||
| 578 | # Connector - unified userspace <-> kernelspace linker | ||
| 579 | # | ||
| 580 | CONFIG_CONNECTOR=y | 574 | CONFIG_CONNECTOR=y |
| 581 | CONFIG_PROC_EVENTS=y | 575 | CONFIG_PROC_EVENTS=y |
| 582 | # CONFIG_MTD is not set | 576 | # CONFIG_MTD is not set |
| 583 | 577 | CONFIG_OF_DEVICE=y | |
| 584 | # | ||
| 585 | # Parallel port support | ||
| 586 | # | ||
| 587 | # CONFIG_PARPORT is not set | 578 | # CONFIG_PARPORT is not set |
| 588 | 579 | CONFIG_BLK_DEV=y | |
| 589 | # | ||
| 590 | # Plug and Play support | ||
| 591 | # | ||
| 592 | # CONFIG_PNPACPI is not set | ||
| 593 | |||
| 594 | # | ||
| 595 | # Block devices | ||
| 596 | # | ||
| 597 | # CONFIG_BLK_DEV_FD is not set | 580 | # CONFIG_BLK_DEV_FD is not set |
| 598 | CONFIG_MAC_FLOPPY=m | 581 | CONFIG_MAC_FLOPPY=m |
| 599 | # CONFIG_BLK_CPQ_DA is not set | 582 | # CONFIG_BLK_CPQ_DA is not set |
| @@ -612,14 +595,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 612 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 595 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 613 | # CONFIG_CDROM_PKTCDVD is not set | 596 | # CONFIG_CDROM_PKTCDVD is not set |
| 614 | # CONFIG_ATA_OVER_ETH is not set | 597 | # CONFIG_ATA_OVER_ETH is not set |
| 615 | 598 | CONFIG_MISC_DEVICES=y | |
| 616 | # | ||
| 617 | # Misc devices | ||
| 618 | # | ||
| 619 | # CONFIG_PHANTOM is not set | 599 | # CONFIG_PHANTOM is not set |
| 600 | # CONFIG_EEPROM_93CX6 is not set | ||
| 620 | # CONFIG_SGI_IOC4 is not set | 601 | # CONFIG_SGI_IOC4 is not set |
| 621 | # CONFIG_TIFM_CORE is not set | 602 | # CONFIG_TIFM_CORE is not set |
| 622 | # CONFIG_BLINK is not set | ||
| 623 | CONFIG_IDE=y | 603 | CONFIG_IDE=y |
| 624 | CONFIG_BLK_DEV_IDE=y | 604 | CONFIG_BLK_DEV_IDE=y |
| 625 | 605 | ||
| @@ -689,6 +669,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 689 | # | 669 | # |
| 690 | # CONFIG_RAID_ATTRS is not set | 670 | # CONFIG_RAID_ATTRS is not set |
| 691 | CONFIG_SCSI=y | 671 | CONFIG_SCSI=y |
| 672 | CONFIG_SCSI_DMA=y | ||
| 692 | # CONFIG_SCSI_TGT is not set | 673 | # CONFIG_SCSI_TGT is not set |
| 693 | CONFIG_SCSI_NETLINK=y | 674 | CONFIG_SCSI_NETLINK=y |
| 694 | CONFIG_SCSI_PROC_FS=y | 675 | CONFIG_SCSI_PROC_FS=y |
| @@ -721,10 +702,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 721 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 702 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 722 | # CONFIG_SCSI_SAS_ATTRS is not set | 703 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 723 | # CONFIG_SCSI_SAS_LIBSAS is not set | 704 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 724 | 705 | CONFIG_SCSI_LOWLEVEL=y | |
| 725 | # | ||
| 726 | # SCSI low-level drivers | ||
| 727 | # | ||
| 728 | # CONFIG_ISCSI_TCP is not set | 706 | # CONFIG_ISCSI_TCP is not set |
| 729 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 707 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 730 | # CONFIG_SCSI_3W_9XXX is not set | 708 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -772,20 +750,8 @@ CONFIG_SCSI_MESH_SYNC_RATE=5 | |||
| 772 | CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 | 750 | CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 |
| 773 | CONFIG_SCSI_MAC53C94=y | 751 | CONFIG_SCSI_MAC53C94=y |
| 774 | # CONFIG_SCSI_SRP is not set | 752 | # CONFIG_SCSI_SRP is not set |
| 775 | 753 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | |
| 776 | # | ||
| 777 | # PCMCIA SCSI adapter support | ||
| 778 | # | ||
| 779 | # CONFIG_PCMCIA_AHA152X is not set | ||
| 780 | # CONFIG_PCMCIA_FDOMAIN is not set | ||
| 781 | # CONFIG_PCMCIA_NINJA_SCSI is not set | ||
| 782 | # CONFIG_PCMCIA_QLOGIC is not set | ||
| 783 | # CONFIG_PCMCIA_SYM53C500 is not set | ||
| 784 | # CONFIG_ATA is not set | 754 | # CONFIG_ATA is not set |
| 785 | |||
| 786 | # | ||
| 787 | # Multi-device support (RAID and LVM) | ||
| 788 | # | ||
| 789 | CONFIG_MD=y | 755 | CONFIG_MD=y |
| 790 | CONFIG_BLK_DEV_MD=m | 756 | CONFIG_BLK_DEV_MD=m |
| 791 | CONFIG_MD_LINEAR=m | 757 | CONFIG_MD_LINEAR=m |
| @@ -834,14 +800,11 @@ CONFIG_IEEE1394_OHCI1394=m | |||
| 834 | # | 800 | # |
| 835 | CONFIG_IEEE1394_VIDEO1394=m | 801 | CONFIG_IEEE1394_VIDEO1394=m |
| 836 | CONFIG_IEEE1394_SBP2=m | 802 | CONFIG_IEEE1394_SBP2=m |
| 803 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set | ||
| 837 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | 804 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set |
| 838 | # CONFIG_IEEE1394_ETH1394 is not set | 805 | # CONFIG_IEEE1394_ETH1394 is not set |
| 839 | CONFIG_IEEE1394_DV1394=m | 806 | CONFIG_IEEE1394_DV1394=m |
| 840 | CONFIG_IEEE1394_RAWIO=m | 807 | CONFIG_IEEE1394_RAWIO=m |
| 841 | |||
| 842 | # | ||
| 843 | # I2O device support | ||
| 844 | # | ||
| 845 | # CONFIG_I2O is not set | 808 | # CONFIG_I2O is not set |
| 846 | CONFIG_MACINTOSH_DRIVERS=y | 809 | CONFIG_MACINTOSH_DRIVERS=y |
| 847 | CONFIG_ADB=y | 810 | CONFIG_ADB=y |
| @@ -860,21 +823,15 @@ CONFIG_THERM_ADT746X=m | |||
| 860 | # CONFIG_WINDFARM is not set | 823 | # CONFIG_WINDFARM is not set |
| 861 | # CONFIG_ANSLCD is not set | 824 | # CONFIG_ANSLCD is not set |
| 862 | CONFIG_PMAC_RACKMETER=m | 825 | CONFIG_PMAC_RACKMETER=m |
| 863 | |||
| 864 | # | ||
| 865 | # Network device support | ||
| 866 | # | ||
| 867 | CONFIG_NETDEVICES=y | 826 | CONFIG_NETDEVICES=y |
| 827 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 868 | CONFIG_DUMMY=m | 828 | CONFIG_DUMMY=m |
| 869 | # CONFIG_BONDING is not set | 829 | # CONFIG_BONDING is not set |
| 830 | # CONFIG_MACVLAN is not set | ||
| 870 | # CONFIG_EQUALIZER is not set | 831 | # CONFIG_EQUALIZER is not set |
| 871 | CONFIG_TUN=m | 832 | CONFIG_TUN=m |
| 872 | # CONFIG_ARCNET is not set | 833 | # CONFIG_ARCNET is not set |
| 873 | # CONFIG_PHYLIB is not set | 834 | # CONFIG_PHYLIB is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Ethernet (10 or 100Mbit) | ||
| 877 | # | ||
| 878 | CONFIG_NET_ETHERNET=y | 835 | CONFIG_NET_ETHERNET=y |
| 879 | CONFIG_MII=y | 836 | CONFIG_MII=y |
| 880 | CONFIG_MACE=y | 837 | CONFIG_MACE=y |
| @@ -884,10 +841,6 @@ CONFIG_BMAC=y | |||
| 884 | CONFIG_SUNGEM=y | 841 | CONFIG_SUNGEM=y |
| 885 | # CONFIG_CASSINI is not set | 842 | # CONFIG_CASSINI is not set |
| 886 | # CONFIG_NET_VENDOR_3COM is not set | 843 | # CONFIG_NET_VENDOR_3COM is not set |
| 887 | |||
| 888 | # | ||
| 889 | # Tulip family network device support | ||
| 890 | # | ||
| 891 | # CONFIG_NET_TULIP is not set | 844 | # CONFIG_NET_TULIP is not set |
| 892 | # CONFIG_HP100 is not set | 845 | # CONFIG_HP100 is not set |
| 893 | CONFIG_NET_PCI=y | 846 | CONFIG_NET_PCI=y |
| @@ -922,7 +875,6 @@ CONFIG_NETDEV_1000=y | |||
| 922 | # CONFIG_SIS190 is not set | 875 | # CONFIG_SIS190 is not set |
| 923 | # CONFIG_SKGE is not set | 876 | # CONFIG_SKGE is not set |
| 924 | # CONFIG_SKY2 is not set | 877 | # CONFIG_SKY2 is not set |
| 925 | # CONFIG_SK98LIN is not set | ||
| 926 | # CONFIG_VIA_VELOCITY is not set | 878 | # CONFIG_VIA_VELOCITY is not set |
| 927 | # CONFIG_TIGON3 is not set | 879 | # CONFIG_TIGON3 is not set |
| 928 | # CONFIG_BNX2 is not set | 880 | # CONFIG_BNX2 is not set |
| @@ -962,6 +914,7 @@ CONFIG_PCMCIA_HERMES=m | |||
| 962 | # CONFIG_PCMCIA_WL3501 is not set | 914 | # CONFIG_PCMCIA_WL3501 is not set |
| 963 | CONFIG_PRISM54=m | 915 | CONFIG_PRISM54=m |
| 964 | # CONFIG_USB_ZD1201 is not set | 916 | # CONFIG_USB_ZD1201 is not set |
| 917 | # CONFIG_RTL8187 is not set | ||
| 965 | # CONFIG_HOSTAP is not set | 918 | # CONFIG_HOSTAP is not set |
| 966 | 919 | ||
| 967 | # | 920 | # |
| @@ -996,6 +949,7 @@ CONFIG_PPP_DEFLATE=y | |||
| 996 | CONFIG_PPP_BSDCOMP=m | 949 | CONFIG_PPP_BSDCOMP=m |
| 997 | # CONFIG_PPP_MPPE is not set | 950 | # CONFIG_PPP_MPPE is not set |
| 998 | # CONFIG_PPPOE is not set | 951 | # CONFIG_PPPOE is not set |
| 952 | # CONFIG_PPPOL2TP is not set | ||
| 999 | # CONFIG_SLIP is not set | 953 | # CONFIG_SLIP is not set |
| 1000 | CONFIG_SLHC=y | 954 | CONFIG_SLHC=y |
| 1001 | # CONFIG_NET_FC is not set | 955 | # CONFIG_NET_FC is not set |
| @@ -1003,15 +957,7 @@ CONFIG_SLHC=y | |||
| 1003 | # CONFIG_NETCONSOLE is not set | 957 | # CONFIG_NETCONSOLE is not set |
| 1004 | # CONFIG_NETPOLL is not set | 958 | # CONFIG_NETPOLL is not set |
| 1005 | # CONFIG_NET_POLL_CONTROLLER is not set | 959 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 1006 | |||
| 1007 | # | ||
| 1008 | # ISDN subsystem | ||
| 1009 | # | ||
| 1010 | # CONFIG_ISDN is not set | 960 | # CONFIG_ISDN is not set |
| 1011 | |||
| 1012 | # | ||
| 1013 | # Telephony Support | ||
| 1014 | # | ||
| 1015 | # CONFIG_PHONE is not set | 961 | # CONFIG_PHONE is not set |
| 1016 | 962 | ||
| 1017 | # | 963 | # |
| @@ -1093,10 +1039,6 @@ CONFIG_SERIAL_PMACZILOG=m | |||
| 1093 | CONFIG_UNIX98_PTYS=y | 1039 | CONFIG_UNIX98_PTYS=y |
| 1094 | CONFIG_LEGACY_PTYS=y | 1040 | CONFIG_LEGACY_PTYS=y |
| 1095 | CONFIG_LEGACY_PTY_COUNT=256 | 1041 | CONFIG_LEGACY_PTY_COUNT=256 |
| 1096 | |||
| 1097 | # | ||
| 1098 | # IPMI | ||
| 1099 | # | ||
| 1100 | # CONFIG_IPMI_HANDLER is not set | 1042 | # CONFIG_IPMI_HANDLER is not set |
| 1101 | # CONFIG_WATCHDOG is not set | 1043 | # CONFIG_WATCHDOG is not set |
| 1102 | # CONFIG_HW_RANDOM is not set | 1044 | # CONFIG_HW_RANDOM is not set |
| @@ -1123,10 +1065,6 @@ CONFIG_DRM_RADEON=m | |||
| 1123 | # CONFIG_CARDMAN_4000 is not set | 1065 | # CONFIG_CARDMAN_4000 is not set |
| 1124 | # CONFIG_CARDMAN_4040 is not set | 1066 | # CONFIG_CARDMAN_4040 is not set |
| 1125 | # CONFIG_RAW_DRIVER is not set | 1067 | # CONFIG_RAW_DRIVER is not set |
| 1126 | |||
| 1127 | # | ||
| 1128 | # TPM devices | ||
| 1129 | # | ||
| 1130 | # CONFIG_TCG_TPM is not set | 1068 | # CONFIG_TCG_TPM is not set |
| 1131 | CONFIG_DEVPORT=y | 1069 | CONFIG_DEVPORT=y |
| 1132 | CONFIG_I2C=y | 1070 | CONFIG_I2C=y |
| @@ -1162,6 +1100,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 1162 | # CONFIG_I2C_SIS5595 is not set | 1100 | # CONFIG_I2C_SIS5595 is not set |
| 1163 | # CONFIG_I2C_SIS630 is not set | 1101 | # CONFIG_I2C_SIS630 is not set |
| 1164 | # CONFIG_I2C_SIS96X is not set | 1102 | # CONFIG_I2C_SIS96X is not set |
| 1103 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1165 | # CONFIG_I2C_STUB is not set | 1104 | # CONFIG_I2C_STUB is not set |
| 1166 | # CONFIG_I2C_TINY_USB is not set | 1105 | # CONFIG_I2C_TINY_USB is not set |
| 1167 | # CONFIG_I2C_VIA is not set | 1106 | # CONFIG_I2C_VIA is not set |
| @@ -1173,12 +1112,14 @@ CONFIG_I2C_POWERMAC=y | |||
| 1173 | # | 1112 | # |
| 1174 | # CONFIG_SENSORS_DS1337 is not set | 1113 | # CONFIG_SENSORS_DS1337 is not set |
| 1175 | # CONFIG_SENSORS_DS1374 is not set | 1114 | # CONFIG_SENSORS_DS1374 is not set |
| 1115 | # CONFIG_DS1682 is not set | ||
| 1176 | # CONFIG_SENSORS_EEPROM is not set | 1116 | # CONFIG_SENSORS_EEPROM is not set |
| 1177 | # CONFIG_SENSORS_PCF8574 is not set | 1117 | # CONFIG_SENSORS_PCF8574 is not set |
| 1178 | # CONFIG_SENSORS_PCA9539 is not set | 1118 | # CONFIG_SENSORS_PCA9539 is not set |
| 1179 | # CONFIG_SENSORS_PCF8591 is not set | 1119 | # CONFIG_SENSORS_PCF8591 is not set |
| 1180 | # CONFIG_SENSORS_M41T00 is not set | 1120 | # CONFIG_SENSORS_M41T00 is not set |
| 1181 | # CONFIG_SENSORS_MAX6875 is not set | 1121 | # CONFIG_SENSORS_MAX6875 is not set |
| 1122 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1182 | # CONFIG_I2C_DEBUG_CORE is not set | 1123 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1183 | # CONFIG_I2C_DEBUG_ALGO is not set | 1124 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1184 | # CONFIG_I2C_DEBUG_BUS is not set | 1125 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -1189,11 +1130,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 1189 | # | 1130 | # |
| 1190 | # CONFIG_SPI is not set | 1131 | # CONFIG_SPI is not set |
| 1191 | # CONFIG_SPI_MASTER is not set | 1132 | # CONFIG_SPI_MASTER is not set |
| 1192 | |||
| 1193 | # | ||
| 1194 | # Dallas's 1-wire bus | ||
| 1195 | # | ||
| 1196 | # CONFIG_W1 is not set | 1133 | # CONFIG_W1 is not set |
| 1134 | CONFIG_POWER_SUPPLY=y | ||
| 1135 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
| 1136 | # CONFIG_PDA_POWER is not set | ||
| 1137 | CONFIG_APM_POWER=y | ||
| 1138 | # CONFIG_BATTERY_DS2760 is not set | ||
| 1139 | CONFIG_BATTERY_PMU=y | ||
| 1197 | # CONFIG_HWMON is not set | 1140 | # CONFIG_HWMON is not set |
| 1198 | 1141 | ||
| 1199 | # | 1142 | # |
| @@ -1212,8 +1155,8 @@ CONFIG_I2C_POWERMAC=y | |||
| 1212 | # Graphics support | 1155 | # Graphics support |
| 1213 | # | 1156 | # |
| 1214 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1157 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1215 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1216 | CONFIG_LCD_CLASS_DEVICE=m | 1158 | CONFIG_LCD_CLASS_DEVICE=m |
| 1159 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1217 | 1160 | ||
| 1218 | # | 1161 | # |
| 1219 | # Display device support | 1162 | # Display device support |
| @@ -1224,6 +1167,7 @@ CONFIG_DISPLAY_SUPPORT=y | |||
| 1224 | # Display hardware drivers | 1167 | # Display hardware drivers |
| 1225 | # | 1168 | # |
| 1226 | CONFIG_VGASTATE=y | 1169 | CONFIG_VGASTATE=y |
| 1170 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1227 | CONFIG_FB=y | 1171 | CONFIG_FB=y |
| 1228 | # CONFIG_FIRMWARE_EDID is not set | 1172 | # CONFIG_FIRMWARE_EDID is not set |
| 1229 | CONFIG_FB_DDC=y | 1173 | CONFIG_FB_DDC=y |
| @@ -1299,6 +1243,7 @@ CONFIG_FB_3DFX=y | |||
| 1299 | # CONFIG_VGA_CONSOLE is not set | 1243 | # CONFIG_VGA_CONSOLE is not set |
| 1300 | CONFIG_DUMMY_CONSOLE=y | 1244 | CONFIG_DUMMY_CONSOLE=y |
| 1301 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1245 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1246 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1302 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1247 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1303 | # CONFIG_FONTS is not set | 1248 | # CONFIG_FONTS is not set |
| 1304 | CONFIG_FONT_8x8=y | 1249 | CONFIG_FONT_8x8=y |
| @@ -1361,6 +1306,7 @@ CONFIG_SND_DUMMY=m | |||
| 1361 | # CONFIG_SND_CMIPCI is not set | 1306 | # CONFIG_SND_CMIPCI is not set |
| 1362 | # CONFIG_SND_CS4281 is not set | 1307 | # CONFIG_SND_CS4281 is not set |
| 1363 | # CONFIG_SND_CS46XX is not set | 1308 | # CONFIG_SND_CS46XX is not set |
| 1309 | # CONFIG_SND_CS5530 is not set | ||
| 1364 | # CONFIG_SND_DARLA20 is not set | 1310 | # CONFIG_SND_DARLA20 is not set |
| 1365 | # CONFIG_SND_GINA20 is not set | 1311 | # CONFIG_SND_GINA20 is not set |
| 1366 | # CONFIG_SND_LAYLA20 is not set | 1312 | # CONFIG_SND_LAYLA20 is not set |
| @@ -1410,6 +1356,10 @@ CONFIG_SND_POWERMAC=m | |||
| 1410 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1356 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
| 1411 | 1357 | ||
| 1412 | # | 1358 | # |
| 1359 | # ALSA PowerPC devices | ||
| 1360 | # | ||
| 1361 | |||
| 1362 | # | ||
| 1413 | # Apple Onboard Audio driver | 1363 | # Apple Onboard Audio driver |
| 1414 | # | 1364 | # |
| 1415 | CONFIG_SND_AOA=m | 1365 | CONFIG_SND_AOA=m |
| @@ -1439,13 +1389,14 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1439 | # CONFIG_SND_SOC is not set | 1389 | # CONFIG_SND_SOC is not set |
| 1440 | 1390 | ||
| 1441 | # | 1391 | # |
| 1442 | # Open Sound System | 1392 | # SoC Audio support for SuperH |
| 1443 | # | 1393 | # |
| 1444 | # CONFIG_SOUND_PRIME is not set | ||
| 1445 | 1394 | ||
| 1446 | # | 1395 | # |
| 1447 | # HID Devices | 1396 | # Open Sound System |
| 1448 | # | 1397 | # |
| 1398 | # CONFIG_SOUND_PRIME is not set | ||
| 1399 | CONFIG_HID_SUPPORT=y | ||
| 1449 | CONFIG_HID=y | 1400 | CONFIG_HID=y |
| 1450 | # CONFIG_HID_DEBUG is not set | 1401 | # CONFIG_HID_DEBUG is not set |
| 1451 | 1402 | ||
| @@ -1456,10 +1407,7 @@ CONFIG_USB_HID=y | |||
| 1456 | CONFIG_USB_HIDINPUT_POWERBOOK=y | 1407 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
| 1457 | # CONFIG_HID_FF is not set | 1408 | # CONFIG_HID_FF is not set |
| 1458 | # CONFIG_USB_HIDDEV is not set | 1409 | # CONFIG_USB_HIDDEV is not set |
| 1459 | 1410 | CONFIG_USB_SUPPORT=y | |
| 1460 | # | ||
| 1461 | # USB support | ||
| 1462 | # | ||
| 1463 | CONFIG_USB_ARCH_HAS_HCD=y | 1411 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1464 | CONFIG_USB_ARCH_HAS_OHCI=y | 1412 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1465 | CONFIG_USB_ARCH_HAS_EHCI=y | 1413 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1473,6 +1421,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1473 | CONFIG_USB_DEVICE_CLASS=y | 1421 | CONFIG_USB_DEVICE_CLASS=y |
| 1474 | CONFIG_USB_DYNAMIC_MINORS=y | 1422 | CONFIG_USB_DYNAMIC_MINORS=y |
| 1475 | # CONFIG_USB_SUSPEND is not set | 1423 | # CONFIG_USB_SUSPEND is not set |
| 1424 | # CONFIG_USB_PERSIST is not set | ||
| 1476 | # CONFIG_USB_OTG is not set | 1425 | # CONFIG_USB_OTG is not set |
| 1477 | 1426 | ||
| 1478 | # | 1427 | # |
| @@ -1482,7 +1431,6 @@ CONFIG_USB_EHCI_HCD=m | |||
| 1482 | CONFIG_USB_EHCI_SPLIT_ISO=y | 1431 | CONFIG_USB_EHCI_SPLIT_ISO=y |
| 1483 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1432 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1484 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1433 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1485 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1486 | # CONFIG_USB_ISP116X_HCD is not set | 1434 | # CONFIG_USB_ISP116X_HCD is not set |
| 1487 | CONFIG_USB_OHCI_HCD=y | 1435 | CONFIG_USB_OHCI_HCD=y |
| 1488 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1436 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| @@ -1491,6 +1439,7 @@ CONFIG_USB_OHCI_HCD=y | |||
| 1491 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1439 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1492 | # CONFIG_USB_UHCI_HCD is not set | 1440 | # CONFIG_USB_UHCI_HCD is not set |
| 1493 | # CONFIG_USB_SL811_HCD is not set | 1441 | # CONFIG_USB_SL811_HCD is not set |
| 1442 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1494 | 1443 | ||
| 1495 | # | 1444 | # |
| 1496 | # USB Device Class drivers | 1445 | # USB Device Class drivers |
| @@ -1574,6 +1523,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1574 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1523 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1575 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1524 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1576 | # CONFIG_USB_SERIAL_PL2303 is not set | 1525 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1526 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
| 1577 | # CONFIG_USB_SERIAL_HP4X is not set | 1527 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1578 | # CONFIG_USB_SERIAL_SAFE is not set | 1528 | # CONFIG_USB_SERIAL_SAFE is not set |
| 1579 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1529 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -1618,10 +1568,6 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1618 | # | 1568 | # |
| 1619 | # CONFIG_USB_GADGET is not set | 1569 | # CONFIG_USB_GADGET is not set |
| 1620 | # CONFIG_MMC is not set | 1570 | # CONFIG_MMC is not set |
| 1621 | |||
| 1622 | # | ||
| 1623 | # LED devices | ||
| 1624 | # | ||
| 1625 | CONFIG_NEW_LEDS=y | 1571 | CONFIG_NEW_LEDS=y |
| 1626 | CONFIG_LEDS_CLASS=y | 1572 | CONFIG_LEDS_CLASS=y |
| 1627 | 1573 | ||
| @@ -1636,20 +1582,8 @@ CONFIG_LEDS_TRIGGERS=y | |||
| 1636 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1582 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
| 1637 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | 1583 | CONFIG_LEDS_TRIGGER_IDE_DISK=y |
| 1638 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 1584 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
| 1639 | |||
| 1640 | # | ||
| 1641 | # InfiniBand support | ||
| 1642 | # | ||
| 1643 | # CONFIG_INFINIBAND is not set | 1585 | # CONFIG_INFINIBAND is not set |
| 1644 | 1586 | # CONFIG_EDAC is not set | |
| 1645 | # | ||
| 1646 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1647 | # | ||
| 1648 | |||
| 1649 | # | ||
| 1650 | # Real Time Clock | ||
| 1651 | # | ||
| 1652 | CONFIG_RTC_LIB=y | ||
| 1653 | # CONFIG_RTC_CLASS is not set | 1587 | # CONFIG_RTC_CLASS is not set |
| 1654 | 1588 | ||
| 1655 | # | 1589 | # |
| @@ -1666,6 +1600,11 @@ CONFIG_RTC_LIB=y | |||
| 1666 | # | 1600 | # |
| 1667 | 1601 | ||
| 1668 | # | 1602 | # |
| 1603 | # Userspace I/O | ||
| 1604 | # | ||
| 1605 | # CONFIG_UIO is not set | ||
| 1606 | |||
| 1607 | # | ||
| 1669 | # File systems | 1608 | # File systems |
| 1670 | # | 1609 | # |
| 1671 | CONFIG_EXT2_FS=y | 1610 | CONFIG_EXT2_FS=y |
| @@ -1774,7 +1713,6 @@ CONFIG_SMB_FS=m | |||
| 1774 | # CONFIG_NCP_FS is not set | 1713 | # CONFIG_NCP_FS is not set |
| 1775 | # CONFIG_CODA_FS is not set | 1714 | # CONFIG_CODA_FS is not set |
| 1776 | # CONFIG_AFS_FS is not set | 1715 | # CONFIG_AFS_FS is not set |
| 1777 | # CONFIG_9P_FS is not set | ||
| 1778 | 1716 | ||
| 1779 | # | 1717 | # |
| 1780 | # Partition Types | 1718 | # Partition Types |
| @@ -1856,6 +1794,7 @@ CONFIG_CRC_CCITT=y | |||
| 1856 | CONFIG_CRC16=y | 1794 | CONFIG_CRC16=y |
| 1857 | # CONFIG_CRC_ITU_T is not set | 1795 | # CONFIG_CRC_ITU_T is not set |
| 1858 | CONFIG_CRC32=y | 1796 | CONFIG_CRC32=y |
| 1797 | # CONFIG_CRC7 is not set | ||
| 1859 | CONFIG_LIBCRC32C=m | 1798 | CONFIG_LIBCRC32C=m |
| 1860 | CONFIG_ZLIB_INFLATE=y | 1799 | CONFIG_ZLIB_INFLATE=y |
| 1861 | CONFIG_ZLIB_DEFLATE=y | 1800 | CONFIG_ZLIB_DEFLATE=y |
| @@ -1887,6 +1826,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1887 | CONFIG_DEBUG_KERNEL=y | 1826 | CONFIG_DEBUG_KERNEL=y |
| 1888 | # CONFIG_DEBUG_SHIRQ is not set | 1827 | # CONFIG_DEBUG_SHIRQ is not set |
| 1889 | CONFIG_DETECT_SOFTLOCKUP=y | 1828 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1829 | CONFIG_SCHED_DEBUG=y | ||
| 1890 | # CONFIG_SCHEDSTATS is not set | 1830 | # CONFIG_SCHEDSTATS is not set |
| 1891 | # CONFIG_TIMER_STATS is not set | 1831 | # CONFIG_TIMER_STATS is not set |
| 1892 | # CONFIG_DEBUG_SLAB is not set | 1832 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1919,10 +1859,6 @@ CONFIG_BOOTX_TEXT=y | |||
| 1919 | # | 1859 | # |
| 1920 | # CONFIG_KEYS is not set | 1860 | # CONFIG_KEYS is not set |
| 1921 | # CONFIG_SECURITY is not set | 1861 | # CONFIG_SECURITY is not set |
| 1922 | |||
| 1923 | # | ||
| 1924 | # Cryptographic options | ||
| 1925 | # | ||
| 1926 | CONFIG_CRYPTO=y | 1862 | CONFIG_CRYPTO=y |
| 1927 | CONFIG_CRYPTO_ALGAPI=y | 1863 | CONFIG_CRYPTO_ALGAPI=y |
| 1928 | CONFIG_CRYPTO_BLKCIPHER=y | 1864 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1962,7 +1898,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1962 | CONFIG_CRYPTO_CRC32C=m | 1898 | CONFIG_CRYPTO_CRC32C=m |
| 1963 | # CONFIG_CRYPTO_CAMELLIA is not set | 1899 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1964 | # CONFIG_CRYPTO_TEST is not set | 1900 | # CONFIG_CRYPTO_TEST is not set |
| 1965 | 1901 | CONFIG_CRYPTO_HW=y | |
| 1966 | # | ||
| 1967 | # Hardware crypto devices | ||
| 1968 | # | ||
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 6e503d98daba..5f6224a1feb8 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -1,9 +1,23 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 14:15:02 2007 | 4 | # Thu Aug 30 16:47:09 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_POWER4_ONLY is not set | ||
| 12 | CONFIG_POWER3=y | ||
| 13 | CONFIG_POWER4=y | ||
| 14 | CONFIG_PPC_FPU=y | ||
| 15 | CONFIG_ALTIVEC=y | ||
| 16 | CONFIG_PPC_STD_MMU=y | ||
| 17 | CONFIG_PPC_MM_SLICES=y | ||
| 18 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 19 | CONFIG_SMP=y | ||
| 20 | CONFIG_NR_CPUS=32 | ||
| 7 | CONFIG_64BIT=y | 21 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 22 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| @@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 35 | CONFIG_COMPAT=y |
| @@ -22,54 +37,36 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 25 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 26 | CONFIG_GENERIC_TBSYNC=y | 42 | CONFIG_GENERIC_TBSYNC=y |
| 27 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | CONFIG_PPC64_SWSUSP=y | 46 | CONFIG_PPC64_SWSUSP=y |
| 31 | |||
| 32 | # | ||
| 33 | # Processor support | ||
| 34 | # | ||
| 35 | # CONFIG_POWER4_ONLY is not set | ||
| 36 | CONFIG_POWER3=y | ||
| 37 | CONFIG_POWER4=y | ||
| 38 | CONFIG_PPC_FPU=y | ||
| 39 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 40 | CONFIG_PPC_DCR_MMIO=y | 48 | CONFIG_PPC_DCR_MMIO=y |
| 41 | CONFIG_PPC_DCR=y | 49 | CONFIG_PPC_DCR=y |
| 42 | CONFIG_PPC_OF_PLATFORM_PCI=y | 50 | CONFIG_PPC_OF_PLATFORM_PCI=y |
| 43 | CONFIG_ALTIVEC=y | ||
| 44 | CONFIG_PPC_STD_MMU=y | ||
| 45 | CONFIG_PPC_MM_SLICES=y | ||
| 46 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 47 | CONFIG_SMP=y | ||
| 48 | CONFIG_NR_CPUS=32 | ||
| 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 51 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 50 | 52 | ||
| 51 | # | 53 | # |
| 52 | # Code maturity level options | 54 | # General setup |
| 53 | # | 55 | # |
| 54 | CONFIG_EXPERIMENTAL=y | 56 | CONFIG_EXPERIMENTAL=y |
| 55 | CONFIG_LOCK_KERNEL=y | 57 | CONFIG_LOCK_KERNEL=y |
| 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 58 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 57 | |||
| 58 | # | ||
| 59 | # General setup | ||
| 60 | # | ||
| 61 | CONFIG_LOCALVERSION="" | 59 | CONFIG_LOCALVERSION="" |
| 62 | CONFIG_LOCALVERSION_AUTO=y | 60 | CONFIG_LOCALVERSION_AUTO=y |
| 63 | CONFIG_SWAP=y | 61 | CONFIG_SWAP=y |
| 64 | CONFIG_SYSVIPC=y | 62 | CONFIG_SYSVIPC=y |
| 65 | # CONFIG_IPC_NS is not set | ||
| 66 | CONFIG_SYSVIPC_SYSCTL=y | 63 | CONFIG_SYSVIPC_SYSCTL=y |
| 67 | CONFIG_POSIX_MQUEUE=y | 64 | CONFIG_POSIX_MQUEUE=y |
| 68 | # CONFIG_BSD_PROCESS_ACCT is not set | 65 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 69 | CONFIG_TASKSTATS=y | 66 | CONFIG_TASKSTATS=y |
| 70 | CONFIG_TASK_DELAY_ACCT=y | 67 | CONFIG_TASK_DELAY_ACCT=y |
| 71 | # CONFIG_TASK_XACCT is not set | 68 | # CONFIG_TASK_XACCT is not set |
| 72 | # CONFIG_UTS_NS is not set | 69 | # CONFIG_USER_NS is not set |
| 73 | # CONFIG_AUDIT is not set | 70 | # CONFIG_AUDIT is not set |
| 74 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
| 75 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| @@ -105,10 +102,6 @@ CONFIG_SLAB=y | |||
| 105 | CONFIG_RT_MUTEXES=y | 102 | CONFIG_RT_MUTEXES=y |
| 106 | # CONFIG_TINY_SHMEM is not set | 103 | # CONFIG_TINY_SHMEM is not set |
| 107 | CONFIG_BASE_SMALL=0 | 104 | CONFIG_BASE_SMALL=0 |
| 108 | |||
| 109 | # | ||
| 110 | # Loadable module support | ||
| 111 | # | ||
| 112 | CONFIG_MODULES=y | 105 | CONFIG_MODULES=y |
| 113 | CONFIG_MODULE_UNLOAD=y | 106 | CONFIG_MODULE_UNLOAD=y |
| 114 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 107 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -116,12 +109,9 @@ CONFIG_MODVERSIONS=y | |||
| 116 | CONFIG_MODULE_SRCVERSION_ALL=y | 109 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 117 | CONFIG_KMOD=y | 110 | CONFIG_KMOD=y |
| 118 | CONFIG_STOP_MACHINE=y | 111 | CONFIG_STOP_MACHINE=y |
| 119 | |||
| 120 | # | ||
| 121 | # Block layer | ||
| 122 | # | ||
| 123 | CONFIG_BLOCK=y | 112 | CONFIG_BLOCK=y |
| 124 | CONFIG_BLK_DEV_IO_TRACE=y | 113 | CONFIG_BLK_DEV_IO_TRACE=y |
| 114 | CONFIG_BLK_DEV_BSG=y | ||
| 125 | 115 | ||
| 126 | # | 116 | # |
| 127 | # IO Schedulers | 117 | # IO Schedulers |
| @@ -141,7 +131,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 141 | # | 131 | # |
| 142 | CONFIG_PPC_MULTIPLATFORM=y | 132 | CONFIG_PPC_MULTIPLATFORM=y |
| 143 | # CONFIG_EMBEDDED6xx is not set | 133 | # CONFIG_EMBEDDED6xx is not set |
| 144 | # CONFIG_APUS is not set | 134 | # CONFIG_PPC_82xx is not set |
| 135 | # CONFIG_PPC_83xx is not set | ||
| 136 | # CONFIG_PPC_86xx is not set | ||
| 145 | CONFIG_PPC_PSERIES=y | 137 | CONFIG_PPC_PSERIES=y |
| 146 | CONFIG_PPC_SPLPAR=y | 138 | CONFIG_PPC_SPLPAR=y |
| 147 | CONFIG_EEH=y | 139 | CONFIG_EEH=y |
| @@ -177,6 +169,7 @@ CONFIG_SPU_BASE=y | |||
| 177 | CONFIG_CBE_RAS=y | 169 | CONFIG_CBE_RAS=y |
| 178 | CONFIG_CBE_THERM=m | 170 | CONFIG_CBE_THERM=m |
| 179 | CONFIG_CBE_CPUFREQ=m | 171 | CONFIG_CBE_CPUFREQ=m |
| 172 | CONFIG_CBE_CPUFREQ_PMI=m | ||
| 180 | # CONFIG_PQ2ADS is not set | 173 | # CONFIG_PQ2ADS is not set |
| 181 | CONFIG_PPC_NATIVE=y | 174 | CONFIG_PPC_NATIVE=y |
| 182 | CONFIG_UDBG_RTAS_CONSOLE=y | 175 | CONFIG_UDBG_RTAS_CONSOLE=y |
| @@ -217,6 +210,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y | |||
| 217 | # | 210 | # |
| 218 | CONFIG_CPU_FREQ_PMAC64=y | 211 | CONFIG_CPU_FREQ_PMAC64=y |
| 219 | # CONFIG_CPM2 is not set | 212 | # CONFIG_CPM2 is not set |
| 213 | CONFIG_AXON_RAM=m | ||
| 214 | # CONFIG_FSL_ULI1575 is not set | ||
| 220 | 215 | ||
| 221 | # | 216 | # |
| 222 | # Kernel options | 217 | # Kernel options |
| @@ -258,6 +253,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y | |||
| 258 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 253 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 259 | CONFIG_RESOURCES_64BIT=y | 254 | CONFIG_RESOURCES_64BIT=y |
| 260 | CONFIG_ZONE_DMA_FLAG=1 | 255 | CONFIG_ZONE_DMA_FLAG=1 |
| 256 | CONFIG_BOUNCE=y | ||
| 261 | CONFIG_ARCH_MEMORY_PROBE=y | 257 | CONFIG_ARCH_MEMORY_PROBE=y |
| 262 | CONFIG_PPC_HAS_HASH_64K=y | 258 | CONFIG_PPC_HAS_HASH_64K=y |
| 263 | # CONFIG_PPC_64K_PAGES is not set | 259 | # CONFIG_PPC_64K_PAGES is not set |
| @@ -265,6 +261,7 @@ CONFIG_PPC_HAS_HASH_64K=y | |||
| 265 | CONFIG_PROC_DEVICETREE=y | 261 | CONFIG_PROC_DEVICETREE=y |
| 266 | # CONFIG_CMDLINE_BOOL is not set | 262 | # CONFIG_CMDLINE_BOOL is not set |
| 267 | # CONFIG_PM is not set | 263 | # CONFIG_PM is not set |
| 264 | CONFIG_SUSPEND_SMP_POSSIBLE=y | ||
| 268 | CONFIG_SECCOMP=y | 265 | CONFIG_SECCOMP=y |
| 269 | # CONFIG_WANT_DEVICE_TREE is not set | 266 | # CONFIG_WANT_DEVICE_TREE is not set |
| 270 | CONFIG_ISA_DMA_API=y | 267 | CONFIG_ISA_DMA_API=y |
| @@ -277,6 +274,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 277 | # CONFIG_PPC_INDIRECT_PCI is not set | 274 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 278 | CONFIG_PCI=y | 275 | CONFIG_PCI=y |
| 279 | CONFIG_PCI_DOMAINS=y | 276 | CONFIG_PCI_DOMAINS=y |
| 277 | CONFIG_PCI_SYSCALL=y | ||
| 280 | # CONFIG_PCIEPORTBUS is not set | 278 | # CONFIG_PCIEPORTBUS is not set |
| 281 | CONFIG_ARCH_SUPPORTS_MSI=y | 279 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 282 | CONFIG_PCI_MSI=y | 280 | CONFIG_PCI_MSI=y |
| @@ -356,6 +354,7 @@ CONFIG_NF_CONNTRACK_MARK=y | |||
| 356 | CONFIG_NF_CONNTRACK_EVENTS=y | 354 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 357 | CONFIG_NF_CT_PROTO_GRE=m | 355 | CONFIG_NF_CT_PROTO_GRE=m |
| 358 | CONFIG_NF_CT_PROTO_SCTP=m | 356 | CONFIG_NF_CT_PROTO_SCTP=m |
| 357 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 359 | CONFIG_NF_CONNTRACK_AMANDA=m | 358 | CONFIG_NF_CONNTRACK_AMANDA=m |
| 360 | CONFIG_NF_CONNTRACK_FTP=m | 359 | CONFIG_NF_CONNTRACK_FTP=m |
| 361 | CONFIG_NF_CONNTRACK_H323=m | 360 | CONFIG_NF_CONNTRACK_H323=m |
| @@ -374,9 +373,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
| 374 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 373 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 375 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 374 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 376 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 375 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
| 376 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
| 377 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 377 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 378 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 378 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 379 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 379 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 380 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
| 380 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 381 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 381 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 382 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 382 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 383 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| @@ -397,6 +398,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m | |||
| 397 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 398 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 398 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 399 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 399 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 400 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 401 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
| 400 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 402 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 401 | 403 | ||
| 402 | # | 404 | # |
| @@ -481,6 +483,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 481 | # CONFIG_MAC80211 is not set | 483 | # CONFIG_MAC80211 is not set |
| 482 | # CONFIG_IEEE80211 is not set | 484 | # CONFIG_IEEE80211 is not set |
| 483 | # CONFIG_RFKILL is not set | 485 | # CONFIG_RFKILL is not set |
| 486 | # CONFIG_NET_9P is not set | ||
| 484 | 487 | ||
| 485 | # | 488 | # |
| 486 | # Device Drivers | 489 | # Device Drivers |
| @@ -495,28 +498,12 @@ CONFIG_FW_LOADER=y | |||
| 495 | # CONFIG_DEBUG_DRIVER is not set | 498 | # CONFIG_DEBUG_DRIVER is not set |
| 496 | # CONFIG_DEBUG_DEVRES is not set | 499 | # CONFIG_DEBUG_DEVRES is not set |
| 497 | # CONFIG_SYS_HYPERVISOR is not set | 500 | # CONFIG_SYS_HYPERVISOR is not set |
| 498 | |||
| 499 | # | ||
| 500 | # Connector - unified userspace <-> kernelspace linker | ||
| 501 | # | ||
| 502 | # CONFIG_CONNECTOR is not set | 501 | # CONFIG_CONNECTOR is not set |
| 503 | # CONFIG_MTD is not set | 502 | # CONFIG_MTD is not set |
| 504 | 503 | CONFIG_OF_DEVICE=y | |
| 505 | # | ||
| 506 | # Parallel port support | ||
| 507 | # | ||
| 508 | # CONFIG_PARPORT is not set | 504 | # CONFIG_PARPORT is not set |
| 509 | 505 | CONFIG_BLK_DEV=y | |
| 510 | # | ||
| 511 | # Plug and Play support | ||
| 512 | # | ||
| 513 | # CONFIG_PNPACPI is not set | ||
| 514 | |||
| 515 | # | ||
| 516 | # Block devices | ||
| 517 | # | ||
| 518 | CONFIG_BLK_DEV_FD=y | 506 | CONFIG_BLK_DEV_FD=y |
| 519 | # CONFIG_BLK_CPQ_DA is not set | ||
| 520 | # CONFIG_BLK_CPQ_CISS_DA is not set | 507 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 521 | # CONFIG_BLK_DEV_DAC960 is not set | 508 | # CONFIG_BLK_DEV_DAC960 is not set |
| 522 | # CONFIG_BLK_DEV_UMEM is not set | 509 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -532,14 +519,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
| 532 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 519 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 533 | # CONFIG_CDROM_PKTCDVD is not set | 520 | # CONFIG_CDROM_PKTCDVD is not set |
| 534 | # CONFIG_ATA_OVER_ETH is not set | 521 | # CONFIG_ATA_OVER_ETH is not set |
| 535 | 522 | CONFIG_MISC_DEVICES=y | |
| 536 | # | ||
| 537 | # Misc devices | ||
| 538 | # | ||
| 539 | # CONFIG_PHANTOM is not set | 523 | # CONFIG_PHANTOM is not set |
| 524 | # CONFIG_EEPROM_93CX6 is not set | ||
| 540 | # CONFIG_SGI_IOC4 is not set | 525 | # CONFIG_SGI_IOC4 is not set |
| 541 | # CONFIG_TIFM_CORE is not set | 526 | # CONFIG_TIFM_CORE is not set |
| 542 | # CONFIG_BLINK is not set | ||
| 543 | CONFIG_IDE=y | 527 | CONFIG_IDE=y |
| 544 | CONFIG_BLK_DEV_IDE=y | 528 | CONFIG_BLK_DEV_IDE=y |
| 545 | 529 | ||
| @@ -608,6 +592,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 608 | # | 592 | # |
| 609 | # CONFIG_RAID_ATTRS is not set | 593 | # CONFIG_RAID_ATTRS is not set |
| 610 | CONFIG_SCSI=y | 594 | CONFIG_SCSI=y |
| 595 | CONFIG_SCSI_DMA=y | ||
| 611 | # CONFIG_SCSI_TGT is not set | 596 | # CONFIG_SCSI_TGT is not set |
| 612 | CONFIG_SCSI_NETLINK=y | 597 | CONFIG_SCSI_NETLINK=y |
| 613 | CONFIG_SCSI_PROC_FS=y | 598 | CONFIG_SCSI_PROC_FS=y |
| @@ -640,10 +625,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 640 | CONFIG_SCSI_ISCSI_ATTRS=m | 625 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 641 | # CONFIG_SCSI_SAS_ATTRS is not set | 626 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 642 | # CONFIG_SCSI_SAS_LIBSAS is not set | 627 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 643 | 628 | CONFIG_SCSI_LOWLEVEL=y | |
| 644 | # | ||
| 645 | # SCSI low-level drivers | ||
| 646 | # | ||
| 647 | # CONFIG_ISCSI_TCP is not set | 629 | # CONFIG_ISCSI_TCP is not set |
| 648 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 630 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 649 | # CONFIG_SCSI_3W_9XXX is not set | 631 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -658,7 +640,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m | |||
| 658 | # CONFIG_MEGARAID_LEGACY is not set | 640 | # CONFIG_MEGARAID_LEGACY is not set |
| 659 | # CONFIG_MEGARAID_SAS is not set | 641 | # CONFIG_MEGARAID_SAS is not set |
| 660 | # CONFIG_SCSI_HPTIOP is not set | 642 | # CONFIG_SCSI_HPTIOP is not set |
| 661 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 662 | # CONFIG_SCSI_DMX3191D is not set | 643 | # CONFIG_SCSI_DMX3191D is not set |
| 663 | # CONFIG_SCSI_EATA is not set | 644 | # CONFIG_SCSI_EATA is not set |
| 664 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 645 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -739,10 +720,6 @@ CONFIG_SATA_SVW=y | |||
| 739 | # CONFIG_PATA_VIA is not set | 720 | # CONFIG_PATA_VIA is not set |
| 740 | CONFIG_PATA_WINBOND=y | 721 | CONFIG_PATA_WINBOND=y |
| 741 | CONFIG_PATA_SCC=y | 722 | CONFIG_PATA_SCC=y |
| 742 | |||
| 743 | # | ||
| 744 | # Multi-device support (RAID and LVM) | ||
| 745 | # | ||
| 746 | CONFIG_MD=y | 723 | CONFIG_MD=y |
| 747 | CONFIG_BLK_DEV_MD=y | 724 | CONFIG_BLK_DEV_MD=y |
| 748 | CONFIG_MD_LINEAR=y | 725 | CONFIG_MD_LINEAR=y |
| @@ -761,6 +738,7 @@ CONFIG_DM_MIRROR=m | |||
| 761 | CONFIG_DM_ZERO=m | 738 | CONFIG_DM_ZERO=m |
| 762 | CONFIG_DM_MULTIPATH=m | 739 | CONFIG_DM_MULTIPATH=m |
| 763 | CONFIG_DM_MULTIPATH_EMC=m | 740 | CONFIG_DM_MULTIPATH_EMC=m |
| 741 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 764 | # CONFIG_DM_DELAY is not set | 742 | # CONFIG_DM_DELAY is not set |
| 765 | 743 | ||
| 766 | # | 744 | # |
| @@ -797,10 +775,6 @@ CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | |||
| 797 | CONFIG_IEEE1394_ETH1394=m | 775 | CONFIG_IEEE1394_ETH1394=m |
| 798 | CONFIG_IEEE1394_DV1394=m | 776 | CONFIG_IEEE1394_DV1394=m |
| 799 | CONFIG_IEEE1394_RAWIO=y | 777 | CONFIG_IEEE1394_RAWIO=y |
| 800 | |||
| 801 | # | ||
| 802 | # I2O device support | ||
| 803 | # | ||
| 804 | # CONFIG_I2O is not set | 778 | # CONFIG_I2O is not set |
| 805 | CONFIG_MACINTOSH_DRIVERS=y | 779 | CONFIG_MACINTOSH_DRIVERS=y |
| 806 | CONFIG_ADB_PMU=y | 780 | CONFIG_ADB_PMU=y |
| @@ -813,13 +787,11 @@ CONFIG_WINDFARM_PM81=y | |||
| 813 | CONFIG_WINDFARM_PM91=y | 787 | CONFIG_WINDFARM_PM91=y |
| 814 | CONFIG_WINDFARM_PM112=y | 788 | CONFIG_WINDFARM_PM112=y |
| 815 | # CONFIG_PMAC_RACKMETER is not set | 789 | # CONFIG_PMAC_RACKMETER is not set |
| 816 | |||
| 817 | # | ||
| 818 | # Network device support | ||
| 819 | # | ||
| 820 | CONFIG_NETDEVICES=y | 790 | CONFIG_NETDEVICES=y |
| 791 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 821 | CONFIG_DUMMY=m | 792 | CONFIG_DUMMY=m |
| 822 | CONFIG_BONDING=m | 793 | CONFIG_BONDING=m |
| 794 | # CONFIG_MACVLAN is not set | ||
| 823 | # CONFIG_EQUALIZER is not set | 795 | # CONFIG_EQUALIZER is not set |
| 824 | CONFIG_TUN=m | 796 | CONFIG_TUN=m |
| 825 | # CONFIG_ARCNET is not set | 797 | # CONFIG_ARCNET is not set |
| @@ -836,13 +808,10 @@ CONFIG_MARVELL_PHY=m | |||
| 836 | # CONFIG_VITESSE_PHY is not set | 808 | # CONFIG_VITESSE_PHY is not set |
| 837 | # CONFIG_SMSC_PHY is not set | 809 | # CONFIG_SMSC_PHY is not set |
| 838 | CONFIG_BROADCOM_PHY=m | 810 | CONFIG_BROADCOM_PHY=m |
| 811 | # CONFIG_ICPLUS_PHY is not set | ||
| 839 | CONFIG_FIXED_PHY=m | 812 | CONFIG_FIXED_PHY=m |
| 840 | CONFIG_FIXED_MII_10_FDX=y | 813 | CONFIG_FIXED_MII_10_FDX=y |
| 841 | CONFIG_FIXED_MII_100_FDX=y | 814 | CONFIG_FIXED_MII_100_FDX=y |
| 842 | |||
| 843 | # | ||
| 844 | # Ethernet (10 or 100Mbit) | ||
| 845 | # | ||
| 846 | CONFIG_NET_ETHERNET=y | 815 | CONFIG_NET_ETHERNET=y |
| 847 | CONFIG_MII=y | 816 | CONFIG_MII=y |
| 848 | # CONFIG_HAPPYMEAL is not set | 817 | # CONFIG_HAPPYMEAL is not set |
| @@ -851,10 +820,6 @@ CONFIG_SUNGEM=y | |||
| 851 | CONFIG_NET_VENDOR_3COM=y | 820 | CONFIG_NET_VENDOR_3COM=y |
| 852 | CONFIG_VORTEX=y | 821 | CONFIG_VORTEX=y |
| 853 | # CONFIG_TYPHOON is not set | 822 | # CONFIG_TYPHOON is not set |
| 854 | |||
| 855 | # | ||
| 856 | # Tulip family network device support | ||
| 857 | # | ||
| 858 | # CONFIG_NET_TULIP is not set | 823 | # CONFIG_NET_TULIP is not set |
| 859 | # CONFIG_HP100 is not set | 824 | # CONFIG_HP100 is not set |
| 860 | CONFIG_IBMVETH=m | 825 | CONFIG_IBMVETH=m |
| @@ -892,7 +857,6 @@ CONFIG_E1000=y | |||
| 892 | # CONFIG_SIS190 is not set | 857 | # CONFIG_SIS190 is not set |
| 893 | # CONFIG_SKGE is not set | 858 | # CONFIG_SKGE is not set |
| 894 | # CONFIG_SKY2 is not set | 859 | # CONFIG_SKY2 is not set |
| 895 | # CONFIG_SK98LIN is not set | ||
| 896 | # CONFIG_VIA_VELOCITY is not set | 860 | # CONFIG_VIA_VELOCITY is not set |
| 897 | CONFIG_TIGON3=y | 861 | CONFIG_TIGON3=y |
| 898 | # CONFIG_BNX2 is not set | 862 | # CONFIG_BNX2 is not set |
| @@ -942,6 +906,7 @@ CONFIG_PPP_DEFLATE=m | |||
| 942 | CONFIG_PPP_BSDCOMP=m | 906 | CONFIG_PPP_BSDCOMP=m |
| 943 | # CONFIG_PPP_MPPE is not set | 907 | # CONFIG_PPP_MPPE is not set |
| 944 | CONFIG_PPPOE=m | 908 | CONFIG_PPPOE=m |
| 909 | # CONFIG_PPPOL2TP is not set | ||
| 945 | # CONFIG_SLIP is not set | 910 | # CONFIG_SLIP is not set |
| 946 | CONFIG_SLHC=m | 911 | CONFIG_SLHC=m |
| 947 | # CONFIG_NET_FC is not set | 912 | # CONFIG_NET_FC is not set |
| @@ -950,15 +915,7 @@ CONFIG_NETCONSOLE=y | |||
| 950 | CONFIG_NETPOLL=y | 915 | CONFIG_NETPOLL=y |
| 951 | CONFIG_NETPOLL_TRAP=y | 916 | CONFIG_NETPOLL_TRAP=y |
| 952 | CONFIG_NET_POLL_CONTROLLER=y | 917 | CONFIG_NET_POLL_CONTROLLER=y |
| 953 | |||
| 954 | # | ||
| 955 | # ISDN subsystem | ||
| 956 | # | ||
| 957 | # CONFIG_ISDN is not set | 918 | # CONFIG_ISDN is not set |
| 958 | |||
| 959 | # | ||
| 960 | # Telephony Support | ||
| 961 | # | ||
| 962 | # CONFIG_PHONE is not set | 919 | # CONFIG_PHONE is not set |
| 963 | 920 | ||
| 964 | # | 921 | # |
| @@ -1065,10 +1022,6 @@ CONFIG_HVC_ISERIES=y | |||
| 1065 | CONFIG_HVC_RTAS=y | 1022 | CONFIG_HVC_RTAS=y |
| 1066 | CONFIG_HVC_BEAT=y | 1023 | CONFIG_HVC_BEAT=y |
| 1067 | CONFIG_HVCS=m | 1024 | CONFIG_HVCS=m |
| 1068 | |||
| 1069 | # | ||
| 1070 | # IPMI | ||
| 1071 | # | ||
| 1072 | # CONFIG_IPMI_HANDLER is not set | 1025 | # CONFIG_IPMI_HANDLER is not set |
| 1073 | # CONFIG_WATCHDOG is not set | 1026 | # CONFIG_WATCHDOG is not set |
| 1074 | # CONFIG_HW_RANDOM is not set | 1027 | # CONFIG_HW_RANDOM is not set |
| @@ -1081,10 +1034,6 @@ CONFIG_GEN_RTC=y | |||
| 1081 | CONFIG_RAW_DRIVER=y | 1034 | CONFIG_RAW_DRIVER=y |
| 1082 | CONFIG_MAX_RAW_DEVS=256 | 1035 | CONFIG_MAX_RAW_DEVS=256 |
| 1083 | # CONFIG_HANGCHECK_TIMER is not set | 1036 | # CONFIG_HANGCHECK_TIMER is not set |
| 1084 | |||
| 1085 | # | ||
| 1086 | # TPM devices | ||
| 1087 | # | ||
| 1088 | # CONFIG_TCG_TPM is not set | 1037 | # CONFIG_TCG_TPM is not set |
| 1089 | CONFIG_DEVPORT=y | 1038 | CONFIG_DEVPORT=y |
| 1090 | CONFIG_I2C=y | 1039 | CONFIG_I2C=y |
| @@ -1119,6 +1068,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 1119 | # CONFIG_I2C_SIS5595 is not set | 1068 | # CONFIG_I2C_SIS5595 is not set |
| 1120 | # CONFIG_I2C_SIS630 is not set | 1069 | # CONFIG_I2C_SIS630 is not set |
| 1121 | # CONFIG_I2C_SIS96X is not set | 1070 | # CONFIG_I2C_SIS96X is not set |
| 1071 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1122 | # CONFIG_I2C_STUB is not set | 1072 | # CONFIG_I2C_STUB is not set |
| 1123 | # CONFIG_I2C_TINY_USB is not set | 1073 | # CONFIG_I2C_TINY_USB is not set |
| 1124 | # CONFIG_I2C_VIA is not set | 1074 | # CONFIG_I2C_VIA is not set |
| @@ -1130,11 +1080,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 1130 | # | 1080 | # |
| 1131 | # CONFIG_SENSORS_DS1337 is not set | 1081 | # CONFIG_SENSORS_DS1337 is not set |
| 1132 | # CONFIG_SENSORS_DS1374 is not set | 1082 | # CONFIG_SENSORS_DS1374 is not set |
| 1083 | # CONFIG_DS1682 is not set | ||
| 1133 | # CONFIG_SENSORS_EEPROM is not set | 1084 | # CONFIG_SENSORS_EEPROM is not set |
| 1134 | # CONFIG_SENSORS_PCF8574 is not set | 1085 | # CONFIG_SENSORS_PCF8574 is not set |
| 1135 | # CONFIG_SENSORS_PCA9539 is not set | 1086 | # CONFIG_SENSORS_PCA9539 is not set |
| 1136 | # CONFIG_SENSORS_PCF8591 is not set | 1087 | # CONFIG_SENSORS_PCF8591 is not set |
| 1137 | # CONFIG_SENSORS_MAX6875 is not set | 1088 | # CONFIG_SENSORS_MAX6875 is not set |
| 1089 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1138 | # CONFIG_I2C_DEBUG_CORE is not set | 1090 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1139 | # CONFIG_I2C_DEBUG_ALGO is not set | 1091 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1140 | # CONFIG_I2C_DEBUG_BUS is not set | 1092 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -1145,11 +1097,8 @@ CONFIG_I2C_POWERMAC=y | |||
| 1145 | # | 1097 | # |
| 1146 | # CONFIG_SPI is not set | 1098 | # CONFIG_SPI is not set |
| 1147 | # CONFIG_SPI_MASTER is not set | 1099 | # CONFIG_SPI_MASTER is not set |
| 1148 | |||
| 1149 | # | ||
| 1150 | # Dallas's 1-wire bus | ||
| 1151 | # | ||
| 1152 | # CONFIG_W1 is not set | 1100 | # CONFIG_W1 is not set |
| 1101 | # CONFIG_POWER_SUPPLY is not set | ||
| 1153 | # CONFIG_HWMON is not set | 1102 | # CONFIG_HWMON is not set |
| 1154 | 1103 | ||
| 1155 | # | 1104 | # |
| @@ -1168,8 +1117,8 @@ CONFIG_I2C_POWERMAC=y | |||
| 1168 | # Graphics support | 1117 | # Graphics support |
| 1169 | # | 1118 | # |
| 1170 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1119 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1171 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1172 | CONFIG_LCD_CLASS_DEVICE=y | 1120 | CONFIG_LCD_CLASS_DEVICE=y |
| 1121 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1173 | 1122 | ||
| 1174 | # | 1123 | # |
| 1175 | # Display device support | 1124 | # Display device support |
| @@ -1180,6 +1129,7 @@ CONFIG_DISPLAY_SUPPORT=y | |||
| 1180 | # Display hardware drivers | 1129 | # Display hardware drivers |
| 1181 | # | 1130 | # |
| 1182 | # CONFIG_VGASTATE is not set | 1131 | # CONFIG_VGASTATE is not set |
| 1132 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
| 1183 | CONFIG_FB=y | 1133 | CONFIG_FB=y |
| 1184 | CONFIG_FIRMWARE_EDID=y | 1134 | CONFIG_FIRMWARE_EDID=y |
| 1185 | CONFIG_FB_DDC=y | 1135 | CONFIG_FB_DDC=y |
| @@ -1243,11 +1193,13 @@ CONFIG_FB_IBM_GXT4500=y | |||
| 1243 | # CONFIG_VGA_CONSOLE is not set | 1193 | # CONFIG_VGA_CONSOLE is not set |
| 1244 | CONFIG_DUMMY_CONSOLE=y | 1194 | CONFIG_DUMMY_CONSOLE=y |
| 1245 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1195 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1196 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1246 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1197 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1247 | # CONFIG_FONTS is not set | 1198 | # CONFIG_FONTS is not set |
| 1248 | CONFIG_FONT_8x8=y | 1199 | CONFIG_FONT_8x8=y |
| 1249 | CONFIG_FONT_8x16=y | 1200 | CONFIG_FONT_8x16=y |
| 1250 | CONFIG_LOGO=y | 1201 | CONFIG_LOGO=y |
| 1202 | CONFIG_FB_LOGO_EXTRA=y | ||
| 1251 | CONFIG_LOGO_LINUX_MONO=y | 1203 | CONFIG_LOGO_LINUX_MONO=y |
| 1252 | CONFIG_LOGO_LINUX_VGA16=y | 1204 | CONFIG_LOGO_LINUX_VGA16=y |
| 1253 | CONFIG_LOGO_LINUX_CLUT224=y | 1205 | CONFIG_LOGO_LINUX_CLUT224=y |
| @@ -1303,6 +1255,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1303 | # CONFIG_SND_CMIPCI is not set | 1255 | # CONFIG_SND_CMIPCI is not set |
| 1304 | # CONFIG_SND_CS4281 is not set | 1256 | # CONFIG_SND_CS4281 is not set |
| 1305 | # CONFIG_SND_CS46XX is not set | 1257 | # CONFIG_SND_CS46XX is not set |
| 1258 | # CONFIG_SND_CS5530 is not set | ||
| 1306 | # CONFIG_SND_DARLA20 is not set | 1259 | # CONFIG_SND_DARLA20 is not set |
| 1307 | # CONFIG_SND_GINA20 is not set | 1260 | # CONFIG_SND_GINA20 is not set |
| 1308 | # CONFIG_SND_LAYLA20 is not set | 1261 | # CONFIG_SND_LAYLA20 is not set |
| @@ -1352,6 +1305,10 @@ CONFIG_SND_POWERMAC=m | |||
| 1352 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1305 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
| 1353 | 1306 | ||
| 1354 | # | 1307 | # |
| 1308 | # ALSA PowerPC devices | ||
| 1309 | # | ||
| 1310 | |||
| 1311 | # | ||
| 1355 | # Apple Onboard Audio driver | 1312 | # Apple Onboard Audio driver |
| 1356 | # | 1313 | # |
| 1357 | CONFIG_SND_AOA=m | 1314 | CONFIG_SND_AOA=m |
| @@ -1375,13 +1332,14 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m | |||
| 1375 | # CONFIG_SND_SOC is not set | 1332 | # CONFIG_SND_SOC is not set |
| 1376 | 1333 | ||
| 1377 | # | 1334 | # |
| 1378 | # Open Sound System | 1335 | # SoC Audio support for SuperH |
| 1379 | # | 1336 | # |
| 1380 | # CONFIG_SOUND_PRIME is not set | ||
| 1381 | 1337 | ||
| 1382 | # | 1338 | # |
| 1383 | # HID Devices | 1339 | # Open Sound System |
| 1384 | # | 1340 | # |
| 1341 | # CONFIG_SOUND_PRIME is not set | ||
| 1342 | CONFIG_HID_SUPPORT=y | ||
| 1385 | CONFIG_HID=y | 1343 | CONFIG_HID=y |
| 1386 | # CONFIG_HID_DEBUG is not set | 1344 | # CONFIG_HID_DEBUG is not set |
| 1387 | 1345 | ||
| @@ -1392,10 +1350,7 @@ CONFIG_USB_HID=y | |||
| 1392 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1350 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1393 | # CONFIG_HID_FF is not set | 1351 | # CONFIG_HID_FF is not set |
| 1394 | CONFIG_USB_HIDDEV=y | 1352 | CONFIG_USB_HIDDEV=y |
| 1395 | 1353 | CONFIG_USB_SUPPORT=y | |
| 1396 | # | ||
| 1397 | # USB support | ||
| 1398 | # | ||
| 1399 | CONFIG_USB_ARCH_HAS_HCD=y | 1354 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1400 | CONFIG_USB_ARCH_HAS_OHCI=y | 1355 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1401 | CONFIG_USB_ARCH_HAS_EHCI=y | 1356 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1426,6 +1381,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 1426 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1381 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1427 | # CONFIG_USB_UHCI_HCD is not set | 1382 | # CONFIG_USB_UHCI_HCD is not set |
| 1428 | # CONFIG_USB_SL811_HCD is not set | 1383 | # CONFIG_USB_SL811_HCD is not set |
| 1384 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1429 | 1385 | ||
| 1430 | # | 1386 | # |
| 1431 | # USB Device Class drivers | 1387 | # USB Device Class drivers |
| @@ -1504,23 +1460,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1504 | # | 1460 | # |
| 1505 | # CONFIG_USB_GADGET is not set | 1461 | # CONFIG_USB_GADGET is not set |
| 1506 | # CONFIG_MMC is not set | 1462 | # CONFIG_MMC is not set |
| 1507 | |||
| 1508 | # | ||
| 1509 | # LED devices | ||
| 1510 | # | ||
| 1511 | # CONFIG_NEW_LEDS is not set | 1463 | # CONFIG_NEW_LEDS is not set |
| 1512 | |||
| 1513 | # | ||
| 1514 | # LED drivers | ||
| 1515 | # | ||
| 1516 | |||
| 1517 | # | ||
| 1518 | # LED Triggers | ||
| 1519 | # | ||
| 1520 | |||
| 1521 | # | ||
| 1522 | # InfiniBand support | ||
| 1523 | # | ||
| 1524 | CONFIG_INFINIBAND=m | 1464 | CONFIG_INFINIBAND=m |
| 1525 | # CONFIG_INFINIBAND_USER_MAD is not set | 1465 | # CONFIG_INFINIBAND_USER_MAD is not set |
| 1526 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1466 | # CONFIG_INFINIBAND_USER_ACCESS is not set |
| @@ -1536,14 +1476,13 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
| 1536 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | 1476 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set |
| 1537 | # CONFIG_INFINIBAND_SRP is not set | 1477 | # CONFIG_INFINIBAND_SRP is not set |
| 1538 | CONFIG_INFINIBAND_ISER=m | 1478 | CONFIG_INFINIBAND_ISER=m |
| 1479 | CONFIG_EDAC=y | ||
| 1539 | 1480 | ||
| 1540 | # | 1481 | # |
| 1541 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1482 | # Reporting subsystems |
| 1542 | # | ||
| 1543 | |||
| 1544 | # | ||
| 1545 | # Real Time Clock | ||
| 1546 | # | 1483 | # |
| 1484 | # CONFIG_EDAC_DEBUG is not set | ||
| 1485 | CONFIG_EDAC_MM_EDAC=y | ||
| 1547 | # CONFIG_RTC_CLASS is not set | 1486 | # CONFIG_RTC_CLASS is not set |
| 1548 | 1487 | ||
| 1549 | # | 1488 | # |
| @@ -1560,6 +1499,11 @@ CONFIG_INFINIBAND_ISER=m | |||
| 1560 | # | 1499 | # |
| 1561 | 1500 | ||
| 1562 | # | 1501 | # |
| 1502 | # Userspace I/O | ||
| 1503 | # | ||
| 1504 | # CONFIG_UIO is not set | ||
| 1505 | |||
| 1506 | # | ||
| 1563 | # File systems | 1507 | # File systems |
| 1564 | # | 1508 | # |
| 1565 | CONFIG_EXT2_FS=y | 1509 | CONFIG_EXT2_FS=y |
| @@ -1690,7 +1634,6 @@ CONFIG_CIFS_POSIX=y | |||
| 1690 | # CONFIG_NCP_FS is not set | 1634 | # CONFIG_NCP_FS is not set |
| 1691 | # CONFIG_CODA_FS is not set | 1635 | # CONFIG_CODA_FS is not set |
| 1692 | # CONFIG_AFS_FS is not set | 1636 | # CONFIG_AFS_FS is not set |
| 1693 | # CONFIG_9P_FS is not set | ||
| 1694 | 1637 | ||
| 1695 | # | 1638 | # |
| 1696 | # Partition Types | 1639 | # Partition Types |
| @@ -1772,6 +1715,7 @@ CONFIG_CRC_CCITT=m | |||
| 1772 | # CONFIG_CRC16 is not set | 1715 | # CONFIG_CRC16 is not set |
| 1773 | # CONFIG_CRC_ITU_T is not set | 1716 | # CONFIG_CRC_ITU_T is not set |
| 1774 | CONFIG_CRC32=y | 1717 | CONFIG_CRC32=y |
| 1718 | # CONFIG_CRC7 is not set | ||
| 1775 | CONFIG_LIBCRC32C=m | 1719 | CONFIG_LIBCRC32C=m |
| 1776 | CONFIG_ZLIB_INFLATE=y | 1720 | CONFIG_ZLIB_INFLATE=y |
| 1777 | CONFIG_ZLIB_DEFLATE=m | 1721 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1803,6 +1747,7 @@ CONFIG_DEBUG_FS=y | |||
| 1803 | CONFIG_DEBUG_KERNEL=y | 1747 | CONFIG_DEBUG_KERNEL=y |
| 1804 | # CONFIG_DEBUG_SHIRQ is not set | 1748 | # CONFIG_DEBUG_SHIRQ is not set |
| 1805 | CONFIG_DETECT_SOFTLOCKUP=y | 1749 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1750 | CONFIG_SCHED_DEBUG=y | ||
| 1806 | # CONFIG_SCHEDSTATS is not set | 1751 | # CONFIG_SCHEDSTATS is not set |
| 1807 | # CONFIG_TIMER_STATS is not set | 1752 | # CONFIG_TIMER_STATS is not set |
| 1808 | # CONFIG_DEBUG_SLAB is not set | 1753 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1837,10 +1782,10 @@ CONFIG_BOOTX_TEXT=y | |||
| 1837 | # | 1782 | # |
| 1838 | # CONFIG_KEYS is not set | 1783 | # CONFIG_KEYS is not set |
| 1839 | # CONFIG_SECURITY is not set | 1784 | # CONFIG_SECURITY is not set |
| 1840 | 1785 | CONFIG_XOR_BLOCKS=y | |
| 1841 | # | 1786 | CONFIG_ASYNC_CORE=y |
| 1842 | # Cryptographic options | 1787 | CONFIG_ASYNC_MEMCPY=y |
| 1843 | # | 1788 | CONFIG_ASYNC_XOR=y |
| 1844 | CONFIG_CRYPTO=y | 1789 | CONFIG_CRYPTO=y |
| 1845 | CONFIG_CRYPTO_ALGAPI=y | 1790 | CONFIG_CRYPTO_ALGAPI=y |
| 1846 | CONFIG_CRYPTO_BLKCIPHER=y | 1791 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1880,7 +1825,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1880 | CONFIG_CRYPTO_CRC32C=m | 1825 | CONFIG_CRYPTO_CRC32C=m |
| 1881 | # CONFIG_CRYPTO_CAMELLIA is not set | 1826 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1882 | CONFIG_CRYPTO_TEST=m | 1827 | CONFIG_CRYPTO_TEST=m |
| 1883 | 1828 | # CONFIG_CRYPTO_HW is not set | |
| 1884 | # | ||
| 1885 | # Hardware crypto devices | ||
| 1886 | # | ||
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index 858f865f2d59..cce3d3da086b 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
| @@ -1,9 +1,26 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 14:15:11 2007 | 4 | # Tue Aug 28 21:24:45 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | CONFIG_6xx=y | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | # CONFIG_40x is not set | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_PPC_FPU=y | ||
| 18 | CONFIG_PPC_STD_MMU=y | ||
| 19 | CONFIG_PPC_STD_MMU_32=y | ||
| 20 | # CONFIG_PPC_MM_SLICES is not set | ||
| 21 | # CONFIG_SMP is not set | ||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 23 | CONFIG_CHECK_CACHE_COHERENCY=y | ||
| 7 | CONFIG_PPC32=y | 24 | CONFIG_PPC32=y |
| 8 | CONFIG_PPC_MERGE=y | 25 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| @@ -14,63 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 31 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 32 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 33 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 34 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 17 | CONFIG_PPC=y | 35 | CONFIG_PPC=y |
| 18 | CONFIG_EARLY_PRINTK=y | 36 | CONFIG_EARLY_PRINTK=y |
| 19 | CONFIG_GENERIC_NVRAM=y | 37 | CONFIG_GENERIC_NVRAM=y |
| 20 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 38 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 21 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 39 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 22 | CONFIG_PPC_OF=y | 40 | CONFIG_PPC_OF=y |
| 41 | CONFIG_OF=y | ||
| 23 | # CONFIG_PPC_UDBG_16550 is not set | 42 | # CONFIG_PPC_UDBG_16550 is not set |
| 24 | # CONFIG_GENERIC_TBSYNC is not set | 43 | # CONFIG_GENERIC_TBSYNC is not set |
| 25 | CONFIG_AUDIT_ARCH=y | 44 | CONFIG_AUDIT_ARCH=y |
| 26 | CONFIG_GENERIC_BUG=y | 45 | CONFIG_GENERIC_BUG=y |
| 27 | # CONFIG_DEFAULT_UIMAGE is not set | 46 | # CONFIG_DEFAULT_UIMAGE is not set |
| 28 | |||
| 29 | # | ||
| 30 | # Processor support | ||
| 31 | # | ||
| 32 | CONFIG_CLASSIC32=y | ||
| 33 | # CONFIG_PPC_82xx is not set | ||
| 34 | # CONFIG_PPC_83xx is not set | ||
| 35 | # CONFIG_PPC_85xx is not set | ||
| 36 | # CONFIG_PPC_86xx is not set | ||
| 37 | # CONFIG_PPC_8xx is not set | ||
| 38 | # CONFIG_40x is not set | ||
| 39 | # CONFIG_44x is not set | ||
| 40 | # CONFIG_E200 is not set | ||
| 41 | CONFIG_6xx=y | ||
| 42 | CONFIG_PPC_FPU=y | ||
| 43 | # CONFIG_PPC_DCR_NATIVE is not set | 47 | # CONFIG_PPC_DCR_NATIVE is not set |
| 44 | # CONFIG_PPC_DCR_MMIO is not set | 48 | # CONFIG_PPC_DCR_MMIO is not set |
| 45 | CONFIG_ALTIVEC=y | ||
| 46 | CONFIG_PPC_STD_MMU=y | ||
| 47 | CONFIG_PPC_STD_MMU_32=y | ||
| 48 | # CONFIG_PPC_MM_SLICES is not set | ||
| 49 | # CONFIG_SMP is not set | ||
| 50 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 51 | CONFIG_CHECK_CACHE_COHERENCY=y | ||
| 52 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 53 | 50 | ||
| 54 | # | 51 | # |
| 55 | # Code maturity level options | 52 | # General setup |
| 56 | # | 53 | # |
| 57 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 58 | CONFIG_BROKEN_ON_SMP=y | 55 | CONFIG_BROKEN_ON_SMP=y |
| 59 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 60 | |||
| 61 | # | ||
| 62 | # General setup | ||
| 63 | # | ||
| 64 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 65 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 66 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 67 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 68 | # CONFIG_IPC_NS is not set | ||
| 69 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 70 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 71 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 72 | # CONFIG_TASKSTATS is not set | 64 | # CONFIG_TASKSTATS is not set |
| 73 | # CONFIG_UTS_NS is not set | 65 | # CONFIG_USER_NS is not set |
| 74 | # CONFIG_AUDIT is not set | 66 | # CONFIG_AUDIT is not set |
| 75 | # CONFIG_IKCONFIG is not set | 67 | # CONFIG_IKCONFIG is not set |
| 76 | CONFIG_LOG_BUF_SHIFT=14 | 68 | CONFIG_LOG_BUF_SHIFT=14 |
| @@ -103,19 +95,12 @@ CONFIG_SLAB=y | |||
| 103 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
| 104 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
| 105 | CONFIG_BASE_SMALL=0 | 97 | CONFIG_BASE_SMALL=0 |
| 106 | |||
| 107 | # | ||
| 108 | # Loadable module support | ||
| 109 | # | ||
| 110 | # CONFIG_MODULES is not set | 98 | # CONFIG_MODULES is not set |
| 111 | |||
| 112 | # | ||
| 113 | # Block layer | ||
| 114 | # | ||
| 115 | CONFIG_BLOCK=y | 99 | CONFIG_BLOCK=y |
| 116 | CONFIG_LBD=y | 100 | CONFIG_LBD=y |
| 117 | # CONFIG_BLK_DEV_IO_TRACE is not set | 101 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 118 | # CONFIG_LSF is not set | 102 | # CONFIG_LSF is not set |
| 103 | # CONFIG_BLK_DEV_BSG is not set | ||
| 119 | 104 | ||
| 120 | # | 105 | # |
| 121 | # IO Schedulers | 106 | # IO Schedulers |
| @@ -135,7 +120,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 135 | # | 120 | # |
| 136 | # CONFIG_PPC_MULTIPLATFORM is not set | 121 | # CONFIG_PPC_MULTIPLATFORM is not set |
| 137 | CONFIG_EMBEDDED6xx=y | 122 | CONFIG_EMBEDDED6xx=y |
| 138 | # CONFIG_APUS is not set | 123 | # CONFIG_PPC_82xx is not set |
| 124 | # CONFIG_PPC_83xx is not set | ||
| 125 | # CONFIG_PPC_86xx is not set | ||
| 139 | # CONFIG_PPC_MPC52xx is not set | 126 | # CONFIG_PPC_MPC52xx is not set |
| 140 | # CONFIG_PPC_MPC5200 is not set | 127 | # CONFIG_PPC_MPC5200 is not set |
| 141 | # CONFIG_PPC_CELL is not set | 128 | # CONFIG_PPC_CELL is not set |
| @@ -156,8 +143,8 @@ CONFIG_MV64X60=y | |||
| 156 | # CONFIG_PPC_INDIRECT_IO is not set | 143 | # CONFIG_PPC_INDIRECT_IO is not set |
| 157 | # CONFIG_GENERIC_IOMAP is not set | 144 | # CONFIG_GENERIC_IOMAP is not set |
| 158 | # CONFIG_CPU_FREQ is not set | 145 | # CONFIG_CPU_FREQ is not set |
| 159 | # CONFIG_TAU is not set | ||
| 160 | # CONFIG_CPM2 is not set | 146 | # CONFIG_CPM2 is not set |
| 147 | # CONFIG_FSL_ULI1575 is not set | ||
| 161 | 148 | ||
| 162 | # | 149 | # |
| 163 | # Kernel options | 150 | # Kernel options |
| @@ -187,6 +174,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 187 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 174 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 188 | # CONFIG_RESOURCES_64BIT is not set | 175 | # CONFIG_RESOURCES_64BIT is not set |
| 189 | CONFIG_ZONE_DMA_FLAG=1 | 176 | CONFIG_ZONE_DMA_FLAG=1 |
| 177 | CONFIG_BOUNCE=y | ||
| 178 | CONFIG_VIRT_TO_BUS=y | ||
| 190 | CONFIG_PROC_DEVICETREE=y | 179 | CONFIG_PROC_DEVICETREE=y |
| 191 | # CONFIG_CMDLINE_BOOL is not set | 180 | # CONFIG_CMDLINE_BOOL is not set |
| 192 | # CONFIG_PM is not set | 181 | # CONFIG_PM is not set |
| @@ -201,9 +190,9 @@ CONFIG_ISA_DMA_API=y | |||
| 201 | CONFIG_ZONE_DMA=y | 190 | CONFIG_ZONE_DMA=y |
| 202 | CONFIG_GENERIC_ISA_DMA=y | 191 | CONFIG_GENERIC_ISA_DMA=y |
| 203 | CONFIG_PPC_INDIRECT_PCI=y | 192 | CONFIG_PPC_INDIRECT_PCI=y |
| 204 | # CONFIG_PPC_INDIRECT_PCI_BE is not set | ||
| 205 | CONFIG_PCI=y | 193 | CONFIG_PCI=y |
| 206 | CONFIG_PCI_DOMAINS=y | 194 | CONFIG_PCI_DOMAINS=y |
| 195 | CONFIG_PCI_SYSCALL=y | ||
| 207 | # CONFIG_PCIEPORTBUS is not set | 196 | # CONFIG_PCIEPORTBUS is not set |
| 208 | CONFIG_ARCH_SUPPORTS_MSI=y | 197 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 209 | # CONFIG_PCI_MSI is not set | 198 | # CONFIG_PCI_MSI is not set |
| @@ -315,6 +304,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 315 | # CONFIG_MAC80211 is not set | 304 | # CONFIG_MAC80211 is not set |
| 316 | # CONFIG_IEEE80211 is not set | 305 | # CONFIG_IEEE80211 is not set |
| 317 | # CONFIG_RFKILL is not set | 306 | # CONFIG_RFKILL is not set |
| 307 | # CONFIG_NET_9P is not set | ||
| 318 | 308 | ||
| 319 | # | 309 | # |
| 320 | # Device Drivers | 310 | # Device Drivers |
| @@ -327,10 +317,6 @@ CONFIG_STANDALONE=y | |||
| 327 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 317 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 328 | # CONFIG_FW_LOADER is not set | 318 | # CONFIG_FW_LOADER is not set |
| 329 | # CONFIG_SYS_HYPERVISOR is not set | 319 | # CONFIG_SYS_HYPERVISOR is not set |
| 330 | |||
| 331 | # | ||
| 332 | # Connector - unified userspace <-> kernelspace linker | ||
| 333 | # | ||
| 334 | # CONFIG_CONNECTOR is not set | 320 | # CONFIG_CONNECTOR is not set |
| 335 | CONFIG_MTD=y | 321 | CONFIG_MTD=y |
| 336 | # CONFIG_MTD_DEBUG is not set | 322 | # CONFIG_MTD_DEBUG is not set |
| @@ -406,20 +392,9 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 406 | # UBI - Unsorted block images | 392 | # UBI - Unsorted block images |
| 407 | # | 393 | # |
| 408 | # CONFIG_MTD_UBI is not set | 394 | # CONFIG_MTD_UBI is not set |
| 409 | 395 | CONFIG_OF_DEVICE=y | |
| 410 | # | ||
| 411 | # Parallel port support | ||
| 412 | # | ||
| 413 | # CONFIG_PARPORT is not set | 396 | # CONFIG_PARPORT is not set |
| 414 | 397 | CONFIG_BLK_DEV=y | |
| 415 | # | ||
| 416 | # Plug and Play support | ||
| 417 | # | ||
| 418 | # CONFIG_PNPACPI is not set | ||
| 419 | |||
| 420 | # | ||
| 421 | # Block devices | ||
| 422 | # | ||
| 423 | # CONFIG_BLK_DEV_FD is not set | 398 | # CONFIG_BLK_DEV_FD is not set |
| 424 | # CONFIG_BLK_CPQ_DA is not set | 399 | # CONFIG_BLK_CPQ_DA is not set |
| 425 | # CONFIG_BLK_CPQ_CISS_DA is not set | 400 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| @@ -437,14 +412,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
| 437 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 412 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 438 | # CONFIG_CDROM_PKTCDVD is not set | 413 | # CONFIG_CDROM_PKTCDVD is not set |
| 439 | # CONFIG_ATA_OVER_ETH is not set | 414 | # CONFIG_ATA_OVER_ETH is not set |
| 440 | 415 | CONFIG_MISC_DEVICES=y | |
| 441 | # | ||
| 442 | # Misc devices | ||
| 443 | # | ||
| 444 | # CONFIG_PHANTOM is not set | 416 | # CONFIG_PHANTOM is not set |
| 417 | # CONFIG_EEPROM_93CX6 is not set | ||
| 445 | # CONFIG_SGI_IOC4 is not set | 418 | # CONFIG_SGI_IOC4 is not set |
| 446 | # CONFIG_TIFM_CORE is not set | 419 | # CONFIG_TIFM_CORE is not set |
| 447 | # CONFIG_BLINK is not set | ||
| 448 | CONFIG_IDE=y | 420 | CONFIG_IDE=y |
| 449 | CONFIG_BLK_DEV_IDE=y | 421 | CONFIG_BLK_DEV_IDE=y |
| 450 | 422 | ||
| @@ -509,6 +481,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 509 | # | 481 | # |
| 510 | # CONFIG_RAID_ATTRS is not set | 482 | # CONFIG_RAID_ATTRS is not set |
| 511 | CONFIG_SCSI=y | 483 | CONFIG_SCSI=y |
| 484 | CONFIG_SCSI_DMA=y | ||
| 512 | # CONFIG_SCSI_TGT is not set | 485 | # CONFIG_SCSI_TGT is not set |
| 513 | # CONFIG_SCSI_NETLINK is not set | 486 | # CONFIG_SCSI_NETLINK is not set |
| 514 | CONFIG_SCSI_PROC_FS=y | 487 | CONFIG_SCSI_PROC_FS=y |
| @@ -537,12 +510,8 @@ CONFIG_BLK_DEV_SD=y | |||
| 537 | # CONFIG_SCSI_SPI_ATTRS is not set | 510 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 538 | # CONFIG_SCSI_FC_ATTRS is not set | 511 | # CONFIG_SCSI_FC_ATTRS is not set |
| 539 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 512 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 540 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 541 | # CONFIG_SCSI_SAS_LIBSAS is not set | 513 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 542 | 514 | CONFIG_SCSI_LOWLEVEL=y | |
| 543 | # | ||
| 544 | # SCSI low-level drivers | ||
| 545 | # | ||
| 546 | # CONFIG_ISCSI_TCP is not set | 515 | # CONFIG_ISCSI_TCP is not set |
| 547 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 516 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 548 | # CONFIG_SCSI_3W_9XXX is not set | 517 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -632,10 +601,6 @@ CONFIG_SATA_MV=y | |||
| 632 | # CONFIG_PATA_SIS is not set | 601 | # CONFIG_PATA_SIS is not set |
| 633 | # CONFIG_PATA_VIA is not set | 602 | # CONFIG_PATA_VIA is not set |
| 634 | # CONFIG_PATA_WINBOND is not set | 603 | # CONFIG_PATA_WINBOND is not set |
| 635 | |||
| 636 | # | ||
| 637 | # Multi-device support (RAID and LVM) | ||
| 638 | # | ||
| 639 | # CONFIG_MD is not set | 604 | # CONFIG_MD is not set |
| 640 | 605 | ||
| 641 | # | 606 | # |
| @@ -651,21 +616,15 @@ CONFIG_SATA_MV=y | |||
| 651 | # | 616 | # |
| 652 | # CONFIG_FIREWIRE is not set | 617 | # CONFIG_FIREWIRE is not set |
| 653 | # CONFIG_IEEE1394 is not set | 618 | # CONFIG_IEEE1394 is not set |
| 654 | |||
| 655 | # | ||
| 656 | # I2O device support | ||
| 657 | # | ||
| 658 | # CONFIG_I2O is not set | 619 | # CONFIG_I2O is not set |
| 659 | CONFIG_MACINTOSH_DRIVERS=y | 620 | CONFIG_MACINTOSH_DRIVERS=y |
| 660 | # CONFIG_MAC_EMUMOUSEBTN is not set | 621 | # CONFIG_MAC_EMUMOUSEBTN is not set |
| 661 | # CONFIG_WINDFARM is not set | 622 | # CONFIG_WINDFARM is not set |
| 662 | |||
| 663 | # | ||
| 664 | # Network device support | ||
| 665 | # | ||
| 666 | CONFIG_NETDEVICES=y | 623 | CONFIG_NETDEVICES=y |
| 624 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 667 | # CONFIG_DUMMY is not set | 625 | # CONFIG_DUMMY is not set |
| 668 | # CONFIG_BONDING is not set | 626 | # CONFIG_BONDING is not set |
| 627 | # CONFIG_MACVLAN is not set | ||
| 669 | # CONFIG_EQUALIZER is not set | 628 | # CONFIG_EQUALIZER is not set |
| 670 | # CONFIG_TUN is not set | 629 | # CONFIG_TUN is not set |
| 671 | # CONFIG_ARCNET is not set | 630 | # CONFIG_ARCNET is not set |
| @@ -682,21 +641,14 @@ CONFIG_PHYLIB=y | |||
| 682 | # CONFIG_VITESSE_PHY is not set | 641 | # CONFIG_VITESSE_PHY is not set |
| 683 | # CONFIG_SMSC_PHY is not set | 642 | # CONFIG_SMSC_PHY is not set |
| 684 | # CONFIG_BROADCOM_PHY is not set | 643 | # CONFIG_BROADCOM_PHY is not set |
| 644 | # CONFIG_ICPLUS_PHY is not set | ||
| 685 | # CONFIG_FIXED_PHY is not set | 645 | # CONFIG_FIXED_PHY is not set |
| 686 | |||
| 687 | # | ||
| 688 | # Ethernet (10 or 100Mbit) | ||
| 689 | # | ||
| 690 | CONFIG_NET_ETHERNET=y | 646 | CONFIG_NET_ETHERNET=y |
| 691 | CONFIG_MII=y | 647 | CONFIG_MII=y |
| 692 | # CONFIG_HAPPYMEAL is not set | 648 | # CONFIG_HAPPYMEAL is not set |
| 693 | # CONFIG_SUNGEM is not set | 649 | # CONFIG_SUNGEM is not set |
| 694 | # CONFIG_CASSINI is not set | 650 | # CONFIG_CASSINI is not set |
| 695 | # CONFIG_NET_VENDOR_3COM is not set | 651 | # CONFIG_NET_VENDOR_3COM is not set |
| 696 | |||
| 697 | # | ||
| 698 | # Tulip family network device support | ||
| 699 | # | ||
| 700 | # CONFIG_NET_TULIP is not set | 652 | # CONFIG_NET_TULIP is not set |
| 701 | # CONFIG_HP100 is not set | 653 | # CONFIG_HP100 is not set |
| 702 | CONFIG_NET_PCI=y | 654 | CONFIG_NET_PCI=y |
| @@ -736,7 +688,6 @@ CONFIG_E1000=y | |||
| 736 | # CONFIG_SIS190 is not set | 688 | # CONFIG_SIS190 is not set |
| 737 | # CONFIG_SKGE is not set | 689 | # CONFIG_SKGE is not set |
| 738 | # CONFIG_SKY2 is not set | 690 | # CONFIG_SKY2 is not set |
| 739 | # CONFIG_SK98LIN is not set | ||
| 740 | # CONFIG_VIA_VELOCITY is not set | 691 | # CONFIG_VIA_VELOCITY is not set |
| 741 | # CONFIG_TIGON3 is not set | 692 | # CONFIG_TIGON3 is not set |
| 742 | # CONFIG_BNX2 is not set | 693 | # CONFIG_BNX2 is not set |
| @@ -778,15 +729,7 @@ CONFIG_NETDEV_10000=y | |||
| 778 | # CONFIG_NETCONSOLE is not set | 729 | # CONFIG_NETCONSOLE is not set |
| 779 | # CONFIG_NETPOLL is not set | 730 | # CONFIG_NETPOLL is not set |
| 780 | # CONFIG_NET_POLL_CONTROLLER is not set | 731 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 781 | |||
| 782 | # | ||
| 783 | # ISDN subsystem | ||
| 784 | # | ||
| 785 | # CONFIG_ISDN is not set | 732 | # CONFIG_ISDN is not set |
| 786 | |||
| 787 | # | ||
| 788 | # Telephony Support | ||
| 789 | # | ||
| 790 | # CONFIG_PHONE is not set | 733 | # CONFIG_PHONE is not set |
| 791 | 734 | ||
| 792 | # | 735 | # |
| @@ -850,10 +793,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 850 | CONFIG_UNIX98_PTYS=y | 793 | CONFIG_UNIX98_PTYS=y |
| 851 | CONFIG_LEGACY_PTYS=y | 794 | CONFIG_LEGACY_PTYS=y |
| 852 | CONFIG_LEGACY_PTY_COUNT=256 | 795 | CONFIG_LEGACY_PTY_COUNT=256 |
| 853 | |||
| 854 | # | ||
| 855 | # IPMI | ||
| 856 | # | ||
| 857 | # CONFIG_IPMI_HANDLER is not set | 796 | # CONFIG_IPMI_HANDLER is not set |
| 858 | # CONFIG_WATCHDOG is not set | 797 | # CONFIG_WATCHDOG is not set |
| 859 | # CONFIG_HW_RANDOM is not set | 798 | # CONFIG_HW_RANDOM is not set |
| @@ -865,10 +804,6 @@ CONFIG_GEN_RTC=y | |||
| 865 | # CONFIG_AGP is not set | 804 | # CONFIG_AGP is not set |
| 866 | # CONFIG_DRM is not set | 805 | # CONFIG_DRM is not set |
| 867 | # CONFIG_RAW_DRIVER is not set | 806 | # CONFIG_RAW_DRIVER is not set |
| 868 | |||
| 869 | # | ||
| 870 | # TPM devices | ||
| 871 | # | ||
| 872 | # CONFIG_TCG_TPM is not set | 807 | # CONFIG_TCG_TPM is not set |
| 873 | CONFIG_DEVPORT=y | 808 | CONFIG_DEVPORT=y |
| 874 | CONFIG_I2C=y | 809 | CONFIG_I2C=y |
| @@ -903,6 +838,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 903 | # CONFIG_I2C_SIS5595 is not set | 838 | # CONFIG_I2C_SIS5595 is not set |
| 904 | # CONFIG_I2C_SIS630 is not set | 839 | # CONFIG_I2C_SIS630 is not set |
| 905 | # CONFIG_I2C_SIS96X is not set | 840 | # CONFIG_I2C_SIS96X is not set |
| 841 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 906 | # CONFIG_I2C_TINY_USB is not set | 842 | # CONFIG_I2C_TINY_USB is not set |
| 907 | # CONFIG_I2C_VIA is not set | 843 | # CONFIG_I2C_VIA is not set |
| 908 | # CONFIG_I2C_VIAPRO is not set | 844 | # CONFIG_I2C_VIAPRO is not set |
| @@ -914,12 +850,14 @@ CONFIG_I2C_MV64XXX=y | |||
| 914 | # | 850 | # |
| 915 | # CONFIG_SENSORS_DS1337 is not set | 851 | # CONFIG_SENSORS_DS1337 is not set |
| 916 | # CONFIG_SENSORS_DS1374 is not set | 852 | # CONFIG_SENSORS_DS1374 is not set |
| 853 | # CONFIG_DS1682 is not set | ||
| 917 | # CONFIG_SENSORS_EEPROM is not set | 854 | # CONFIG_SENSORS_EEPROM is not set |
| 918 | # CONFIG_SENSORS_PCF8574 is not set | 855 | # CONFIG_SENSORS_PCF8574 is not set |
| 919 | # CONFIG_SENSORS_PCA9539 is not set | 856 | # CONFIG_SENSORS_PCA9539 is not set |
| 920 | # CONFIG_SENSORS_PCF8591 is not set | 857 | # CONFIG_SENSORS_PCF8591 is not set |
| 921 | # CONFIG_SENSORS_M41T00 is not set | 858 | # CONFIG_SENSORS_M41T00 is not set |
| 922 | # CONFIG_SENSORS_MAX6875 is not set | 859 | # CONFIG_SENSORS_MAX6875 is not set |
| 860 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 923 | # CONFIG_I2C_DEBUG_CORE is not set | 861 | # CONFIG_I2C_DEBUG_CORE is not set |
| 924 | # CONFIG_I2C_DEBUG_ALGO is not set | 862 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 925 | # CONFIG_I2C_DEBUG_BUS is not set | 863 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -930,14 +868,12 @@ CONFIG_I2C_MV64XXX=y | |||
| 930 | # | 868 | # |
| 931 | # CONFIG_SPI is not set | 869 | # CONFIG_SPI is not set |
| 932 | # CONFIG_SPI_MASTER is not set | 870 | # CONFIG_SPI_MASTER is not set |
| 933 | |||
| 934 | # | ||
| 935 | # Dallas's 1-wire bus | ||
| 936 | # | ||
| 937 | # CONFIG_W1 is not set | 871 | # CONFIG_W1 is not set |
| 872 | # CONFIG_POWER_SUPPLY is not set | ||
| 938 | CONFIG_HWMON=y | 873 | CONFIG_HWMON=y |
| 939 | # CONFIG_HWMON_VID is not set | 874 | # CONFIG_HWMON_VID is not set |
| 940 | # CONFIG_SENSORS_ABITUGURU is not set | 875 | # CONFIG_SENSORS_ABITUGURU is not set |
| 876 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
| 941 | # CONFIG_SENSORS_AD7418 is not set | 877 | # CONFIG_SENSORS_AD7418 is not set |
| 942 | # CONFIG_SENSORS_ADM1021 is not set | 878 | # CONFIG_SENSORS_ADM1021 is not set |
| 943 | # CONFIG_SENSORS_ADM1025 is not set | 879 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -964,14 +900,17 @@ CONFIG_HWMON=y | |||
| 964 | # CONFIG_SENSORS_LM87 is not set | 900 | # CONFIG_SENSORS_LM87 is not set |
| 965 | # CONFIG_SENSORS_LM90 is not set | 901 | # CONFIG_SENSORS_LM90 is not set |
| 966 | # CONFIG_SENSORS_LM92 is not set | 902 | # CONFIG_SENSORS_LM92 is not set |
| 903 | # CONFIG_SENSORS_LM93 is not set | ||
| 967 | # CONFIG_SENSORS_MAX1619 is not set | 904 | # CONFIG_SENSORS_MAX1619 is not set |
| 968 | # CONFIG_SENSORS_MAX6650 is not set | 905 | # CONFIG_SENSORS_MAX6650 is not set |
| 969 | # CONFIG_SENSORS_PC87360 is not set | 906 | # CONFIG_SENSORS_PC87360 is not set |
| 970 | # CONFIG_SENSORS_PC87427 is not set | 907 | # CONFIG_SENSORS_PC87427 is not set |
| 971 | # CONFIG_SENSORS_SIS5595 is not set | 908 | # CONFIG_SENSORS_SIS5595 is not set |
| 909 | # CONFIG_SENSORS_DME1737 is not set | ||
| 972 | # CONFIG_SENSORS_SMSC47M1 is not set | 910 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 973 | # CONFIG_SENSORS_SMSC47M192 is not set | 911 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 974 | # CONFIG_SENSORS_SMSC47B397 is not set | 912 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 913 | # CONFIG_SENSORS_THMC50 is not set | ||
| 975 | # CONFIG_SENSORS_VIA686A is not set | 914 | # CONFIG_SENSORS_VIA686A is not set |
| 976 | # CONFIG_SENSORS_VT1211 is not set | 915 | # CONFIG_SENSORS_VT1211 is not set |
| 977 | # CONFIG_SENSORS_VT8231 is not set | 916 | # CONFIG_SENSORS_VT8231 is not set |
| @@ -1006,6 +945,7 @@ CONFIG_HWMON=y | |||
| 1006 | # | 945 | # |
| 1007 | # CONFIG_DISPLAY_SUPPORT is not set | 946 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1008 | # CONFIG_VGASTATE is not set | 947 | # CONFIG_VGASTATE is not set |
| 948 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 1009 | # CONFIG_FB is not set | 949 | # CONFIG_FB is not set |
| 1010 | # CONFIG_FB_IBM_GXT4500 is not set | 950 | # CONFIG_FB_IBM_GXT4500 is not set |
| 1011 | 951 | ||
| @@ -1020,10 +960,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 1020 | # Sound | 960 | # Sound |
| 1021 | # | 961 | # |
| 1022 | # CONFIG_SOUND is not set | 962 | # CONFIG_SOUND is not set |
| 1023 | 963 | CONFIG_HID_SUPPORT=y | |
| 1024 | # | ||
| 1025 | # HID Devices | ||
| 1026 | # | ||
| 1027 | CONFIG_HID=y | 964 | CONFIG_HID=y |
| 1028 | # CONFIG_HID_DEBUG is not set | 965 | # CONFIG_HID_DEBUG is not set |
| 1029 | 966 | ||
| @@ -1034,10 +971,7 @@ CONFIG_USB_HID=y | |||
| 1034 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 971 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1035 | # CONFIG_HID_FF is not set | 972 | # CONFIG_HID_FF is not set |
| 1036 | # CONFIG_USB_HIDDEV is not set | 973 | # CONFIG_USB_HIDDEV is not set |
| 1037 | 974 | CONFIG_USB_SUPPORT=y | |
| 1038 | # | ||
| 1039 | # USB support | ||
| 1040 | # | ||
| 1041 | CONFIG_USB_ARCH_HAS_HCD=y | 975 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1042 | CONFIG_USB_ARCH_HAS_OHCI=y | 976 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1043 | CONFIG_USB_ARCH_HAS_EHCI=y | 977 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1059,7 +993,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 1059 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 993 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 1060 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 994 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1061 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 995 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1062 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1063 | # CONFIG_USB_ISP116X_HCD is not set | 996 | # CONFIG_USB_ISP116X_HCD is not set |
| 1064 | CONFIG_USB_OHCI_HCD=y | 997 | CONFIG_USB_OHCI_HCD=y |
| 1065 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 998 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| @@ -1068,6 +1001,7 @@ CONFIG_USB_OHCI_HCD=y | |||
| 1068 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1001 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1069 | # CONFIG_USB_UHCI_HCD is not set | 1002 | # CONFIG_USB_UHCI_HCD is not set |
| 1070 | # CONFIG_USB_SL811_HCD is not set | 1003 | # CONFIG_USB_SL811_HCD is not set |
| 1004 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1071 | 1005 | ||
| 1072 | # | 1006 | # |
| 1073 | # USB Device Class drivers | 1007 | # USB Device Class drivers |
| @@ -1134,32 +1068,9 @@ CONFIG_USB_MON=y | |||
| 1134 | # | 1068 | # |
| 1135 | # CONFIG_USB_GADGET is not set | 1069 | # CONFIG_USB_GADGET is not set |
| 1136 | # CONFIG_MMC is not set | 1070 | # CONFIG_MMC is not set |
| 1137 | |||
| 1138 | # | ||
| 1139 | # LED devices | ||
| 1140 | # | ||
| 1141 | # CONFIG_NEW_LEDS is not set | 1071 | # CONFIG_NEW_LEDS is not set |
| 1142 | |||
| 1143 | # | ||
| 1144 | # LED drivers | ||
| 1145 | # | ||
| 1146 | |||
| 1147 | # | ||
| 1148 | # LED Triggers | ||
| 1149 | # | ||
| 1150 | |||
| 1151 | # | ||
| 1152 | # InfiniBand support | ||
| 1153 | # | ||
| 1154 | # CONFIG_INFINIBAND is not set | 1072 | # CONFIG_INFINIBAND is not set |
| 1155 | 1073 | # CONFIG_EDAC is not set | |
| 1156 | # | ||
| 1157 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1158 | # | ||
| 1159 | |||
| 1160 | # | ||
| 1161 | # Real Time Clock | ||
| 1162 | # | ||
| 1163 | CONFIG_RTC_LIB=y | 1074 | CONFIG_RTC_LIB=y |
| 1164 | CONFIG_RTC_CLASS=y | 1075 | CONFIG_RTC_CLASS=y |
| 1165 | CONFIG_RTC_HCTOSYS=y | 1076 | CONFIG_RTC_HCTOSYS=y |
| @@ -1186,6 +1097,7 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1186 | # CONFIG_RTC_DRV_X1205 is not set | 1097 | # CONFIG_RTC_DRV_X1205 is not set |
| 1187 | # CONFIG_RTC_DRV_PCF8563 is not set | 1098 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1188 | # CONFIG_RTC_DRV_PCF8583 is not set | 1099 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1100 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1189 | 1101 | ||
| 1190 | # | 1102 | # |
| 1191 | # SPI RTC drivers | 1103 | # SPI RTC drivers |
| @@ -1194,9 +1106,12 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1194 | # | 1106 | # |
| 1195 | # Platform RTC drivers | 1107 | # Platform RTC drivers |
| 1196 | # | 1108 | # |
| 1109 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1197 | # CONFIG_RTC_DRV_DS1553 is not set | 1110 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1111 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1198 | # CONFIG_RTC_DRV_DS1742 is not set | 1112 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1199 | # CONFIG_RTC_DRV_M48T86 is not set | 1113 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1114 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1200 | # CONFIG_RTC_DRV_V3020 is not set | 1115 | # CONFIG_RTC_DRV_V3020 is not set |
| 1201 | 1116 | ||
| 1202 | # | 1117 | # |
| @@ -1217,6 +1132,11 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1217 | # | 1132 | # |
| 1218 | 1133 | ||
| 1219 | # | 1134 | # |
| 1135 | # Userspace I/O | ||
| 1136 | # | ||
| 1137 | # CONFIG_UIO is not set | ||
| 1138 | |||
| 1139 | # | ||
| 1220 | # File systems | 1140 | # File systems |
| 1221 | # | 1141 | # |
| 1222 | CONFIG_EXT2_FS=y | 1142 | CONFIG_EXT2_FS=y |
| @@ -1310,7 +1230,6 @@ CONFIG_SUNRPC=y | |||
| 1310 | # CONFIG_NCP_FS is not set | 1230 | # CONFIG_NCP_FS is not set |
| 1311 | # CONFIG_CODA_FS is not set | 1231 | # CONFIG_CODA_FS is not set |
| 1312 | # CONFIG_AFS_FS is not set | 1232 | # CONFIG_AFS_FS is not set |
| 1313 | # CONFIG_9P_FS is not set | ||
| 1314 | 1233 | ||
| 1315 | # | 1234 | # |
| 1316 | # Partition Types | 1235 | # Partition Types |
| @@ -1353,6 +1272,7 @@ CONFIG_BITREVERSE=y | |||
| 1353 | # CONFIG_CRC16 is not set | 1272 | # CONFIG_CRC16 is not set |
| 1354 | # CONFIG_CRC_ITU_T is not set | 1273 | # CONFIG_CRC_ITU_T is not set |
| 1355 | CONFIG_CRC32=y | 1274 | CONFIG_CRC32=y |
| 1275 | # CONFIG_CRC7 is not set | ||
| 1356 | # CONFIG_LIBCRC32C is not set | 1276 | # CONFIG_LIBCRC32C is not set |
| 1357 | CONFIG_PLIST=y | 1277 | CONFIG_PLIST=y |
| 1358 | CONFIG_HAS_IOMEM=y | 1278 | CONFIG_HAS_IOMEM=y |
| @@ -1375,7 +1295,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1375 | # CONFIG_HEADERS_CHECK is not set | 1295 | # CONFIG_HEADERS_CHECK is not set |
| 1376 | # CONFIG_DEBUG_KERNEL is not set | 1296 | # CONFIG_DEBUG_KERNEL is not set |
| 1377 | CONFIG_DEBUG_BUGVERBOSE=y | 1297 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1378 | # CONFIG_BOOTX_TEXT is not set | ||
| 1379 | # CONFIG_PPC_EARLY_DEBUG is not set | 1298 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1380 | 1299 | ||
| 1381 | # | 1300 | # |
| @@ -1383,8 +1302,4 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1383 | # | 1302 | # |
| 1384 | # CONFIG_KEYS is not set | 1303 | # CONFIG_KEYS is not set |
| 1385 | # CONFIG_SECURITY is not set | 1304 | # CONFIG_SECURITY is not set |
| 1386 | |||
| 1387 | # | ||
| 1388 | # Cryptographic options | ||
| 1389 | # | ||
| 1390 | # CONFIG_CRYPTO is not set | 1305 | # CONFIG_CRYPTO is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 0caf0dd5ea87..0f274e5f6926 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -1,9 +1,23 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc4 |
| 4 | # Tue Jun 26 14:17:45 2007 | 4 | # Thu Aug 30 16:50:02 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_POWER4_ONLY is not set | ||
| 12 | CONFIG_POWER3=y | ||
| 13 | CONFIG_POWER4=y | ||
| 14 | CONFIG_PPC_FPU=y | ||
| 15 | CONFIG_ALTIVEC=y | ||
| 16 | CONFIG_PPC_STD_MMU=y | ||
| 17 | CONFIG_PPC_MM_SLICES=y | ||
| 18 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 19 | CONFIG_SMP=y | ||
| 20 | CONFIG_NR_CPUS=128 | ||
| 7 | CONFIG_64BIT=y | 21 | CONFIG_64BIT=y |
| 8 | CONFIG_PPC_MERGE=y | 22 | CONFIG_PPC_MERGE=y |
| 9 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
| @@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
| 15 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
| 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 32 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 18 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
| 19 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
| 20 | CONFIG_COMPAT=y | 35 | CONFIG_COMPAT=y |
| @@ -22,45 +37,27 @@ CONFIG_SYSVIPC_COMPAT=y | |||
| 22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 24 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
| 40 | CONFIG_OF=y | ||
| 25 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
| 26 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
| 27 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
| 28 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
| 29 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
| 30 | |||
| 31 | # | ||
| 32 | # Processor support | ||
| 33 | # | ||
| 34 | # CONFIG_POWER4_ONLY is not set | ||
| 35 | CONFIG_POWER3=y | ||
| 36 | CONFIG_POWER4=y | ||
| 37 | CONFIG_PPC_FPU=y | ||
| 38 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
| 39 | # CONFIG_PPC_DCR_MMIO is not set | 47 | # CONFIG_PPC_DCR_MMIO is not set |
| 40 | # CONFIG_PPC_OF_PLATFORM_PCI is not set | 48 | # CONFIG_PPC_OF_PLATFORM_PCI is not set |
| 41 | CONFIG_ALTIVEC=y | ||
| 42 | CONFIG_PPC_STD_MMU=y | ||
| 43 | CONFIG_PPC_MM_SLICES=y | ||
| 44 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 45 | CONFIG_SMP=y | ||
| 46 | CONFIG_NR_CPUS=128 | ||
| 47 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 49 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Code maturity level options | 52 | # General setup |
| 51 | # | 53 | # |
| 52 | CONFIG_EXPERIMENTAL=y | 54 | CONFIG_EXPERIMENTAL=y |
| 53 | CONFIG_LOCK_KERNEL=y | 55 | CONFIG_LOCK_KERNEL=y |
| 54 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 56 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 55 | |||
| 56 | # | ||
| 57 | # General setup | ||
| 58 | # | ||
| 59 | CONFIG_LOCALVERSION="" | 57 | CONFIG_LOCALVERSION="" |
| 60 | CONFIG_LOCALVERSION_AUTO=y | 58 | CONFIG_LOCALVERSION_AUTO=y |
| 61 | CONFIG_SWAP=y | 59 | CONFIG_SWAP=y |
| 62 | CONFIG_SYSVIPC=y | 60 | CONFIG_SYSVIPC=y |
| 63 | # CONFIG_IPC_NS is not set | ||
| 64 | CONFIG_SYSVIPC_SYSCTL=y | 61 | CONFIG_SYSVIPC_SYSCTL=y |
| 65 | CONFIG_POSIX_MQUEUE=y | 62 | CONFIG_POSIX_MQUEUE=y |
| 66 | # CONFIG_BSD_PROCESS_ACCT is not set | 63 | # CONFIG_BSD_PROCESS_ACCT is not set |
| @@ -68,7 +65,7 @@ CONFIG_TASKSTATS=y | |||
| 68 | CONFIG_TASK_DELAY_ACCT=y | 65 | CONFIG_TASK_DELAY_ACCT=y |
| 69 | CONFIG_TASK_XACCT=y | 66 | CONFIG_TASK_XACCT=y |
| 70 | CONFIG_TASK_IO_ACCOUNTING=y | 67 | CONFIG_TASK_IO_ACCOUNTING=y |
| 71 | # CONFIG_UTS_NS is not set | 68 | # CONFIG_USER_NS is not set |
| 72 | CONFIG_AUDIT=y | 69 | CONFIG_AUDIT=y |
| 73 | CONFIG_AUDITSYSCALL=y | 70 | CONFIG_AUDITSYSCALL=y |
| 74 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
| @@ -105,10 +102,6 @@ CONFIG_SLAB=y | |||
| 105 | CONFIG_RT_MUTEXES=y | 102 | CONFIG_RT_MUTEXES=y |
| 106 | # CONFIG_TINY_SHMEM is not set | 103 | # CONFIG_TINY_SHMEM is not set |
| 107 | CONFIG_BASE_SMALL=0 | 104 | CONFIG_BASE_SMALL=0 |
| 108 | |||
| 109 | # | ||
| 110 | # Loadable module support | ||
| 111 | # | ||
| 112 | CONFIG_MODULES=y | 105 | CONFIG_MODULES=y |
| 113 | CONFIG_MODULE_UNLOAD=y | 106 | CONFIG_MODULE_UNLOAD=y |
| 114 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 107 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -116,12 +109,9 @@ CONFIG_MODVERSIONS=y | |||
| 116 | CONFIG_MODULE_SRCVERSION_ALL=y | 109 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 117 | CONFIG_KMOD=y | 110 | CONFIG_KMOD=y |
| 118 | CONFIG_STOP_MACHINE=y | 111 | CONFIG_STOP_MACHINE=y |
| 119 | |||
| 120 | # | ||
| 121 | # Block layer | ||
| 122 | # | ||
| 123 | CONFIG_BLOCK=y | 112 | CONFIG_BLOCK=y |
| 124 | # CONFIG_BLK_DEV_IO_TRACE is not set | 113 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 114 | CONFIG_BLK_DEV_BSG=y | ||
| 125 | 115 | ||
| 126 | # | 116 | # |
| 127 | # IO Schedulers | 117 | # IO Schedulers |
| @@ -141,7 +131,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 141 | # | 131 | # |
| 142 | CONFIG_PPC_MULTIPLATFORM=y | 132 | CONFIG_PPC_MULTIPLATFORM=y |
| 143 | # CONFIG_EMBEDDED6xx is not set | 133 | # CONFIG_EMBEDDED6xx is not set |
| 144 | # CONFIG_APUS is not set | 134 | # CONFIG_PPC_82xx is not set |
| 135 | # CONFIG_PPC_83xx is not set | ||
| 136 | # CONFIG_PPC_86xx is not set | ||
| 145 | CONFIG_PPC_PSERIES=y | 137 | CONFIG_PPC_PSERIES=y |
| 146 | CONFIG_PPC_SPLPAR=y | 138 | CONFIG_PPC_SPLPAR=y |
| 147 | CONFIG_EEH=y | 139 | CONFIG_EEH=y |
| @@ -179,6 +171,7 @@ CONFIG_IBMEBUS=y | |||
| 179 | # CONFIG_GENERIC_IOMAP is not set | 171 | # CONFIG_GENERIC_IOMAP is not set |
| 180 | # CONFIG_CPU_FREQ is not set | 172 | # CONFIG_CPU_FREQ is not set |
| 181 | # CONFIG_CPM2 is not set | 173 | # CONFIG_CPM2 is not set |
| 174 | # CONFIG_FSL_ULI1575 is not set | ||
| 182 | 175 | ||
| 183 | # | 176 | # |
| 184 | # Kernel options | 177 | # Kernel options |
| @@ -221,6 +214,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 221 | CONFIG_MIGRATION=y | 214 | CONFIG_MIGRATION=y |
| 222 | CONFIG_RESOURCES_64BIT=y | 215 | CONFIG_RESOURCES_64BIT=y |
| 223 | CONFIG_ZONE_DMA_FLAG=1 | 216 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | ||
| 224 | CONFIG_NODES_SPAN_OTHER_NODES=y | 218 | CONFIG_NODES_SPAN_OTHER_NODES=y |
| 225 | # CONFIG_PPC_HAS_HASH_64K is not set | 219 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 226 | # CONFIG_PPC_64K_PAGES is not set | 220 | # CONFIG_PPC_64K_PAGES is not set |
| @@ -228,6 +222,7 @@ CONFIG_SCHED_SMT=y | |||
| 228 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 229 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 230 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| 225 | CONFIG_SUSPEND_SMP_POSSIBLE=y | ||
| 231 | CONFIG_SECCOMP=y | 226 | CONFIG_SECCOMP=y |
| 232 | # CONFIG_WANT_DEVICE_TREE is not set | 227 | # CONFIG_WANT_DEVICE_TREE is not set |
| 233 | CONFIG_ISA_DMA_API=y | 228 | CONFIG_ISA_DMA_API=y |
| @@ -240,6 +235,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 240 | # CONFIG_PPC_INDIRECT_PCI is not set | 235 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 241 | CONFIG_PCI=y | 236 | CONFIG_PCI=y |
| 242 | CONFIG_PCI_DOMAINS=y | 237 | CONFIG_PCI_DOMAINS=y |
| 238 | CONFIG_PCI_SYSCALL=y | ||
| 243 | # CONFIG_PCIEPORTBUS is not set | 239 | # CONFIG_PCIEPORTBUS is not set |
| 244 | CONFIG_ARCH_SUPPORTS_MSI=y | 240 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 245 | CONFIG_PCI_MSI=y | 241 | CONFIG_PCI_MSI=y |
| @@ -318,6 +314,7 @@ CONFIG_NF_CT_ACCT=y | |||
| 318 | CONFIG_NF_CONNTRACK_MARK=y | 314 | CONFIG_NF_CONNTRACK_MARK=y |
| 319 | CONFIG_NF_CONNTRACK_EVENTS=y | 315 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 320 | # CONFIG_NF_CT_PROTO_SCTP is not set | 316 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 317 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
| 321 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 318 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| 322 | CONFIG_NF_CONNTRACK_FTP=m | 319 | CONFIG_NF_CONNTRACK_FTP=m |
| 323 | # CONFIG_NF_CONNTRACK_H323 is not set | 320 | # CONFIG_NF_CONNTRACK_H323 is not set |
| @@ -336,6 +333,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m | |||
| 336 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 333 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 337 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 334 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 338 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 335 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 336 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
| 339 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 337 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 340 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 338 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 341 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 339 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| @@ -356,6 +354,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m | |||
| 356 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 354 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
| 357 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 355 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 358 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 356 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 357 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
| 359 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 358 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| 360 | 359 | ||
| 361 | # | 360 | # |
| @@ -434,6 +433,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 434 | # CONFIG_MAC80211 is not set | 433 | # CONFIG_MAC80211 is not set |
| 435 | # CONFIG_IEEE80211 is not set | 434 | # CONFIG_IEEE80211 is not set |
| 436 | # CONFIG_RFKILL is not set | 435 | # CONFIG_RFKILL is not set |
| 436 | # CONFIG_NET_9P is not set | ||
| 437 | 437 | ||
| 438 | # | 438 | # |
| 439 | # Device Drivers | 439 | # Device Drivers |
| @@ -448,16 +448,9 @@ CONFIG_FW_LOADER=y | |||
| 448 | # CONFIG_DEBUG_DRIVER is not set | 448 | # CONFIG_DEBUG_DRIVER is not set |
| 449 | # CONFIG_DEBUG_DEVRES is not set | 449 | # CONFIG_DEBUG_DEVRES is not set |
| 450 | # CONFIG_SYS_HYPERVISOR is not set | 450 | # CONFIG_SYS_HYPERVISOR is not set |
| 451 | |||
| 452 | # | ||
| 453 | # Connector - unified userspace <-> kernelspace linker | ||
| 454 | # | ||
| 455 | # CONFIG_CONNECTOR is not set | 451 | # CONFIG_CONNECTOR is not set |
| 456 | # CONFIG_MTD is not set | 452 | # CONFIG_MTD is not set |
| 457 | 453 | CONFIG_OF_DEVICE=y | |
| 458 | # | ||
| 459 | # Parallel port support | ||
| 460 | # | ||
| 461 | CONFIG_PARPORT=m | 454 | CONFIG_PARPORT=m |
| 462 | CONFIG_PARPORT_PC=m | 455 | CONFIG_PARPORT_PC=m |
| 463 | # CONFIG_PARPORT_SERIAL is not set | 456 | # CONFIG_PARPORT_SERIAL is not set |
| @@ -466,18 +459,9 @@ CONFIG_PARPORT_PC=m | |||
| 466 | # CONFIG_PARPORT_GSC is not set | 459 | # CONFIG_PARPORT_GSC is not set |
| 467 | # CONFIG_PARPORT_AX88796 is not set | 460 | # CONFIG_PARPORT_AX88796 is not set |
| 468 | # CONFIG_PARPORT_1284 is not set | 461 | # CONFIG_PARPORT_1284 is not set |
| 469 | 462 | CONFIG_BLK_DEV=y | |
| 470 | # | ||
| 471 | # Plug and Play support | ||
| 472 | # | ||
| 473 | # CONFIG_PNPACPI is not set | ||
| 474 | |||
| 475 | # | ||
| 476 | # Block devices | ||
| 477 | # | ||
| 478 | CONFIG_BLK_DEV_FD=m | 463 | CONFIG_BLK_DEV_FD=m |
| 479 | # CONFIG_PARIDE is not set | 464 | # CONFIG_PARIDE is not set |
| 480 | # CONFIG_BLK_CPQ_DA is not set | ||
| 481 | # CONFIG_BLK_CPQ_CISS_DA is not set | 465 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 482 | # CONFIG_BLK_DEV_DAC960 is not set | 466 | # CONFIG_BLK_DEV_DAC960 is not set |
| 483 | # CONFIG_BLK_DEV_UMEM is not set | 467 | # CONFIG_BLK_DEV_UMEM is not set |
| @@ -493,14 +477,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
| 493 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 477 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 494 | # CONFIG_CDROM_PKTCDVD is not set | 478 | # CONFIG_CDROM_PKTCDVD is not set |
| 495 | # CONFIG_ATA_OVER_ETH is not set | 479 | # CONFIG_ATA_OVER_ETH is not set |
| 496 | 480 | CONFIG_MISC_DEVICES=y | |
| 497 | # | ||
| 498 | # Misc devices | ||
| 499 | # | ||
| 500 | # CONFIG_PHANTOM is not set | 481 | # CONFIG_PHANTOM is not set |
| 482 | # CONFIG_EEPROM_93CX6 is not set | ||
| 501 | # CONFIG_SGI_IOC4 is not set | 483 | # CONFIG_SGI_IOC4 is not set |
| 502 | # CONFIG_TIFM_CORE is not set | 484 | # CONFIG_TIFM_CORE is not set |
| 503 | # CONFIG_BLINK is not set | ||
| 504 | CONFIG_IDE=y | 485 | CONFIG_IDE=y |
| 505 | CONFIG_BLK_DEV_IDE=y | 486 | CONFIG_BLK_DEV_IDE=y |
| 506 | 487 | ||
| @@ -565,6 +546,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 565 | # | 546 | # |
| 566 | # CONFIG_RAID_ATTRS is not set | 547 | # CONFIG_RAID_ATTRS is not set |
| 567 | CONFIG_SCSI=y | 548 | CONFIG_SCSI=y |
| 549 | CONFIG_SCSI_DMA=y | ||
| 568 | # CONFIG_SCSI_TGT is not set | 550 | # CONFIG_SCSI_TGT is not set |
| 569 | CONFIG_SCSI_NETLINK=y | 551 | CONFIG_SCSI_NETLINK=y |
| 570 | CONFIG_SCSI_PROC_FS=y | 552 | CONFIG_SCSI_PROC_FS=y |
| @@ -597,10 +579,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 597 | CONFIG_SCSI_ISCSI_ATTRS=m | 579 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 598 | CONFIG_SCSI_SAS_ATTRS=m | 580 | CONFIG_SCSI_SAS_ATTRS=m |
| 599 | # CONFIG_SCSI_SAS_LIBSAS is not set | 581 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 600 | 582 | CONFIG_SCSI_LOWLEVEL=y | |
| 601 | # | ||
| 602 | # SCSI low-level drivers | ||
| 603 | # | ||
| 604 | # CONFIG_ISCSI_TCP is not set | 583 | # CONFIG_ISCSI_TCP is not set |
| 605 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 584 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 606 | # CONFIG_SCSI_3W_9XXX is not set | 585 | # CONFIG_SCSI_3W_9XXX is not set |
| @@ -615,7 +594,6 @@ CONFIG_SCSI_SAS_ATTRS=m | |||
| 615 | # CONFIG_MEGARAID_LEGACY is not set | 594 | # CONFIG_MEGARAID_LEGACY is not set |
| 616 | # CONFIG_MEGARAID_SAS is not set | 595 | # CONFIG_MEGARAID_SAS is not set |
| 617 | # CONFIG_SCSI_HPTIOP is not set | 596 | # CONFIG_SCSI_HPTIOP is not set |
| 618 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 619 | # CONFIG_SCSI_DMX3191D is not set | 597 | # CONFIG_SCSI_DMX3191D is not set |
| 620 | # CONFIG_SCSI_EATA is not set | 598 | # CONFIG_SCSI_EATA is not set |
| 621 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 599 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -697,10 +675,6 @@ CONFIG_ATA=y | |||
| 697 | # CONFIG_PATA_SIS is not set | 675 | # CONFIG_PATA_SIS is not set |
| 698 | # CONFIG_PATA_VIA is not set | 676 | # CONFIG_PATA_VIA is not set |
| 699 | CONFIG_PATA_WINBOND=y | 677 | CONFIG_PATA_WINBOND=y |
| 700 | |||
| 701 | # | ||
| 702 | # Multi-device support (RAID and LVM) | ||
| 703 | # | ||
| 704 | CONFIG_MD=y | 678 | CONFIG_MD=y |
| 705 | CONFIG_BLK_DEV_MD=y | 679 | CONFIG_BLK_DEV_MD=y |
| 706 | CONFIG_MD_LINEAR=y | 680 | CONFIG_MD_LINEAR=y |
| @@ -718,6 +692,7 @@ CONFIG_DM_MIRROR=m | |||
| 718 | CONFIG_DM_ZERO=m | 692 | CONFIG_DM_ZERO=m |
| 719 | CONFIG_DM_MULTIPATH=m | 693 | CONFIG_DM_MULTIPATH=m |
| 720 | CONFIG_DM_MULTIPATH_EMC=m | 694 | CONFIG_DM_MULTIPATH_EMC=m |
| 695 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
| 721 | # CONFIG_DM_DELAY is not set | 696 | # CONFIG_DM_DELAY is not set |
| 722 | 697 | ||
| 723 | # | 698 | # |
| @@ -733,27 +708,17 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
| 733 | # | 708 | # |
| 734 | # CONFIG_FIREWIRE is not set | 709 | # CONFIG_FIREWIRE is not set |
| 735 | # CONFIG_IEEE1394 is not set | 710 | # CONFIG_IEEE1394 is not set |
| 736 | |||
| 737 | # | ||
| 738 | # I2O device support | ||
| 739 | # | ||
| 740 | # CONFIG_I2O is not set | 711 | # CONFIG_I2O is not set |
| 741 | # CONFIG_MACINTOSH_DRIVERS is not set | 712 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 742 | |||
| 743 | # | ||
| 744 | # Network device support | ||
| 745 | # | ||
| 746 | CONFIG_NETDEVICES=y | 713 | CONFIG_NETDEVICES=y |
| 714 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 747 | CONFIG_DUMMY=m | 715 | CONFIG_DUMMY=m |
| 748 | CONFIG_BONDING=m | 716 | CONFIG_BONDING=m |
| 717 | # CONFIG_MACVLAN is not set | ||
| 749 | # CONFIG_EQUALIZER is not set | 718 | # CONFIG_EQUALIZER is not set |
| 750 | CONFIG_TUN=m | 719 | CONFIG_TUN=m |
| 751 | # CONFIG_ARCNET is not set | 720 | # CONFIG_ARCNET is not set |
| 752 | # CONFIG_PHYLIB is not set | 721 | # CONFIG_PHYLIB is not set |
| 753 | |||
| 754 | # | ||
| 755 | # Ethernet (10 or 100Mbit) | ||
| 756 | # | ||
| 757 | CONFIG_NET_ETHERNET=y | 722 | CONFIG_NET_ETHERNET=y |
| 758 | CONFIG_MII=y | 723 | CONFIG_MII=y |
| 759 | # CONFIG_HAPPYMEAL is not set | 724 | # CONFIG_HAPPYMEAL is not set |
| @@ -762,10 +727,6 @@ CONFIG_MII=y | |||
| 762 | CONFIG_NET_VENDOR_3COM=y | 727 | CONFIG_NET_VENDOR_3COM=y |
| 763 | CONFIG_VORTEX=y | 728 | CONFIG_VORTEX=y |
| 764 | # CONFIG_TYPHOON is not set | 729 | # CONFIG_TYPHOON is not set |
| 765 | |||
| 766 | # | ||
| 767 | # Tulip family network device support | ||
| 768 | # | ||
| 769 | # CONFIG_NET_TULIP is not set | 730 | # CONFIG_NET_TULIP is not set |
| 770 | # CONFIG_HP100 is not set | 731 | # CONFIG_HP100 is not set |
| 771 | CONFIG_IBMVETH=y | 732 | CONFIG_IBMVETH=y |
| @@ -804,7 +765,6 @@ CONFIG_E1000=y | |||
| 804 | # CONFIG_SIS190 is not set | 765 | # CONFIG_SIS190 is not set |
| 805 | # CONFIG_SKGE is not set | 766 | # CONFIG_SKGE is not set |
| 806 | # CONFIG_SKY2 is not set | 767 | # CONFIG_SKY2 is not set |
| 807 | # CONFIG_SK98LIN is not set | ||
| 808 | # CONFIG_VIA_VELOCITY is not set | 768 | # CONFIG_VIA_VELOCITY is not set |
| 809 | CONFIG_TIGON3=y | 769 | CONFIG_TIGON3=y |
| 810 | # CONFIG_BNX2 is not set | 770 | # CONFIG_BNX2 is not set |
| @@ -855,6 +815,7 @@ CONFIG_PPP_DEFLATE=m | |||
| 855 | CONFIG_PPP_BSDCOMP=m | 815 | CONFIG_PPP_BSDCOMP=m |
| 856 | # CONFIG_PPP_MPPE is not set | 816 | # CONFIG_PPP_MPPE is not set |
| 857 | CONFIG_PPPOE=m | 817 | CONFIG_PPPOE=m |
| 818 | # CONFIG_PPPOL2TP is not set | ||
| 858 | # CONFIG_SLIP is not set | 819 | # CONFIG_SLIP is not set |
| 859 | CONFIG_SLHC=m | 820 | CONFIG_SLHC=m |
| 860 | # CONFIG_NET_FC is not set | 821 | # CONFIG_NET_FC is not set |
| @@ -863,15 +824,7 @@ CONFIG_NETCONSOLE=y | |||
| 863 | CONFIG_NETPOLL=y | 824 | CONFIG_NETPOLL=y |
| 864 | CONFIG_NETPOLL_TRAP=y | 825 | CONFIG_NETPOLL_TRAP=y |
| 865 | CONFIG_NET_POLL_CONTROLLER=y | 826 | CONFIG_NET_POLL_CONTROLLER=y |
| 866 | |||
| 867 | # | ||
| 868 | # ISDN subsystem | ||
| 869 | # | ||
| 870 | # CONFIG_ISDN is not set | 827 | # CONFIG_ISDN is not set |
| 871 | |||
| 872 | # | ||
| 873 | # Telephony Support | ||
| 874 | # | ||
| 875 | # CONFIG_PHONE is not set | 828 | # CONFIG_PHONE is not set |
| 876 | 829 | ||
| 877 | # | 830 | # |
| @@ -975,10 +928,6 @@ CONFIG_HVC_DRIVER=y | |||
| 975 | CONFIG_HVC_CONSOLE=y | 928 | CONFIG_HVC_CONSOLE=y |
| 976 | CONFIG_HVC_RTAS=y | 929 | CONFIG_HVC_RTAS=y |
| 977 | CONFIG_HVCS=m | 930 | CONFIG_HVCS=m |
| 978 | |||
| 979 | # | ||
| 980 | # IPMI | ||
| 981 | # | ||
| 982 | # CONFIG_IPMI_HANDLER is not set | 931 | # CONFIG_IPMI_HANDLER is not set |
| 983 | # CONFIG_WATCHDOG is not set | 932 | # CONFIG_WATCHDOG is not set |
| 984 | # CONFIG_HW_RANDOM is not set | 933 | # CONFIG_HW_RANDOM is not set |
| @@ -991,10 +940,6 @@ CONFIG_GEN_RTC=y | |||
| 991 | CONFIG_RAW_DRIVER=y | 940 | CONFIG_RAW_DRIVER=y |
| 992 | CONFIG_MAX_RAW_DEVS=1024 | 941 | CONFIG_MAX_RAW_DEVS=1024 |
| 993 | # CONFIG_HANGCHECK_TIMER is not set | 942 | # CONFIG_HANGCHECK_TIMER is not set |
| 994 | |||
| 995 | # | ||
| 996 | # TPM devices | ||
| 997 | # | ||
| 998 | # CONFIG_TCG_TPM is not set | 943 | # CONFIG_TCG_TPM is not set |
| 999 | CONFIG_DEVPORT=y | 944 | CONFIG_DEVPORT=y |
| 1000 | CONFIG_I2C=y | 945 | CONFIG_I2C=y |
| @@ -1029,6 +974,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1029 | # CONFIG_I2C_SIS5595 is not set | 974 | # CONFIG_I2C_SIS5595 is not set |
| 1030 | # CONFIG_I2C_SIS630 is not set | 975 | # CONFIG_I2C_SIS630 is not set |
| 1031 | # CONFIG_I2C_SIS96X is not set | 976 | # CONFIG_I2C_SIS96X is not set |
| 977 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1032 | # CONFIG_I2C_STUB is not set | 978 | # CONFIG_I2C_STUB is not set |
| 1033 | # CONFIG_I2C_TINY_USB is not set | 979 | # CONFIG_I2C_TINY_USB is not set |
| 1034 | # CONFIG_I2C_VIA is not set | 980 | # CONFIG_I2C_VIA is not set |
| @@ -1040,11 +986,13 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1040 | # | 986 | # |
| 1041 | # CONFIG_SENSORS_DS1337 is not set | 987 | # CONFIG_SENSORS_DS1337 is not set |
| 1042 | # CONFIG_SENSORS_DS1374 is not set | 988 | # CONFIG_SENSORS_DS1374 is not set |
| 989 | # CONFIG_DS1682 is not set | ||
| 1043 | # CONFIG_SENSORS_EEPROM is not set | 990 | # CONFIG_SENSORS_EEPROM is not set |
| 1044 | # CONFIG_SENSORS_PCF8574 is not set | 991 | # CONFIG_SENSORS_PCF8574 is not set |
| 1045 | # CONFIG_SENSORS_PCA9539 is not set | 992 | # CONFIG_SENSORS_PCA9539 is not set |
| 1046 | # CONFIG_SENSORS_PCF8591 is not set | 993 | # CONFIG_SENSORS_PCF8591 is not set |
| 1047 | # CONFIG_SENSORS_MAX6875 is not set | 994 | # CONFIG_SENSORS_MAX6875 is not set |
| 995 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1048 | # CONFIG_I2C_DEBUG_CORE is not set | 996 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1049 | # CONFIG_I2C_DEBUG_ALGO is not set | 997 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1050 | # CONFIG_I2C_DEBUG_BUS is not set | 998 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -1055,11 +1003,8 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1055 | # | 1003 | # |
| 1056 | # CONFIG_SPI is not set | 1004 | # CONFIG_SPI is not set |
| 1057 | # CONFIG_SPI_MASTER is not set | 1005 | # CONFIG_SPI_MASTER is not set |
| 1058 | |||
| 1059 | # | ||
| 1060 | # Dallas's 1-wire bus | ||
| 1061 | # | ||
| 1062 | # CONFIG_W1 is not set | 1006 | # CONFIG_W1 is not set |
| 1007 | # CONFIG_POWER_SUPPLY is not set | ||
| 1063 | # CONFIG_HWMON is not set | 1008 | # CONFIG_HWMON is not set |
| 1064 | 1009 | ||
| 1065 | # | 1010 | # |
| @@ -1078,8 +1023,8 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1078 | # Graphics support | 1023 | # Graphics support |
| 1079 | # | 1024 | # |
| 1080 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1025 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 1081 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1082 | CONFIG_LCD_CLASS_DEVICE=m | 1026 | CONFIG_LCD_CLASS_DEVICE=m |
| 1027 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1083 | 1028 | ||
| 1084 | # | 1029 | # |
| 1085 | # Display device support | 1030 | # Display device support |
| @@ -1090,6 +1035,7 @@ CONFIG_DISPLAY_SUPPORT=y | |||
| 1090 | # Display hardware drivers | 1035 | # Display hardware drivers |
| 1091 | # | 1036 | # |
| 1092 | # CONFIG_VGASTATE is not set | 1037 | # CONFIG_VGASTATE is not set |
| 1038 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1093 | CONFIG_FB=y | 1039 | CONFIG_FB=y |
| 1094 | CONFIG_FIRMWARE_EDID=y | 1040 | CONFIG_FIRMWARE_EDID=y |
| 1095 | CONFIG_FB_DDC=y | 1041 | CONFIG_FB_DDC=y |
| @@ -1152,6 +1098,7 @@ CONFIG_FB_IBM_GXT4500=y | |||
| 1152 | # CONFIG_VGA_CONSOLE is not set | 1098 | # CONFIG_VGA_CONSOLE is not set |
| 1153 | CONFIG_DUMMY_CONSOLE=y | 1099 | CONFIG_DUMMY_CONSOLE=y |
| 1154 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1100 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1101 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1155 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1102 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1156 | # CONFIG_FONTS is not set | 1103 | # CONFIG_FONTS is not set |
| 1157 | CONFIG_FONT_8x8=y | 1104 | CONFIG_FONT_8x8=y |
| @@ -1165,10 +1112,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 1165 | # Sound | 1112 | # Sound |
| 1166 | # | 1113 | # |
| 1167 | # CONFIG_SOUND is not set | 1114 | # CONFIG_SOUND is not set |
| 1168 | 1115 | CONFIG_HID_SUPPORT=y | |
| 1169 | # | ||
| 1170 | # HID Devices | ||
| 1171 | # | ||
| 1172 | CONFIG_HID=y | 1116 | CONFIG_HID=y |
| 1173 | # CONFIG_HID_DEBUG is not set | 1117 | # CONFIG_HID_DEBUG is not set |
| 1174 | 1118 | ||
| @@ -1179,10 +1123,7 @@ CONFIG_USB_HID=y | |||
| 1179 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1123 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1180 | # CONFIG_HID_FF is not set | 1124 | # CONFIG_HID_FF is not set |
| 1181 | CONFIG_USB_HIDDEV=y | 1125 | CONFIG_USB_HIDDEV=y |
| 1182 | 1126 | CONFIG_USB_SUPPORT=y | |
| 1183 | # | ||
| 1184 | # USB support | ||
| 1185 | # | ||
| 1186 | CONFIG_USB_ARCH_HAS_HCD=y | 1127 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1187 | CONFIG_USB_ARCH_HAS_OHCI=y | 1128 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1188 | CONFIG_USB_ARCH_HAS_EHCI=y | 1129 | CONFIG_USB_ARCH_HAS_EHCI=y |
| @@ -1204,7 +1145,6 @@ CONFIG_USB_EHCI_HCD=y | |||
| 1204 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 1145 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
| 1205 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1146 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1206 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1147 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1207 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
| 1208 | # CONFIG_USB_ISP116X_HCD is not set | 1148 | # CONFIG_USB_ISP116X_HCD is not set |
| 1209 | CONFIG_USB_OHCI_HCD=y | 1149 | CONFIG_USB_OHCI_HCD=y |
| 1210 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1150 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| @@ -1213,6 +1153,7 @@ CONFIG_USB_OHCI_HCD=y | |||
| 1213 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1153 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1214 | # CONFIG_USB_UHCI_HCD is not set | 1154 | # CONFIG_USB_UHCI_HCD is not set |
| 1215 | # CONFIG_USB_SL811_HCD is not set | 1155 | # CONFIG_USB_SL811_HCD is not set |
| 1156 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1216 | 1157 | ||
| 1217 | # | 1158 | # |
| 1218 | # USB Device Class drivers | 1159 | # USB Device Class drivers |
| @@ -1291,23 +1232,7 @@ CONFIG_USB_MON=y | |||
| 1291 | # | 1232 | # |
| 1292 | # CONFIG_USB_GADGET is not set | 1233 | # CONFIG_USB_GADGET is not set |
| 1293 | # CONFIG_MMC is not set | 1234 | # CONFIG_MMC is not set |
| 1294 | |||
| 1295 | # | ||
| 1296 | # LED devices | ||
| 1297 | # | ||
| 1298 | # CONFIG_NEW_LEDS is not set | 1235 | # CONFIG_NEW_LEDS is not set |
| 1299 | |||
| 1300 | # | ||
| 1301 | # LED drivers | ||
| 1302 | # | ||
| 1303 | |||
| 1304 | # | ||
| 1305 | # LED Triggers | ||
| 1306 | # | ||
| 1307 | |||
| 1308 | # | ||
| 1309 | # InfiniBand support | ||
| 1310 | # | ||
| 1311 | CONFIG_INFINIBAND=m | 1236 | CONFIG_INFINIBAND=m |
| 1312 | CONFIG_INFINIBAND_USER_MAD=m | 1237 | CONFIG_INFINIBAND_USER_MAD=m |
| 1313 | CONFIG_INFINIBAND_USER_ACCESS=m | 1238 | CONFIG_INFINIBAND_USER_ACCESS=m |
| @@ -1325,14 +1250,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
| 1325 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | 1250 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set |
| 1326 | CONFIG_INFINIBAND_SRP=m | 1251 | CONFIG_INFINIBAND_SRP=m |
| 1327 | # CONFIG_INFINIBAND_ISER is not set | 1252 | # CONFIG_INFINIBAND_ISER is not set |
| 1328 | 1253 | # CONFIG_EDAC is not set | |
| 1329 | # | ||
| 1330 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
| 1331 | # | ||
| 1332 | |||
| 1333 | # | ||
| 1334 | # Real Time Clock | ||
| 1335 | # | ||
| 1336 | # CONFIG_RTC_CLASS is not set | 1254 | # CONFIG_RTC_CLASS is not set |
| 1337 | 1255 | ||
| 1338 | # | 1256 | # |
| @@ -1347,11 +1265,12 @@ CONFIG_INFINIBAND_SRP=m | |||
| 1347 | # | 1265 | # |
| 1348 | # DMA Devices | 1266 | # DMA Devices |
| 1349 | # | 1267 | # |
| 1268 | # CONFIG_AUXDISPLAY is not set | ||
| 1350 | 1269 | ||
| 1351 | # | 1270 | # |
| 1352 | # Auxiliary Display support | 1271 | # Userspace I/O |
| 1353 | # | 1272 | # |
| 1354 | # CONFIG_KS0108 is not set | 1273 | # CONFIG_UIO is not set |
| 1355 | 1274 | ||
| 1356 | # | 1275 | # |
| 1357 | # File systems | 1276 | # File systems |
| @@ -1485,7 +1404,6 @@ CONFIG_CIFS_POSIX=y | |||
| 1485 | # CONFIG_NCP_FS is not set | 1404 | # CONFIG_NCP_FS is not set |
| 1486 | # CONFIG_CODA_FS is not set | 1405 | # CONFIG_CODA_FS is not set |
| 1487 | # CONFIG_AFS_FS is not set | 1406 | # CONFIG_AFS_FS is not set |
| 1488 | # CONFIG_9P_FS is not set | ||
| 1489 | 1407 | ||
| 1490 | # | 1408 | # |
| 1491 | # Partition Types | 1409 | # Partition Types |
| @@ -1551,6 +1469,7 @@ CONFIG_CRC_CCITT=m | |||
| 1551 | # CONFIG_CRC16 is not set | 1469 | # CONFIG_CRC16 is not set |
| 1552 | # CONFIG_CRC_ITU_T is not set | 1470 | # CONFIG_CRC_ITU_T is not set |
| 1553 | CONFIG_CRC32=y | 1471 | CONFIG_CRC32=y |
| 1472 | # CONFIG_CRC7 is not set | ||
| 1554 | CONFIG_LIBCRC32C=m | 1473 | CONFIG_LIBCRC32C=m |
| 1555 | CONFIG_ZLIB_INFLATE=y | 1474 | CONFIG_ZLIB_INFLATE=y |
| 1556 | CONFIG_ZLIB_DEFLATE=m | 1475 | CONFIG_ZLIB_DEFLATE=m |
| @@ -1582,6 +1501,7 @@ CONFIG_DEBUG_FS=y | |||
| 1582 | CONFIG_DEBUG_KERNEL=y | 1501 | CONFIG_DEBUG_KERNEL=y |
| 1583 | # CONFIG_DEBUG_SHIRQ is not set | 1502 | # CONFIG_DEBUG_SHIRQ is not set |
| 1584 | CONFIG_DETECT_SOFTLOCKUP=y | 1503 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1504 | CONFIG_SCHED_DEBUG=y | ||
| 1585 | # CONFIG_SCHEDSTATS is not set | 1505 | # CONFIG_SCHEDSTATS is not set |
| 1586 | # CONFIG_TIMER_STATS is not set | 1506 | # CONFIG_TIMER_STATS is not set |
| 1587 | # CONFIG_DEBUG_SLAB is not set | 1507 | # CONFIG_DEBUG_SLAB is not set |
| @@ -1617,10 +1537,6 @@ CONFIG_IRQSTACKS=y | |||
| 1617 | # | 1537 | # |
| 1618 | # CONFIG_KEYS is not set | 1538 | # CONFIG_KEYS is not set |
| 1619 | # CONFIG_SECURITY is not set | 1539 | # CONFIG_SECURITY is not set |
| 1620 | |||
| 1621 | # | ||
| 1622 | # Cryptographic options | ||
| 1623 | # | ||
| 1624 | CONFIG_CRYPTO=y | 1540 | CONFIG_CRYPTO=y |
| 1625 | CONFIG_CRYPTO_ALGAPI=y | 1541 | CONFIG_CRYPTO_ALGAPI=y |
| 1626 | CONFIG_CRYPTO_BLKCIPHER=y | 1542 | CONFIG_CRYPTO_BLKCIPHER=y |
| @@ -1660,7 +1576,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
| 1660 | CONFIG_CRYPTO_CRC32C=m | 1576 | CONFIG_CRYPTO_CRC32C=m |
| 1661 | # CONFIG_CRYPTO_CAMELLIA is not set | 1577 | # CONFIG_CRYPTO_CAMELLIA is not set |
| 1662 | CONFIG_CRYPTO_TEST=m | 1578 | CONFIG_CRYPTO_TEST=m |
| 1663 | 1579 | # CONFIG_CRYPTO_HW is not set | |
| 1664 | # | ||
| 1665 | # Hardware crypto devices | ||
| 1666 | # | ||
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index a83727b308a0..e477c9d0498b 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -83,7 +83,7 @@ void flush_fp_to_thread(struct task_struct *tsk) | |||
| 83 | */ | 83 | */ |
| 84 | BUG_ON(tsk != current); | 84 | BUG_ON(tsk != current); |
| 85 | #endif | 85 | #endif |
| 86 | giveup_fpu(current); | 86 | giveup_fpu(tsk); |
| 87 | } | 87 | } |
| 88 | preempt_enable(); | 88 | preempt_enable(); |
| 89 | } | 89 | } |
| @@ -143,7 +143,7 @@ void flush_altivec_to_thread(struct task_struct *tsk) | |||
| 143 | #ifdef CONFIG_SMP | 143 | #ifdef CONFIG_SMP |
| 144 | BUG_ON(tsk != current); | 144 | BUG_ON(tsk != current); |
| 145 | #endif | 145 | #endif |
| 146 | giveup_altivec(current); | 146 | giveup_altivec(tsk); |
| 147 | } | 147 | } |
| 148 | preempt_enable(); | 148 | preempt_enable(); |
| 149 | } | 149 | } |
| @@ -182,7 +182,7 @@ void flush_spe_to_thread(struct task_struct *tsk) | |||
| 182 | #ifdef CONFIG_SMP | 182 | #ifdef CONFIG_SMP |
| 183 | BUG_ON(tsk != current); | 183 | BUG_ON(tsk != current); |
| 184 | #endif | 184 | #endif |
| 185 | giveup_spe(current); | 185 | giveup_spe(tsk); |
| 186 | } | 186 | } |
| 187 | preempt_enable(); | 187 | preempt_enable(); |
| 188 | } | 188 | } |
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c index 7c0668a9dcc7..0e14f532500e 100644 --- a/arch/powerpc/platforms/cell/spu_manage.c +++ b/arch/powerpc/platforms/cell/spu_manage.c | |||
| @@ -48,10 +48,18 @@ static u64 __init find_spu_unit_number(struct device_node *spe) | |||
| 48 | { | 48 | { |
| 49 | const unsigned int *prop; | 49 | const unsigned int *prop; |
| 50 | int proplen; | 50 | int proplen; |
| 51 | |||
| 52 | /* new device trees should provide the physical-id attribute */ | ||
| 51 | prop = of_get_property(spe, "physical-id", &proplen); | 53 | prop = of_get_property(spe, "physical-id", &proplen); |
| 52 | if (proplen == 4) | 54 | if (proplen == 4) |
| 53 | return (u64)*prop; | 55 | return (u64)*prop; |
| 54 | 56 | ||
| 57 | /* celleb device tree provides the unit-id */ | ||
| 58 | prop = of_get_property(spe, "unit-id", &proplen); | ||
| 59 | if (proplen == 4) | ||
| 60 | return (u64)*prop; | ||
| 61 | |||
| 62 | /* legacy device trees provide the id in the reg attribute */ | ||
| 55 | prop = of_get_property(spe, "reg", &proplen); | 63 | prop = of_get_property(spe, "reg", &proplen); |
| 56 | if (proplen == 4) | 64 | if (proplen == 4) |
| 57 | return (u64)*prop; | 65 | return (u64)*prop; |
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c index 07a0e815abf5..ec01214e51ee 100644 --- a/arch/powerpc/platforms/cell/spufs/backing_ops.c +++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c | |||
| @@ -162,7 +162,8 @@ static int spu_backing_wbox_write(struct spu_context *ctx, u32 data) | |||
| 162 | BUG_ON(avail != (4 - slot)); | 162 | BUG_ON(avail != (4 - slot)); |
| 163 | ctx->csa.spu_mailbox_data[slot] = data; | 163 | ctx->csa.spu_mailbox_data[slot] = data; |
| 164 | ctx->csa.spu_chnlcnt_RW[29] = ++slot; | 164 | ctx->csa.spu_chnlcnt_RW[29] = ++slot; |
| 165 | ctx->csa.prob.mb_stat_R = (((4 - slot) & 0xff) << 8); | 165 | ctx->csa.prob.mb_stat_R &= ~(0x00ff00); |
| 166 | ctx->csa.prob.mb_stat_R |= (((4 - slot) & 0xff) << 8); | ||
| 166 | gen_spu_event(ctx, MFC_SPU_MAILBOX_WRITTEN_EVENT); | 167 | gen_spu_event(ctx, MFC_SPU_MAILBOX_WRITTEN_EVENT); |
| 167 | ret = 4; | 168 | ret = 4; |
| 168 | } else { | 169 | } else { |
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index 6abdd8fe2098..958f10e90fdd 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
| @@ -193,11 +193,7 @@ static int spu_reacquire_runnable(struct spu_context *ctx, u32 *npc, | |||
| 193 | if (ret) | 193 | if (ret) |
| 194 | return ret; | 194 | return ret; |
| 195 | 195 | ||
| 196 | ret = spu_run_init(ctx, npc); | 196 | spuctx_switch_state(ctx, SPU_UTIL_USER); |
| 197 | if (ret) { | ||
| 198 | spu_release(ctx); | ||
| 199 | return ret; | ||
| 200 | } | ||
| 201 | return 0; | 197 | return 0; |
| 202 | } | 198 | } |
| 203 | 199 | ||
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index 2952b22f1c84..609945dbe394 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c | |||
| @@ -63,7 +63,8 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev) | |||
| 63 | x.minor = minor; | 63 | x.minor = minor; |
| 64 | x.rev = rev; | 64 | x.rev = rev; |
| 65 | 65 | ||
| 66 | return (ps3_firmware_version.raw - x.raw); | 66 | return (ps3_firmware_version.raw > x.raw) - |
| 67 | (ps3_firmware_version.raw < x.raw); | ||
| 67 | } | 68 | } |
| 68 | EXPORT_SYMBOL_GPL(ps3_compare_firmware_version); | 69 | EXPORT_SYMBOL_GPL(ps3_compare_firmware_version); |
| 69 | 70 | ||
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 384abf410cf0..23956096b3bf 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
| @@ -217,8 +217,27 @@ struct irq_handler_data { | |||
| 217 | void (*pre_handler)(unsigned int, void *, void *); | 217 | void (*pre_handler)(unsigned int, void *, void *); |
| 218 | void *pre_handler_arg1; | 218 | void *pre_handler_arg1; |
| 219 | void *pre_handler_arg2; | 219 | void *pre_handler_arg2; |
| 220 | |||
| 221 | u32 msi; | ||
| 220 | }; | 222 | }; |
| 221 | 223 | ||
| 224 | void sparc64_set_msi(unsigned int virt_irq, u32 msi) | ||
| 225 | { | ||
| 226 | struct irq_handler_data *data = get_irq_chip_data(virt_irq); | ||
| 227 | |||
| 228 | if (data) | ||
| 229 | data->msi = msi; | ||
| 230 | } | ||
| 231 | |||
| 232 | u32 sparc64_get_msi(unsigned int virt_irq) | ||
| 233 | { | ||
| 234 | struct irq_handler_data *data = get_irq_chip_data(virt_irq); | ||
| 235 | |||
| 236 | if (data) | ||
| 237 | return data->msi; | ||
| 238 | return 0xffffffff; | ||
| 239 | } | ||
| 240 | |||
| 222 | static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq) | 241 | static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq) |
| 223 | { | 242 | { |
| 224 | unsigned int real_irq = virt_to_real_irq(virt_irq); | 243 | unsigned int real_irq = virt_to_real_irq(virt_irq); |
| @@ -308,7 +327,7 @@ static void sun4u_irq_disable(unsigned int virt_irq) | |||
| 308 | 327 | ||
| 309 | if (likely(data)) { | 328 | if (likely(data)) { |
| 310 | unsigned long imap = data->imap; | 329 | unsigned long imap = data->imap; |
| 311 | u32 tmp = upa_readq(imap); | 330 | unsigned long tmp = upa_readq(imap); |
| 312 | 331 | ||
| 313 | tmp &= ~IMAP_VALID; | 332 | tmp &= ~IMAP_VALID; |
| 314 | upa_writeq(tmp, imap); | 333 | upa_writeq(tmp, imap); |
| @@ -741,7 +760,7 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, | |||
| 741 | break; | 760 | break; |
| 742 | } | 761 | } |
| 743 | if (devino >= msi_end) | 762 | if (devino >= msi_end) |
| 744 | return 0; | 763 | return -ENOSPC; |
| 745 | 764 | ||
| 746 | sysino = sun4v_devino_to_sysino(devhandle, devino); | 765 | sysino = sun4v_devino_to_sysino(devhandle, devino); |
| 747 | bucket = &ivector_table[sysino]; | 766 | bucket = &ivector_table[sysino]; |
| @@ -755,8 +774,8 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, | |||
| 755 | 774 | ||
| 756 | data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC); | 775 | data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC); |
| 757 | if (unlikely(!data)) { | 776 | if (unlikely(!data)) { |
| 758 | prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n"); | 777 | virt_irq_free(*virt_irq_p); |
| 759 | prom_halt(); | 778 | return -ENOMEM; |
| 760 | } | 779 | } |
| 761 | set_irq_chip_data(bucket->virt_irq, data); | 780 | set_irq_chip_data(bucket->virt_irq, data); |
| 762 | 781 | ||
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 3d93e9203ba2..139b4cff8019 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c | |||
| @@ -393,7 +393,6 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, | |||
| 393 | sd->host_controller = pbm; | 393 | sd->host_controller = pbm; |
| 394 | sd->prom_node = node; | 394 | sd->prom_node = node; |
| 395 | sd->op = of_find_device_by_node(node); | 395 | sd->op = of_find_device_by_node(node); |
| 396 | sd->msi_num = 0xffffffff; | ||
| 397 | 396 | ||
| 398 | sd = &sd->op->dev.archdata; | 397 | sd = &sd->op->dev.archdata; |
| 399 | sd->iommu = pbm->iommu; | 398 | sd->iommu = pbm->iommu; |
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index 466f4aa8fc82..da724b13e89e 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
| @@ -940,13 +940,13 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p, | |||
| 940 | if (msi_num < 0) | 940 | if (msi_num < 0) |
| 941 | return msi_num; | 941 | return msi_num; |
| 942 | 942 | ||
| 943 | devino = sun4v_build_msi(pbm->devhandle, virt_irq_p, | 943 | err = sun4v_build_msi(pbm->devhandle, virt_irq_p, |
| 944 | pbm->msiq_first_devino, | 944 | pbm->msiq_first_devino, |
| 945 | (pbm->msiq_first_devino + | 945 | (pbm->msiq_first_devino + |
| 946 | pbm->msiq_num)); | 946 | pbm->msiq_num)); |
| 947 | err = -ENOMEM; | 947 | if (err < 0) |
| 948 | if (!devino) | ||
| 949 | goto out_err; | 948 | goto out_err; |
| 949 | devino = err; | ||
| 950 | 950 | ||
| 951 | msiqid = ((devino - pbm->msiq_first_devino) + | 951 | msiqid = ((devino - pbm->msiq_first_devino) + |
| 952 | pbm->msiq_first); | 952 | pbm->msiq_first); |
| @@ -971,7 +971,7 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p, | |||
| 971 | if (pci_sun4v_msi_setvalid(pbm->devhandle, msi_num, HV_MSIVALID_VALID)) | 971 | if (pci_sun4v_msi_setvalid(pbm->devhandle, msi_num, HV_MSIVALID_VALID)) |
| 972 | goto out_err; | 972 | goto out_err; |
| 973 | 973 | ||
| 974 | pdev->dev.archdata.msi_num = msi_num; | 974 | sparc64_set_msi(*virt_irq_p, msi_num); |
| 975 | 975 | ||
| 976 | if (entry->msi_attrib.is_64) { | 976 | if (entry->msi_attrib.is_64) { |
| 977 | msg.address_hi = pbm->msi64_start >> 32; | 977 | msg.address_hi = pbm->msi64_start >> 32; |
| @@ -993,8 +993,6 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p, | |||
| 993 | 993 | ||
| 994 | out_err: | 994 | out_err: |
| 995 | free_msi(pbm, msi_num); | 995 | free_msi(pbm, msi_num); |
| 996 | sun4v_destroy_msi(*virt_irq_p); | ||
| 997 | *virt_irq_p = 0; | ||
| 998 | return err; | 996 | return err; |
| 999 | 997 | ||
| 1000 | } | 998 | } |
| @@ -1006,7 +1004,7 @@ static void pci_sun4v_teardown_msi_irq(unsigned int virt_irq, | |||
| 1006 | unsigned long msiqid, err; | 1004 | unsigned long msiqid, err; |
| 1007 | unsigned int msi_num; | 1005 | unsigned int msi_num; |
| 1008 | 1006 | ||
| 1009 | msi_num = pdev->dev.archdata.msi_num; | 1007 | msi_num = sparc64_get_msi(virt_irq); |
| 1010 | err = pci_sun4v_msi_getmsiq(pbm->devhandle, msi_num, &msiqid); | 1008 | err = pci_sun4v_msi_getmsiq(pbm->devhandle, msi_num, &msiqid); |
| 1011 | if (err) { | 1009 | if (err) { |
| 1012 | printk(KERN_ERR "%s: getmsiq gives error %lu\n", | 1010 | printk(KERN_ERR "%s: getmsiq gives error %lu\n", |
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c index eaba9b70b184..6cfab2e4d340 100644 --- a/arch/sparc64/mm/hugetlbpage.c +++ b/arch/sparc64/mm/hugetlbpage.c | |||
| @@ -175,7 +175,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
| 175 | return -ENOMEM; | 175 | return -ENOMEM; |
| 176 | 176 | ||
| 177 | if (flags & MAP_FIXED) { | 177 | if (flags & MAP_FIXED) { |
| 178 | if (prepare_hugepage_range(addr, len, pgoff)) | 178 | if (prepare_hugepage_range(addr, len)) |
| 179 | return -EINVAL; | 179 | return -EINVAL; |
| 180 | return addr; | 180 | return addr; |
| 181 | } | 181 | } |
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 24547741b205..41850906116e 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S | |||
| @@ -71,11 +71,13 @@ SECTIONS | |||
| 71 | *(.gnu.warning) | 71 | *(.gnu.warning) |
| 72 | 72 | ||
| 73 | . = ALIGN(4096); | 73 | . = ALIGN(4096); |
| 74 | __syscall_stub_start = .; | ||
| 75 | *(.__syscall_stub*) | ||
| 76 | __syscall_stub_end = .; | ||
| 77 | . = ALIGN(4096); | ||
| 78 | } =0x90909090 | 74 | } =0x90909090 |
| 75 | . = ALIGN(4096); | ||
| 76 | .syscall_stub : { | ||
| 77 | __syscall_stub_start = .; | ||
| 78 | *(.__syscall_stub*) | ||
| 79 | __syscall_stub_end = .; | ||
| 80 | } | ||
| 79 | .fini : { | 81 | .fini : { |
| 80 | KEEP (*(.fini)) | 82 | KEEP (*(.fini)) |
| 81 | } =0x90909090 | 83 | } =0x90909090 |
| @@ -138,8 +140,8 @@ SECTIONS | |||
| 138 | .got : { *(.got.plt) *(.got) } | 140 | .got : { *(.got.plt) *(.got) } |
| 139 | _edata = .; | 141 | _edata = .; |
| 140 | PROVIDE (edata = .); | 142 | PROVIDE (edata = .); |
| 141 | __bss_start = .; | ||
| 142 | .bss : { | 143 | .bss : { |
| 144 | __bss_start = .; | ||
| 143 | *(.dynbss) | 145 | *(.dynbss) |
| 144 | *(.bss .bss.* .gnu.linkonce.b.*) | 146 | *(.bss .bss.* .gnu.linkonce.b.*) |
| 145 | *(COMMON) | 147 | *(COMMON) |
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index 307b9373676b..81acdc24348e 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S | |||
| @@ -44,12 +44,13 @@ SECTIONS | |||
| 44 | /* .gnu.warning sections are handled specially by elf32.em. */ | 44 | /* .gnu.warning sections are handled specially by elf32.em. */ |
| 45 | *(.gnu.warning) | 45 | *(.gnu.warning) |
| 46 | *(.gnu.linkonce.t*) | 46 | *(.gnu.linkonce.t*) |
| 47 | } | ||
| 47 | 48 | ||
| 48 | . = ALIGN(4096); | 49 | . = ALIGN(4096); |
| 49 | __syscall_stub_start = .; | 50 | .syscall_stub : { |
| 50 | *(.__syscall_stub*) | 51 | __syscall_stub_start = .; |
| 51 | __syscall_stub_end = .; | 52 | *(.__syscall_stub*) |
| 52 | . = ALIGN(4096); | 53 | __syscall_stub_end = .; |
| 53 | } | 54 | } |
| 54 | 55 | ||
| 55 | #include "asm/common.lds.S" | 56 | #include "asm/common.lds.S" |
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c index e6fc2179d1bc..9467315b8059 100644 --- a/arch/um/os-Linux/sys-x86_64/registers.c +++ b/arch/um/os-Linux/sys-x86_64/registers.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <errno.h> | 6 | #include <errno.h> |
| 7 | #include <sys/ptrace.h> | ||
| 7 | #include <string.h> | 8 | #include <string.h> |
| 8 | #include "ptrace_user.h" | 9 | #include "ptrace_user.h" |
| 9 | #include "uml-config.h" | 10 | #include "uml-config.h" |
| @@ -17,6 +18,20 @@ | |||
| 17 | static unsigned long exec_regs[MAX_REG_NR]; | 18 | static unsigned long exec_regs[MAX_REG_NR]; |
| 18 | static unsigned long exec_fp_regs[HOST_FP_SIZE]; | 19 | static unsigned long exec_fp_regs[HOST_FP_SIZE]; |
| 19 | 20 | ||
| 21 | int save_fp_registers(int pid, unsigned long *fp_regs) | ||
| 22 | { | ||
| 23 | if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0) | ||
| 24 | return -errno; | ||
| 25 | return 0; | ||
| 26 | } | ||
| 27 | |||
| 28 | int restore_fp_registers(int pid, unsigned long *fp_regs) | ||
| 29 | { | ||
| 30 | if(ptrace(PTRACE_SETFPREGS, pid, 0, fp_regs) < 0) | ||
| 31 | return -errno; | ||
| 32 | return 0; | ||
| 33 | } | ||
| 34 | |||
| 20 | void init_thread_registers(union uml_pt_regs *to) | 35 | void init_thread_registers(union uml_pt_regs *to) |
| 21 | { | 36 | { |
| 22 | memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs)); | 37 | memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs)); |
diff --git a/arch/um/sys-x86_64/ptrace.c b/arch/um/sys-x86_64/ptrace.c index 55b66e09a98c..1970d78aa528 100644 --- a/arch/um/sys-x86_64/ptrace.c +++ b/arch/um/sys-x86_64/ptrace.c | |||
| @@ -156,12 +156,6 @@ int is_syscall(unsigned long addr) | |||
| 156 | return(instr == 0x050f); | 156 | return(instr == 0x050f); |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu ) | ||
| 160 | { | ||
| 161 | panic("dump_fpu"); | ||
| 162 | return(1); | ||
| 163 | } | ||
| 164 | |||
| 165 | int get_fpregs(unsigned long buf, struct task_struct *child) | 159 | int get_fpregs(unsigned long buf, struct task_struct *child) |
| 166 | { | 160 | { |
| 167 | panic("get_fpregs"); | 161 | panic("get_fpregs"); |
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index e64f65c9d901..b091c5e35558 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig | |||
| @@ -201,7 +201,6 @@ CONFIG_PM=y | |||
| 201 | # CONFIG_PM_DEBUG is not set | 201 | # CONFIG_PM_DEBUG is not set |
| 202 | CONFIG_HIBERNATION=y | 202 | CONFIG_HIBERNATION=y |
| 203 | CONFIG_PM_STD_PARTITION="" | 203 | CONFIG_PM_STD_PARTITION="" |
| 204 | CONFIG_SUSPEND_SMP=y | ||
| 205 | 204 | ||
| 206 | # | 205 | # |
| 207 | # ACPI (Advanced Configuration and Power Interface) Support | 206 | # ACPI (Advanced Configuration and Power Interface) Support |
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index ce758bab95b1..dd498f1604e1 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init_task.h> | 30 | #include <linux/init_task.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/mqueue.h> | 32 | #include <linux/mqueue.h> |
| 33 | #include <linux/fs.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/pgtable.h> | 35 | #include <asm/pgtable.h> |
| 35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 43749c86861f..3f7935ab0cf5 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -886,7 +886,8 @@ int __init acpi_ec_ecdt_probe(void) | |||
| 886 | printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); | 886 | printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); |
| 887 | status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, | 887 | status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, |
| 888 | boot_ec, NULL); | 888 | boot_ec, NULL); |
| 889 | if (ACPI_FAILURE(status)) | 889 | /* Check that acpi_get_devices actually find something */ |
| 890 | if (ACPI_FAILURE(status) || !boot_ec->handle) | ||
| 890 | goto error; | 891 | goto error; |
| 891 | } | 892 | } |
| 892 | 893 | ||
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 430fcf4f9ef3..945466954724 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/libata.h> | 26 | #include <linux/libata.h> |
| 27 | 27 | ||
| 28 | #define DRV_NAME "ata_generic" | 28 | #define DRV_NAME "ata_generic" |
| 29 | #define DRV_VERSION "0.2.12" | 29 | #define DRV_VERSION "0.2.13" |
| 30 | 30 | ||
| 31 | /* | 31 | /* |
| 32 | * A generic parallel ATA driver using libata | 32 | * A generic parallel ATA driver using libata |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 071d274afaab..3b8bf1812dc8 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | #include <linux/dmi.h> | 94 | #include <linux/dmi.h> |
| 95 | 95 | ||
| 96 | #define DRV_NAME "ata_piix" | 96 | #define DRV_NAME "ata_piix" |
| 97 | #define DRV_VERSION "2.11" | 97 | #define DRV_VERSION "2.12" |
| 98 | 98 | ||
| 99 | enum { | 99 | enum { |
| 100 | PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ | 100 | PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ |
| @@ -130,6 +130,7 @@ enum { | |||
| 130 | ich6m_sata_ahci = 8, | 130 | ich6m_sata_ahci = 8, |
| 131 | ich8_sata_ahci = 9, | 131 | ich8_sata_ahci = 9, |
| 132 | piix_pata_mwdma = 10, /* PIIX3 MWDMA only */ | 132 | piix_pata_mwdma = 10, /* PIIX3 MWDMA only */ |
| 133 | tolapai_sata_ahci = 11, | ||
| 133 | 134 | ||
| 134 | /* constants for mapping table */ | 135 | /* constants for mapping table */ |
| 135 | P0 = 0, /* port 0 */ | 136 | P0 = 0, /* port 0 */ |
| @@ -253,6 +254,8 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
| 253 | { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci }, | 254 | { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci }, |
| 254 | /* SATA Controller IDE (ICH9M) */ | 255 | /* SATA Controller IDE (ICH9M) */ |
| 255 | { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci }, | 256 | { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci }, |
| 257 | /* SATA Controller IDE (Tolapai) */ | ||
| 258 | { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci }, | ||
| 256 | 259 | ||
| 257 | { } /* terminate list */ | 260 | { } /* terminate list */ |
| 258 | }; | 261 | }; |
| @@ -441,12 +444,25 @@ static const struct piix_map_db ich8_map_db = { | |||
| 441 | }, | 444 | }, |
| 442 | }; | 445 | }; |
| 443 | 446 | ||
| 447 | static const struct piix_map_db tolapai_map_db = { | ||
| 448 | .mask = 0x3, | ||
| 449 | .port_enable = 0x3, | ||
| 450 | .map = { | ||
| 451 | /* PM PS SM SS MAP */ | ||
| 452 | { P0, NA, P1, NA }, /* 00b */ | ||
| 453 | { RV, RV, RV, RV }, /* 01b */ | ||
| 454 | { RV, RV, RV, RV }, /* 10b */ | ||
| 455 | { RV, RV, RV, RV }, | ||
| 456 | }, | ||
| 457 | }; | ||
| 458 | |||
| 444 | static const struct piix_map_db *piix_map_db_table[] = { | 459 | static const struct piix_map_db *piix_map_db_table[] = { |
| 445 | [ich5_sata] = &ich5_map_db, | 460 | [ich5_sata] = &ich5_map_db, |
| 446 | [ich6_sata] = &ich6_map_db, | 461 | [ich6_sata] = &ich6_map_db, |
| 447 | [ich6_sata_ahci] = &ich6_map_db, | 462 | [ich6_sata_ahci] = &ich6_map_db, |
| 448 | [ich6m_sata_ahci] = &ich6m_map_db, | 463 | [ich6m_sata_ahci] = &ich6m_map_db, |
| 449 | [ich8_sata_ahci] = &ich8_map_db, | 464 | [ich8_sata_ahci] = &ich8_map_db, |
| 465 | [tolapai_sata_ahci] = &tolapai_map_db, | ||
| 450 | }; | 466 | }; |
| 451 | 467 | ||
| 452 | static struct ata_port_info piix_port_info[] = { | 468 | static struct ata_port_info piix_port_info[] = { |
| @@ -560,6 +576,17 @@ static struct ata_port_info piix_port_info[] = { | |||
| 560 | .mwdma_mask = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */ | 576 | .mwdma_mask = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */ |
| 561 | .port_ops = &piix_pata_ops, | 577 | .port_ops = &piix_pata_ops, |
| 562 | }, | 578 | }, |
| 579 | |||
| 580 | /* tolapai_sata_ahci: 11: */ | ||
| 581 | { | ||
| 582 | .sht = &piix_sht, | ||
| 583 | .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SCR | | ||
| 584 | PIIX_FLAG_AHCI, | ||
| 585 | .pio_mask = 0x1f, /* pio0-4 */ | ||
| 586 | .mwdma_mask = 0x07, /* mwdma0-2 */ | ||
| 587 | .udma_mask = ATA_UDMA6, | ||
| 588 | .port_ops = &piix_sata_ops, | ||
| 589 | }, | ||
| 563 | }; | 590 | }; |
| 564 | 591 | ||
| 565 | static struct pci_bits piix_enable_bits[] = { | 592 | static struct pci_bits piix_enable_bits[] = { |
| @@ -908,6 +935,13 @@ static int piix_broken_suspend(void) | |||
| 908 | }, | 935 | }, |
| 909 | }, | 936 | }, |
| 910 | { | 937 | { |
| 938 | .ident = "Satellite U200", | ||
| 939 | .matches = { | ||
| 940 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 941 | DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U200"), | ||
| 942 | }, | ||
| 943 | }, | ||
| 944 | { | ||
| 911 | .ident = "Satellite U205", | 945 | .ident = "Satellite U205", |
| 912 | .matches = { | 946 | .matches = { |
| 913 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | 947 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |
| @@ -921,7 +955,8 @@ static int piix_broken_suspend(void) | |||
| 921 | DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"), | 955 | DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"), |
| 922 | }, | 956 | }, |
| 923 | }, | 957 | }, |
| 924 | { } | 958 | |
| 959 | { } /* terminate list */ | ||
| 925 | }; | 960 | }; |
| 926 | static const char *oemstrs[] = { | 961 | static const char *oemstrs[] = { |
| 927 | "Tecra M3,", | 962 | "Tecra M3,", |
| @@ -1139,6 +1174,41 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev, | |||
| 1139 | hpriv->map = map; | 1174 | hpriv->map = map; |
| 1140 | } | 1175 | } |
| 1141 | 1176 | ||
| 1177 | static void piix_iocfg_bit18_quirk(struct pci_dev *pdev) | ||
| 1178 | { | ||
| 1179 | static struct dmi_system_id sysids[] = { | ||
| 1180 | { | ||
| 1181 | /* Clevo M570U sets IOCFG bit 18 if the cdrom | ||
| 1182 | * isn't used to boot the system which | ||
| 1183 | * disables the channel. | ||
| 1184 | */ | ||
| 1185 | .ident = "M570U", | ||
| 1186 | .matches = { | ||
| 1187 | DMI_MATCH(DMI_SYS_VENDOR, "Clevo Co."), | ||
| 1188 | DMI_MATCH(DMI_PRODUCT_NAME, "M570U"), | ||
| 1189 | }, | ||
| 1190 | }, | ||
| 1191 | |||
| 1192 | { } /* terminate list */ | ||
| 1193 | }; | ||
| 1194 | u32 iocfg; | ||
| 1195 | |||
| 1196 | if (!dmi_check_system(sysids)) | ||
| 1197 | return; | ||
| 1198 | |||
| 1199 | /* The datasheet says that bit 18 is NOOP but certain systems | ||
| 1200 | * seem to use it to disable a channel. Clear the bit on the | ||
| 1201 | * affected systems. | ||
| 1202 | */ | ||
| 1203 | pci_read_config_dword(pdev, PIIX_IOCFG, &iocfg); | ||
| 1204 | if (iocfg & (1 << 18)) { | ||
| 1205 | dev_printk(KERN_INFO, &pdev->dev, | ||
| 1206 | "applying IOCFG bit18 quirk\n"); | ||
| 1207 | iocfg &= ~(1 << 18); | ||
| 1208 | pci_write_config_dword(pdev, PIIX_IOCFG, iocfg); | ||
| 1209 | } | ||
| 1210 | } | ||
| 1211 | |||
| 1142 | /** | 1212 | /** |
| 1143 | * piix_init_one - Register PIIX ATA PCI device with kernel services | 1213 | * piix_init_one - Register PIIX ATA PCI device with kernel services |
| 1144 | * @pdev: PCI device to register | 1214 | * @pdev: PCI device to register |
| @@ -1200,6 +1270,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1200 | piix_map_db_table[ent->driver_data]); | 1270 | piix_map_db_table[ent->driver_data]); |
| 1201 | } | 1271 | } |
| 1202 | 1272 | ||
| 1273 | /* apply IOCFG bit18 quirk */ | ||
| 1274 | piix_iocfg_bit18_quirk(pdev); | ||
| 1275 | |||
| 1203 | /* On ICH5, some BIOSen disable the interrupt using the | 1276 | /* On ICH5, some BIOSen disable the interrupt using the |
| 1204 | * PCI_COMMAND_INTX_DISABLE bit added in PCI 2.3. | 1277 | * PCI_COMMAND_INTX_DISABLE bit added in PCI 2.3. |
| 1205 | * On ICH6, this bit has the same effect, but only when | 1278 | * On ICH6, this bit has the same effect, but only when |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2ad4dda6d4a7..a3ee087223de 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -1911,8 +1911,9 @@ int ata_dev_configure(struct ata_device *dev) | |||
| 1911 | dev->flags |= ATA_DFLAG_FLUSH_EXT; | 1911 | dev->flags |= ATA_DFLAG_FLUSH_EXT; |
| 1912 | } | 1912 | } |
| 1913 | 1913 | ||
| 1914 | if (ata_id_hpa_enabled(dev->id)) | 1914 | if (!(dev->horkage & ATA_HORKAGE_BROKEN_HPA) && |
| 1915 | dev->n_sectors = ata_hpa_resize(dev); | 1915 | ata_id_hpa_enabled(dev->id)) |
| 1916 | dev->n_sectors = ata_hpa_resize(dev); | ||
| 1916 | 1917 | ||
| 1917 | /* config NCQ */ | 1918 | /* config NCQ */ |
| 1918 | ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc)); | 1919 | ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc)); |
| @@ -3795,7 +3796,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { | |||
| 3795 | { "ST9160821AS", "3.CLF", ATA_HORKAGE_NONCQ, }, | 3796 | { "ST9160821AS", "3.CLF", ATA_HORKAGE_NONCQ, }, |
| 3796 | { "SAMSUNG HD401LJ", "ZZ100-15", ATA_HORKAGE_NONCQ, }, | 3797 | { "SAMSUNG HD401LJ", "ZZ100-15", ATA_HORKAGE_NONCQ, }, |
| 3797 | 3798 | ||
| 3798 | /* Devices with NCQ limits */ | 3799 | /* devices which puke on READ_NATIVE_MAX */ |
| 3800 | { "HDS724040KLSA80", "KFAOA20N", ATA_HORKAGE_BROKEN_HPA, }, | ||
| 3801 | { "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA }, | ||
| 3802 | { "WDC WD2500JD-00HBB0", "WD-WMAL71490727", ATA_HORKAGE_BROKEN_HPA }, | ||
| 3803 | { "MAXTOR 6L080L4", "A93.0500", ATA_HORKAGE_BROKEN_HPA }, | ||
| 3799 | 3804 | ||
| 3800 | /* End Marker */ | 3805 | /* End Marker */ |
| 3801 | { } | 3806 | { } |
| @@ -3985,6 +3990,11 @@ static unsigned int ata_dev_init_params(struct ata_device *dev, | |||
| 3985 | tf.device |= (heads - 1) & 0x0f; /* max head = num. of heads - 1 */ | 3990 | tf.device |= (heads - 1) & 0x0f; /* max head = num. of heads - 1 */ |
| 3986 | 3991 | ||
| 3987 | err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0); | 3992 | err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0); |
| 3993 | /* A clean abort indicates an original or just out of spec drive | ||
| 3994 | and we should continue as we issue the setup based on the | ||
| 3995 | drive reported working geometry */ | ||
| 3996 | if (err_mask == AC_ERR_DEV && (tf.feature & ATA_ABORTED)) | ||
| 3997 | err_mask = 0; | ||
| 3988 | 3998 | ||
| 3989 | DPRINTK("EXIT, err_mask=%x\n", err_mask); | 3999 | DPRINTK("EXIT, err_mask=%x\n", err_mask); |
| 3990 | return err_mask; | 4000 | return err_mask; |
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index e8a28e94fe47..94e5edc12ac9 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <linux/dmi.h> | 34 | #include <linux/dmi.h> |
| 35 | 35 | ||
| 36 | #define DRV_NAME "pata_ali" | 36 | #define DRV_NAME "pata_ali" |
| 37 | #define DRV_VERSION "0.7.4" | 37 | #define DRV_VERSION "0.7.5" |
| 38 | 38 | ||
| 39 | /* | 39 | /* |
| 40 | * Cable special cases | 40 | * Cable special cases |
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index b09facad63e1..04048fcf6305 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/libata.h> | 25 | #include <linux/libata.h> |
| 26 | 26 | ||
| 27 | #define DRV_NAME "pata_amd" | 27 | #define DRV_NAME "pata_amd" |
| 28 | #define DRV_VERSION "0.3.8" | 28 | #define DRV_VERSION "0.3.9" |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * timing_setup - shared timing computation and load | 31 | * timing_setup - shared timing computation and load |
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c index 80509be49e7a..86f85a2cab7e 100644 --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/libata.h> | 22 | #include <linux/libata.h> |
| 23 | 23 | ||
| 24 | #define DRV_NAME "pata_atiixp" | 24 | #define DRV_NAME "pata_atiixp" |
| 25 | #define DRV_VERSION "0.4.5" | 25 | #define DRV_VERSION "0.4.6" |
| 26 | 26 | ||
| 27 | enum { | 27 | enum { |
| 28 | ATIIXP_IDE_PIO_TIMING = 0x40, | 28 | ATIIXP_IDE_PIO_TIMING = 0x40, |
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c index 7dc76e71bd55..e2459088cdcd 100644 --- a/drivers/ata/pata_cs5520.c +++ b/drivers/ata/pata_cs5520.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include <linux/libata.h> | 41 | #include <linux/libata.h> |
| 42 | 42 | ||
| 43 | #define DRV_NAME "pata_cs5520" | 43 | #define DRV_NAME "pata_cs5520" |
| 44 | #define DRV_VERSION "0.6.5" | 44 | #define DRV_VERSION "0.6.6" |
| 45 | 45 | ||
| 46 | struct pio_clocks | 46 | struct pio_clocks |
| 47 | { | 47 | { |
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 68f150a1e2f4..c6066aa43ec8 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/dmi.h> | 35 | #include <linux/dmi.h> |
| 36 | 36 | ||
| 37 | #define DRV_NAME "pata_cs5530" | 37 | #define DRV_NAME "pata_cs5530" |
| 38 | #define DRV_VERSION "0.7.3" | 38 | #define DRV_VERSION "0.7.4" |
| 39 | 39 | ||
| 40 | static void __iomem *cs5530_port_base(struct ata_port *ap) | 40 | static void __iomem *cs5530_port_base(struct ata_port *ap) |
| 41 | { | 41 | { |
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c index 91a396fa5b20..9e553c54203a 100644 --- a/drivers/ata/pata_isapnp.c +++ b/drivers/ata/pata_isapnp.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/libata.h> | 17 | #include <linux/libata.h> |
| 18 | 18 | ||
| 19 | #define DRV_NAME "pata_isapnp" | 19 | #define DRV_NAME "pata_isapnp" |
| 20 | #define DRV_VERSION "0.2.1" | 20 | #define DRV_VERSION "0.2.2" |
| 21 | 21 | ||
| 22 | static struct scsi_host_template isapnp_sht = { | 22 | static struct scsi_host_template isapnp_sht = { |
| 23 | .module = THIS_MODULE, | 23 | .module = THIS_MODULE, |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 7225124d96c2..ed637ae33ece 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | #define DRV_NAME "pata_it821x" | 82 | #define DRV_NAME "pata_it821x" |
| 83 | #define DRV_VERSION "0.3.7" | 83 | #define DRV_VERSION "0.3.8" |
| 84 | 84 | ||
| 85 | struct it821x_dev | 85 | struct it821x_dev |
| 86 | { | 86 | { |
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 87594c04d3a3..ae206f35f747 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
| @@ -192,6 +192,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i | |||
| 192 | 192 | ||
| 193 | static const struct pci_device_id marvell_pci_tbl[] = { | 193 | static const struct pci_device_id marvell_pci_tbl[] = { |
| 194 | { PCI_DEVICE(0x11AB, 0x6101), }, | 194 | { PCI_DEVICE(0x11AB, 0x6101), }, |
| 195 | { PCI_DEVICE(0x11AB, 0x6121), }, | ||
| 196 | { PCI_DEVICE(0x11AB, 0x6123), }, | ||
| 195 | { PCI_DEVICE(0x11AB, 0x6145), }, | 197 | { PCI_DEVICE(0x11AB, 0x6145), }, |
| 196 | { } /* terminate list */ | 198 | { } /* terminate list */ |
| 197 | }; | 199 | }; |
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index 182e83c9047b..099f4cdc4cd9 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | #define DRV_NAME "mpc52xx_ata" | 26 | #define DRV_NAME "mpc52xx_ata" |
| 27 | #define DRV_VERSION "0.1.0ac2" | 27 | #define DRV_VERSION "0.1.2" |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | /* Private structures used by the driver */ | 30 | /* Private structures used by the driver */ |
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 6da23feed039..0f2b027624d6 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | #define DRV_NAME "pata_pcmcia" | 44 | #define DRV_NAME "pata_pcmcia" |
| 45 | #define DRV_VERSION "0.3.1" | 45 | #define DRV_VERSION "0.3.2" |
| 46 | 46 | ||
| 47 | /* | 47 | /* |
| 48 | * Private data structure to glue stuff together | 48 | * Private data structure to glue stuff together |
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index e3245b36269a..bb64a986e8f5 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/libata.h> | 35 | #include <linux/libata.h> |
| 36 | 36 | ||
| 37 | #define DRV_NAME "pata_pdc2027x" | 37 | #define DRV_NAME "pata_pdc2027x" |
| 38 | #define DRV_VERSION "0.9" | 38 | #define DRV_VERSION "1.0" |
| 39 | #undef PDC_DEBUG | 39 | #undef PDC_DEBUG |
| 40 | 40 | ||
| 41 | #ifdef PDC_DEBUG | 41 | #ifdef PDC_DEBUG |
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c index a909f793ffc1..5086d03f2d7c 100644 --- a/drivers/ata/pata_platform.c +++ b/drivers/ata/pata_platform.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/pata_platform.h> | 22 | #include <linux/pata_platform.h> |
| 23 | 23 | ||
| 24 | #define DRV_NAME "pata_platform" | 24 | #define DRV_NAME "pata_platform" |
| 25 | #define DRV_VERSION "1.0" | 25 | #define DRV_VERSION "1.1" |
| 26 | 26 | ||
| 27 | static int pio_mask = 1; | 27 | static int pio_mask = 1; |
| 28 | 28 | ||
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index b8b2d11e4180..5edf67b1f3bf 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/libata.h> | 40 | #include <linux/libata.h> |
| 41 | 41 | ||
| 42 | #define DRV_NAME "sc1200" | 42 | #define DRV_NAME "sc1200" |
| 43 | #define DRV_VERSION "0.2.5" | 43 | #define DRV_VERSION "0.2.6" |
| 44 | 44 | ||
| 45 | #define SC1200_REV_A 0x00 | 45 | #define SC1200_REV_A 0x00 |
| 46 | #define SC1200_REV_B1 0x01 | 46 | #define SC1200_REV_B1 0x01 |
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 36cdbd2b0bd5..2d048ef25a5a 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <linux/libata.h> | 43 | #include <linux/libata.h> |
| 44 | 44 | ||
| 45 | #define DRV_NAME "pata_scc" | 45 | #define DRV_NAME "pata_scc" |
| 46 | #define DRV_VERSION "0.2" | 46 | #define DRV_VERSION "0.3" |
| 47 | 47 | ||
| 48 | #define PCI_DEVICE_ID_TOSHIBA_SCC_ATA 0x01b4 | 48 | #define PCI_DEVICE_ID_TOSHIBA_SCC_ATA 0x01b4 |
| 49 | 49 | ||
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c index 89691541fe59..0faf99c8f13e 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include <linux/libata.h> | 41 | #include <linux/libata.h> |
| 42 | 42 | ||
| 43 | #define DRV_NAME "pata_serverworks" | 43 | #define DRV_NAME "pata_serverworks" |
| 44 | #define DRV_VERSION "0.4.1" | 44 | #define DRV_VERSION "0.4.2" |
| 45 | 45 | ||
| 46 | #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ | 46 | #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ |
| 47 | #define SVWKS_CSB6_REVISION 0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ | 47 | #define SVWKS_CSB6_REVISION 0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ |
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index b0cd52d6e3fb..40395804a66f 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <linux/libata.h> | 33 | #include <linux/libata.h> |
| 34 | 34 | ||
| 35 | #define DRV_NAME "pata_sil680" | 35 | #define DRV_NAME "pata_sil680" |
| 36 | #define DRV_VERSION "0.4.6" | 36 | #define DRV_VERSION "0.4.7" |
| 37 | 37 | ||
| 38 | #define SIL680_MMIO_BAR 5 | 38 | #define SIL680_MMIO_BAR 5 |
| 39 | 39 | ||
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index 8c2813aa6cdb..c0f43bb25956 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/libata.h> | 26 | #include <linux/libata.h> |
| 27 | 27 | ||
| 28 | #define DRV_NAME "pata_sl82c105" | 28 | #define DRV_NAME "pata_sl82c105" |
| 29 | #define DRV_VERSION "0.3.1" | 29 | #define DRV_VERSION "0.3.2" |
| 30 | 30 | ||
| 31 | enum { | 31 | enum { |
| 32 | /* | 32 | /* |
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index bec1de594de8..5c79271401af 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <linux/libata.h> | 44 | #include <linux/libata.h> |
| 45 | 45 | ||
| 46 | #define DRV_NAME "pdc_adma" | 46 | #define DRV_NAME "pdc_adma" |
| 47 | #define DRV_VERSION "0.06" | 47 | #define DRV_VERSION "1.0" |
| 48 | 48 | ||
| 49 | /* macro to calculate base address for ATA regs */ | 49 | /* macro to calculate base address for ATA regs */ |
| 50 | #define ADMA_ATA_REGS(base,port_no) ((base) + ((port_no) * 0x40)) | 50 | #define ADMA_ATA_REGS(base,port_no) ((base) + ((port_no) * 0x40)) |
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index a9c948d7604a..fdbed8ecdfc2 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <scsi/scsi_device.h> | 28 | #include <scsi/scsi_device.h> |
| 29 | 29 | ||
| 30 | #define DRV_NAME "sata_inic162x" | 30 | #define DRV_NAME "sata_inic162x" |
| 31 | #define DRV_VERSION "0.2" | 31 | #define DRV_VERSION "0.3" |
| 32 | 32 | ||
| 33 | enum { | 33 | enum { |
| 34 | MMIO_BAR = 5, | 34 | MMIO_BAR = 5, |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 3acf65e75eb2..11bf6c7ac122 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | #include <linux/libata.h> | 72 | #include <linux/libata.h> |
| 73 | 73 | ||
| 74 | #define DRV_NAME "sata_mv" | 74 | #define DRV_NAME "sata_mv" |
| 75 | #define DRV_VERSION "0.81" | 75 | #define DRV_VERSION "1.0" |
| 76 | 76 | ||
| 77 | enum { | 77 | enum { |
| 78 | /* BAR's are enumerated in terms of pci_resource_start() terms */ | 78 | /* BAR's are enumerated in terms of pci_resource_start() terms */ |
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 0b58c4df6fd2..40dc73139858 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | #include <linux/libata.h> | 49 | #include <linux/libata.h> |
| 50 | 50 | ||
| 51 | #define DRV_NAME "sata_nv" | 51 | #define DRV_NAME "sata_nv" |
| 52 | #define DRV_VERSION "3.4" | 52 | #define DRV_VERSION "3.5" |
| 53 | 53 | ||
| 54 | #define NV_ADMA_DMA_BOUNDARY 0xffffffffUL | 54 | #define NV_ADMA_DMA_BOUNDARY 0xffffffffUL |
| 55 | 55 | ||
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index d39ebc23c4a9..25698cf0dce0 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include "sata_promise.h" | 45 | #include "sata_promise.h" |
| 46 | 46 | ||
| 47 | #define DRV_NAME "sata_promise" | 47 | #define DRV_NAME "sata_promise" |
| 48 | #define DRV_VERSION "2.09" | 48 | #define DRV_VERSION "2.10" |
| 49 | 49 | ||
| 50 | enum { | 50 | enum { |
| 51 | PDC_MAX_PORTS = 4, | 51 | PDC_MAX_PORTS = 4, |
| @@ -328,8 +328,8 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = { | |||
| 328 | 328 | ||
| 329 | { PCI_VDEVICE(PROMISE, 0x3318), board_20319 }, | 329 | { PCI_VDEVICE(PROMISE, 0x3318), board_20319 }, |
| 330 | { PCI_VDEVICE(PROMISE, 0x3319), board_20319 }, | 330 | { PCI_VDEVICE(PROMISE, 0x3319), board_20319 }, |
| 331 | { PCI_VDEVICE(PROMISE, 0x3515), board_20319 }, | 331 | { PCI_VDEVICE(PROMISE, 0x3515), board_40518 }, |
| 332 | { PCI_VDEVICE(PROMISE, 0x3519), board_20319 }, | 332 | { PCI_VDEVICE(PROMISE, 0x3519), board_40518 }, |
| 333 | { PCI_VDEVICE(PROMISE, 0x3d17), board_40518 }, | 333 | { PCI_VDEVICE(PROMISE, 0x3d17), board_40518 }, |
| 334 | { PCI_VDEVICE(PROMISE, 0x3d18), board_40518 }, | 334 | { PCI_VDEVICE(PROMISE, 0x3d18), board_40518 }, |
| 335 | 335 | ||
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index c8f9242e7f44..5e1dfdda698f 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <linux/libata.h> | 39 | #include <linux/libata.h> |
| 40 | 40 | ||
| 41 | #define DRV_NAME "sata_qstor" | 41 | #define DRV_NAME "sata_qstor" |
| 42 | #define DRV_VERSION "0.08" | 42 | #define DRV_VERSION "0.09" |
| 43 | 43 | ||
| 44 | enum { | 44 | enum { |
| 45 | QS_MMIO_BAR = 4, | 45 | QS_MMIO_BAR = 4, |
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index db6763758952..8c72e714b456 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <linux/libata.h> | 46 | #include <linux/libata.h> |
| 47 | 47 | ||
| 48 | #define DRV_NAME "sata_sil" | 48 | #define DRV_NAME "sata_sil" |
| 49 | #define DRV_VERSION "2.2" | 49 | #define DRV_VERSION "2.3" |
| 50 | 50 | ||
| 51 | enum { | 51 | enum { |
| 52 | SIL_MMIO_BAR = 5, | 52 | SIL_MMIO_BAR = 5, |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 46fbbe7f121c..ef83e6b1e314 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/libata.h> | 30 | #include <linux/libata.h> |
| 31 | 31 | ||
| 32 | #define DRV_NAME "sata_sil24" | 32 | #define DRV_NAME "sata_sil24" |
| 33 | #define DRV_VERSION "0.9" | 33 | #define DRV_VERSION "1.0" |
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * Port request block (PRB) 32 bytes | 36 | * Port request block (PRB) 32 bytes |
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index 31a2f55aae66..41c1d6e8f1fe 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include "sis.h" | 43 | #include "sis.h" |
| 44 | 44 | ||
| 45 | #define DRV_NAME "sata_sis" | 45 | #define DRV_NAME "sata_sis" |
| 46 | #define DRV_VERSION "0.8" | 46 | #define DRV_VERSION "1.0" |
| 47 | 47 | ||
| 48 | enum { | 48 | enum { |
| 49 | sis_180 = 0, | 49 | sis_180 = 0, |
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 92e877075037..d9678e7bc3a9 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | #endif /* CONFIG_PPC_OF */ | 53 | #endif /* CONFIG_PPC_OF */ |
| 54 | 54 | ||
| 55 | #define DRV_NAME "sata_svw" | 55 | #define DRV_NAME "sata_svw" |
| 56 | #define DRV_VERSION "2.2" | 56 | #define DRV_VERSION "2.3" |
| 57 | 57 | ||
| 58 | enum { | 58 | enum { |
| 59 | /* ap->flags bits */ | 59 | /* ap->flags bits */ |
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index 5193bd8647ba..97aefdd87be4 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
| @@ -92,7 +92,7 @@ | |||
| 92 | #include "sata_promise.h" | 92 | #include "sata_promise.h" |
| 93 | 93 | ||
| 94 | #define DRV_NAME "sata_sx4" | 94 | #define DRV_NAME "sata_sx4" |
| 95 | #define DRV_VERSION "0.11" | 95 | #define DRV_VERSION "0.12" |
| 96 | 96 | ||
| 97 | 97 | ||
| 98 | enum { | 98 | enum { |
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index 78c28512f01c..e6b8b45279af 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <linux/libata.h> | 36 | #include <linux/libata.h> |
| 37 | 37 | ||
| 38 | #define DRV_NAME "sata_uli" | 38 | #define DRV_NAME "sata_uli" |
| 39 | #define DRV_VERSION "1.2" | 39 | #define DRV_VERSION "1.3" |
| 40 | 40 | ||
| 41 | enum { | 41 | enum { |
| 42 | uli_5289 = 0, | 42 | uli_5289 = 0, |
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 86b7bfc17324..57fd30de8f0d 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <linux/libata.h> | 46 | #include <linux/libata.h> |
| 47 | 47 | ||
| 48 | #define DRV_NAME "sata_via" | 48 | #define DRV_NAME "sata_via" |
| 49 | #define DRV_VERSION "2.2" | 49 | #define DRV_VERSION "2.3" |
| 50 | 50 | ||
| 51 | enum board_ids_enum { | 51 | enum board_ids_enum { |
| 52 | vt6420, | 52 | vt6420, |
| @@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev) | |||
| 371 | { | 371 | { |
| 372 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 372 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
| 373 | static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 }; | 373 | static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 }; |
| 374 | pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]); | 374 | pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]); |
| 375 | } | 375 | } |
| 376 | 376 | ||
| 377 | static const unsigned int svia_bar_sizes[] = { | 377 | static const unsigned int svia_bar_sizes[] = { |
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index 24344d0d0575..1920915dfa2c 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #include <linux/libata.h> | 47 | #include <linux/libata.h> |
| 48 | 48 | ||
| 49 | #define DRV_NAME "sata_vsc" | 49 | #define DRV_NAME "sata_vsc" |
| 50 | #define DRV_VERSION "2.2" | 50 | #define DRV_VERSION "2.3" |
| 51 | 51 | ||
| 52 | enum { | 52 | enum { |
| 53 | VSC_MMIO_BAR = 0, | 53 | VSC_MMIO_BAR = 0, |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 77bf4aa217a8..7ecffc9c738f 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -909,6 +909,8 @@ int hpet_alloc(struct hpet_data *hdp) | |||
| 909 | 909 | ||
| 910 | hpetp->hp_delta = hpet_calibrate(hpetp); | 910 | hpetp->hp_delta = hpet_calibrate(hpetp); |
| 911 | 911 | ||
| 912 | /* This clocksource driver currently only works on ia64 */ | ||
| 913 | #ifdef CONFIG_IA64 | ||
| 912 | if (!hpet_clocksource) { | 914 | if (!hpet_clocksource) { |
| 913 | hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc; | 915 | hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc; |
| 914 | CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr); | 916 | CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr); |
| @@ -918,6 +920,7 @@ int hpet_alloc(struct hpet_data *hdp) | |||
| 918 | hpetp->hp_clocksource = &clocksource_hpet; | 920 | hpetp->hp_clocksource = &clocksource_hpet; |
| 919 | hpet_clocksource = &clocksource_hpet; | 921 | hpet_clocksource = &clocksource_hpet; |
| 920 | } | 922 | } |
| 923 | #endif | ||
| 921 | 924 | ||
| 922 | return 0; | 925 | return 0; |
| 923 | } | 926 | } |
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 1842f523c23d..9f3a4cd0b07f 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -208,6 +208,7 @@ config I2C_PIIX4 | |||
| 208 | ATI IXP400 | 208 | ATI IXP400 |
| 209 | ATI SB600 | 209 | ATI SB600 |
| 210 | ATI SB700 | 210 | ATI SB700 |
| 211 | ATI SB800 | ||
| 211 | Serverworks OSB4 | 212 | Serverworks OSB4 |
| 212 | Serverworks CSB5 | 213 | Serverworks CSB5 |
| 213 | Serverworks CSB6 | 214 | Serverworks CSB6 |
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index debc76cd2161..167e4137ee21 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | Supports: | 23 | Supports: |
| 24 | Intel PIIX4, 440MX | 24 | Intel PIIX4, 440MX |
| 25 | Serverworks OSB4, CSB5, CSB6, HT-1000 | 25 | Serverworks OSB4, CSB5, CSB6, HT-1000 |
| 26 | ATI IXP200, IXP300, IXP400, SB600, SB700 | 26 | ATI IXP200, IXP300, IXP400, SB600, SB700, SB800 |
| 27 | SMSC Victory66 | 27 | SMSC Victory66 |
| 28 | 28 | ||
| 29 | Note: we assume there can only be one device, with one SMBus interface. | 29 | Note: we assume there can only be one device, with one SMBus interface. |
| @@ -397,9 +397,7 @@ static struct pci_device_id piix4_ids[] = { | |||
| 397 | .driver_data = 0 }, | 397 | .driver_data = 0 }, |
| 398 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS), | 398 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS), |
| 399 | .driver_data = 0 }, | 399 | .driver_data = 0 }, |
| 400 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS), | 400 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS), |
| 401 | .driver_data = 0 }, | ||
| 402 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS), | ||
| 403 | .driver_data = 0 }, | 401 | .driver_data = 0 }, |
| 404 | { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4), | 402 | { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4), |
| 405 | .driver_data = 0 }, | 403 | .driver_data = 0 }, |
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c index 1518b41482ae..beb2a381467f 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_hal.c +++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c | |||
| @@ -916,7 +916,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p) | |||
| 916 | PDBG("%s opening rnic dev %s\n", __FUNCTION__, rdev_p->dev_name); | 916 | PDBG("%s opening rnic dev %s\n", __FUNCTION__, rdev_p->dev_name); |
| 917 | memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp)); | 917 | memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp)); |
| 918 | if (!rdev_p->t3cdev_p) | 918 | if (!rdev_p->t3cdev_p) |
| 919 | rdev_p->t3cdev_p = T3CDEV(netdev_p); | 919 | rdev_p->t3cdev_p = dev2t3cdev(netdev_p); |
| 920 | rdev_p->t3cdev_p->ulp = (void *) rdev_p; | 920 | rdev_p->t3cdev_p->ulp = (void *) rdev_p; |
| 921 | err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS, | 921 | err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS, |
| 922 | &(rdev_p->rnic_info)); | 922 | &(rdev_p->rnic_info)); |
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c index fc19ef9fd963..cf22472d9414 100644 --- a/drivers/infiniband/hw/ehca/ehca_hca.c +++ b/drivers/infiniband/hw/ehca/ehca_hca.c | |||
| @@ -93,9 +93,13 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props) | |||
| 93 | props->max_pd = min_t(int, rblock->max_pd, INT_MAX); | 93 | props->max_pd = min_t(int, rblock->max_pd, INT_MAX); |
| 94 | props->max_ah = min_t(int, rblock->max_ah, INT_MAX); | 94 | props->max_ah = min_t(int, rblock->max_ah, INT_MAX); |
| 95 | props->max_fmr = min_t(int, rblock->max_mr, INT_MAX); | 95 | props->max_fmr = min_t(int, rblock->max_mr, INT_MAX); |
| 96 | props->max_srq = 0; | 96 | |
| 97 | props->max_srq_wr = 0; | 97 | if (EHCA_BMASK_GET(HCA_CAP_SRQ, shca->hca_cap)) { |
| 98 | props->max_srq_sge = 0; | 98 | props->max_srq = props->max_qp; |
| 99 | props->max_srq_wr = props->max_qp_wr; | ||
| 100 | props->max_srq_sge = 3; | ||
| 101 | } | ||
| 102 | |||
| 99 | props->max_pkeys = 16; | 103 | props->max_pkeys = 16; |
| 100 | props->local_ca_ack_delay | 104 | props->local_ca_ack_delay |
| 101 | = rblock->local_ca_ack_delay; | 105 | = rblock->local_ca_ack_delay; |
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c index ee06d8bd7396..a925ea52443f 100644 --- a/drivers/infiniband/hw/ehca/ehca_irq.c +++ b/drivers/infiniband/hw/ehca/ehca_irq.c | |||
| @@ -175,41 +175,55 @@ error_data1: | |||
| 175 | 175 | ||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | static void qp_event_callback(struct ehca_shca *shca, u64 eqe, | 178 | static void dispatch_qp_event(struct ehca_shca *shca, struct ehca_qp *qp, |
| 179 | enum ib_event_type event_type, int fatal) | 179 | enum ib_event_type event_type) |
| 180 | { | 180 | { |
| 181 | struct ib_event event; | 181 | struct ib_event event; |
| 182 | struct ehca_qp *qp; | ||
| 183 | u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe); | ||
| 184 | |||
| 185 | read_lock(&ehca_qp_idr_lock); | ||
| 186 | qp = idr_find(&ehca_qp_idr, token); | ||
| 187 | read_unlock(&ehca_qp_idr_lock); | ||
| 188 | |||
| 189 | |||
| 190 | if (!qp) | ||
| 191 | return; | ||
| 192 | |||
| 193 | if (fatal) | ||
| 194 | ehca_error_data(shca, qp, qp->ipz_qp_handle.handle); | ||
| 195 | 182 | ||
| 196 | event.device = &shca->ib_device; | 183 | event.device = &shca->ib_device; |
| 184 | event.event = event_type; | ||
| 197 | 185 | ||
| 198 | if (qp->ext_type == EQPT_SRQ) { | 186 | if (qp->ext_type == EQPT_SRQ) { |
| 199 | if (!qp->ib_srq.event_handler) | 187 | if (!qp->ib_srq.event_handler) |
| 200 | return; | 188 | return; |
| 201 | 189 | ||
| 202 | event.event = fatal ? IB_EVENT_SRQ_ERR : event_type; | ||
| 203 | event.element.srq = &qp->ib_srq; | 190 | event.element.srq = &qp->ib_srq; |
| 204 | qp->ib_srq.event_handler(&event, qp->ib_srq.srq_context); | 191 | qp->ib_srq.event_handler(&event, qp->ib_srq.srq_context); |
| 205 | } else { | 192 | } else { |
| 206 | if (!qp->ib_qp.event_handler) | 193 | if (!qp->ib_qp.event_handler) |
| 207 | return; | 194 | return; |
| 208 | 195 | ||
| 209 | event.event = event_type; | ||
| 210 | event.element.qp = &qp->ib_qp; | 196 | event.element.qp = &qp->ib_qp; |
| 211 | qp->ib_qp.event_handler(&event, qp->ib_qp.qp_context); | 197 | qp->ib_qp.event_handler(&event, qp->ib_qp.qp_context); |
| 212 | } | 198 | } |
| 199 | } | ||
| 200 | |||
| 201 | static void qp_event_callback(struct ehca_shca *shca, u64 eqe, | ||
| 202 | enum ib_event_type event_type, int fatal) | ||
| 203 | { | ||
| 204 | struct ehca_qp *qp; | ||
| 205 | u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe); | ||
| 206 | |||
| 207 | read_lock(&ehca_qp_idr_lock); | ||
| 208 | qp = idr_find(&ehca_qp_idr, token); | ||
| 209 | read_unlock(&ehca_qp_idr_lock); | ||
| 210 | |||
| 211 | if (!qp) | ||
| 212 | return; | ||
| 213 | |||
| 214 | if (fatal) | ||
| 215 | ehca_error_data(shca, qp, qp->ipz_qp_handle.handle); | ||
| 216 | |||
| 217 | dispatch_qp_event(shca, qp, fatal && qp->ext_type == EQPT_SRQ ? | ||
| 218 | IB_EVENT_SRQ_ERR : event_type); | ||
| 219 | |||
| 220 | /* | ||
| 221 | * eHCA only processes one WQE at a time for SRQ base QPs, | ||
| 222 | * so the last WQE has been processed as soon as the QP enters | ||
| 223 | * error state. | ||
| 224 | */ | ||
| 225 | if (fatal && qp->ext_type == EQPT_SRQBASE) | ||
| 226 | dispatch_qp_event(shca, qp, IB_EVENT_QP_LAST_WQE_REACHED); | ||
| 213 | 227 | ||
| 214 | return; | 228 | return; |
| 215 | } | 229 | } |
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c index b178cba96345..84d435a5ee11 100644 --- a/drivers/infiniband/hw/ehca/ehca_qp.c +++ b/drivers/infiniband/hw/ehca/ehca_qp.c | |||
| @@ -600,10 +600,12 @@ static struct ehca_qp *internal_create_qp( | |||
| 600 | 600 | ||
| 601 | if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap) | 601 | if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap) |
| 602 | && !(context && udata)) { /* no small QP support in userspace ATM */ | 602 | && !(context && udata)) { /* no small QP support in userspace ATM */ |
| 603 | ehca_determine_small_queue( | 603 | if (HAS_SQ(my_qp)) |
| 604 | &parms.squeue, max_send_sge, is_llqp); | 604 | ehca_determine_small_queue( |
| 605 | ehca_determine_small_queue( | 605 | &parms.squeue, max_send_sge, is_llqp); |
| 606 | &parms.rqueue, max_recv_sge, is_llqp); | 606 | if (HAS_RQ(my_qp)) |
| 607 | ehca_determine_small_queue( | ||
| 608 | &parms.rqueue, max_recv_sge, is_llqp); | ||
| 607 | parms.qp_storage = | 609 | parms.qp_storage = |
| 608 | (parms.squeue.is_small || parms.rqueue.is_small); | 610 | (parms.squeue.is_small || parms.rqueue.is_small); |
| 609 | } | 611 | } |
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c index a090c679c397..29bd476fbd54 100644 --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c | |||
| @@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd) | |||
| 172 | unsigned long bit; | 172 | unsigned long bit; |
| 173 | int free_page = 0; | 173 | int free_page = 0; |
| 174 | 174 | ||
| 175 | bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK) | 175 | bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK) |
| 176 | >> (order + 9); | 176 | >> (order + 9); |
| 177 | 177 | ||
| 178 | mutex_lock(&pd->lock); | 178 | mutex_lock(&pd->lock); |
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index 3154ccd74000..45c4939ced75 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c | |||
| @@ -246,13 +246,12 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) | |||
| 246 | 246 | ||
| 247 | int iforce_get_id_packet(struct iforce *iforce, char *packet) | 247 | int iforce_get_id_packet(struct iforce *iforce, char *packet) |
| 248 | { | 248 | { |
| 249 | int status; | ||
| 250 | |||
| 251 | switch (iforce->bus) { | 249 | switch (iforce->bus) { |
| 252 | 250 | ||
| 253 | case IFORCE_USB: | 251 | case IFORCE_USB: { |
| 254 | |||
| 255 | #ifdef CONFIG_JOYSTICK_IFORCE_USB | 252 | #ifdef CONFIG_JOYSTICK_IFORCE_USB |
| 253 | int status; | ||
| 254 | |||
| 256 | iforce->cr.bRequest = packet[0]; | 255 | iforce->cr.bRequest = packet[0]; |
| 257 | iforce->ctrl->dev = iforce->usbdev; | 256 | iforce->ctrl->dev = iforce->usbdev; |
| 258 | 257 | ||
| @@ -273,6 +272,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) | |||
| 273 | #else | 272 | #else |
| 274 | dbg("iforce_get_id_packet: iforce->bus = USB!"); | 273 | dbg("iforce_get_id_packet: iforce->bus = USB!"); |
| 275 | #endif | 274 | #endif |
| 275 | } | ||
| 276 | break; | 276 | break; |
| 277 | 277 | ||
| 278 | case IFORCE_232: | 278 | case IFORCE_232: |
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 739212252b09..f0b22b8b2769 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/irq.h> | ||
| 26 | #include <linux/gpio_keys.h> | 25 | #include <linux/gpio_keys.h> |
| 27 | 26 | ||
| 28 | #include <asm/gpio.h> | 27 | #include <asm/gpio.h> |
diff --git a/drivers/input/mouse/touchkit_ps2.h b/drivers/input/mouse/touchkit_ps2.h index 61e9dfd8419f..8a0dd3574aef 100644 --- a/drivers/input/mouse/touchkit_ps2.h +++ b/drivers/input/mouse/touchkit_ps2.h | |||
| @@ -15,7 +15,8 @@ | |||
| 15 | #ifdef CONFIG_MOUSE_PS2_TOUCHKIT | 15 | #ifdef CONFIG_MOUSE_PS2_TOUCHKIT |
| 16 | int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties); | 16 | int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties); |
| 17 | #else | 17 | #else |
| 18 | inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties) | 18 | static inline int touchkit_ps2_detect(struct psmouse *psmouse, |
| 19 | int set_properties) | ||
| 19 | { | 20 | { |
| 20 | return -ENOSYS; | 21 | return -ENOSYS; |
| 21 | } | 22 | } |
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 74f14e097789..3e99df6be084 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
| @@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev) | |||
| 340 | if (dev->id.sversion == 0x96) | 340 | if (dev->id.sversion == 0x96) |
| 341 | hpa += GSC_DINO_OFFSET; | 341 | hpa += GSC_DINO_OFFSET; |
| 342 | 342 | ||
| 343 | ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL); | 343 | ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL); |
| 344 | serio = kmalloc(sizeof(struct serio), GFP_KERNEL); | 344 | serio = kzalloc(sizeof(struct serio), GFP_KERNEL); |
| 345 | if (!ps2port || !serio) { | 345 | if (!ps2port || !serio) { |
| 346 | ret = -ENOMEM; | 346 | ret = -ENOMEM; |
| 347 | goto fail_nomem; | 347 | goto fail_nomem; |
| @@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev) | |||
| 349 | 349 | ||
| 350 | dev_set_drvdata(&dev->dev, ps2port); | 350 | dev_set_drvdata(&dev->dev, ps2port); |
| 351 | 351 | ||
| 352 | memset(ps2port, 0, sizeof(struct gscps2port)); | ||
| 353 | memset(serio, 0, sizeof(struct serio)); | ||
| 354 | ps2port->port = serio; | 352 | ps2port->port = serio; |
| 355 | ps2port->padev = dev; | 353 | ps2port->padev = dev; |
| 356 | ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4); | 354 | ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4); |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 3888dc307e0c..06b05dd22485 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -512,6 +512,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) | |||
| 512 | { | 512 | { |
| 513 | unsigned long flags; | 513 | unsigned long flags; |
| 514 | unsigned char str, data; | 514 | unsigned char str, data; |
| 515 | int ret = 0; | ||
| 515 | 516 | ||
| 516 | spin_lock_irqsave(&i8042_lock, flags); | 517 | spin_lock_irqsave(&i8042_lock, flags); |
| 517 | str = i8042_read_status(); | 518 | str = i8042_read_status(); |
| @@ -520,10 +521,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) | |||
| 520 | if (i8042_irq_being_tested && | 521 | if (i8042_irq_being_tested && |
| 521 | data == 0xa5 && (str & I8042_STR_AUXDATA)) | 522 | data == 0xa5 && (str & I8042_STR_AUXDATA)) |
| 522 | complete(&i8042_aux_irq_delivered); | 523 | complete(&i8042_aux_irq_delivered); |
| 524 | ret = 1; | ||
| 523 | } | 525 | } |
| 524 | spin_unlock_irqrestore(&i8042_lock, flags); | 526 | spin_unlock_irqrestore(&i8042_lock, flags); |
| 525 | 527 | ||
| 526 | return IRQ_HANDLED; | 528 | return IRQ_RETVAL(ret); |
| 527 | } | 529 | } |
| 528 | 530 | ||
| 529 | /* | 531 | /* |
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c index 49aa55577d0d..39731232d827 100644 --- a/drivers/lguest/interrupts_and_traps.c +++ b/drivers/lguest/interrupts_and_traps.c | |||
| @@ -270,8 +270,11 @@ void pin_stack_pages(struct lguest *lg) | |||
| 270 | /* Depending on the CONFIG_4KSTACKS option, the Guest can have one or | 270 | /* Depending on the CONFIG_4KSTACKS option, the Guest can have one or |
| 271 | * two pages of stack space. */ | 271 | * two pages of stack space. */ |
| 272 | for (i = 0; i < lg->stack_pages; i++) | 272 | for (i = 0; i < lg->stack_pages; i++) |
| 273 | /* The stack grows *upwards*, hence the subtraction */ | 273 | /* The stack grows *upwards*, so the address we're given is the |
| 274 | pin_page(lg, lg->esp1 - i * PAGE_SIZE); | 274 | * start of the page after the kernel stack. Subtract one to |
| 275 | * get back onto the first stack page, and keep subtracting to | ||
| 276 | * get to the rest of the stack pages. */ | ||
| 277 | pin_page(lg, lg->esp1 - 1 - i * PAGE_SIZE); | ||
| 275 | } | 278 | } |
| 276 | 279 | ||
| 277 | /* Direct traps also mean that we need to know whenever the Guest wants to use | 280 | /* Direct traps also mean that we need to know whenever the Guest wants to use |
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c index 1aa0447c5e66..e8560683b973 100644 --- a/drivers/mtd/maps/lubbock-flash.c +++ b/drivers/mtd/maps/lubbock-flash.c | |||
| @@ -15,9 +15,7 @@ | |||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | 18 | ||
| 20 | #include <linux/dma-mapping.h> | ||
| 21 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
| 22 | #include <linux/mtd/map.h> | 20 | #include <linux/mtd/map.h> |
| 23 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
| @@ -26,7 +24,7 @@ | |||
| 26 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
| 27 | #include <asm/arch/pxa-regs.h> | 25 | #include <asm/arch/pxa-regs.h> |
| 28 | #include <asm/arch/lubbock.h> | 26 | #include <asm/arch/lubbock.h> |
| 29 | 27 | #include <asm/cacheflush.h> | |
| 30 | 28 | ||
| 31 | #define ROM_ADDR 0x00000000 | 29 | #define ROM_ADDR 0x00000000 |
| 32 | #define FLASH_ADDR 0x04000000 | 30 | #define FLASH_ADDR 0x04000000 |
| @@ -35,7 +33,7 @@ | |||
| 35 | 33 | ||
| 36 | static void lubbock_map_inval_cache(struct map_info *map, unsigned long from, ssize_t len) | 34 | static void lubbock_map_inval_cache(struct map_info *map, unsigned long from, ssize_t len) |
| 37 | { | 35 | { |
| 38 | consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE); | 36 | flush_ioremap_region(map->phys, map->cached, from, len); |
| 39 | } | 37 | } |
| 40 | 38 | ||
| 41 | static struct map_info lubbock_maps[2] = { { | 39 | static struct map_info lubbock_maps[2] = { { |
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c index eaa4bbb868a3..d76487d82dcd 100644 --- a/drivers/mtd/maps/mainstone-flash.c +++ b/drivers/mtd/maps/mainstone-flash.c | |||
| @@ -15,8 +15,6 @@ | |||
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/dma-mapping.h> | ||
| 19 | #include <linux/slab.h> | ||
| 20 | 18 | ||
| 21 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
| 22 | #include <linux/mtd/map.h> | 20 | #include <linux/mtd/map.h> |
| @@ -26,6 +24,7 @@ | |||
| 26 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
| 27 | #include <asm/arch/pxa-regs.h> | 25 | #include <asm/arch/pxa-regs.h> |
| 28 | #include <asm/arch/mainstone.h> | 26 | #include <asm/arch/mainstone.h> |
| 27 | #include <asm/cacheflush.h> | ||
| 29 | 28 | ||
| 30 | 29 | ||
| 31 | #define ROM_ADDR 0x00000000 | 30 | #define ROM_ADDR 0x00000000 |
| @@ -36,7 +35,7 @@ | |||
| 36 | static void mainstone_map_inval_cache(struct map_info *map, unsigned long from, | 35 | static void mainstone_map_inval_cache(struct map_info *map, unsigned long from, |
| 37 | ssize_t len) | 36 | ssize_t len) |
| 38 | { | 37 | { |
| 39 | consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE); | 38 | flush_ioremap_region(map->phys, map->cached, from, len); |
| 40 | } | 39 | } |
| 41 | 40 | ||
| 42 | static struct map_info mainstone_maps[2] = { { | 41 | static struct map_info mainstone_maps[2] = { { |
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index aca331971201..9b430f20b640 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c | |||
| @@ -70,6 +70,8 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags, | |||
| 70 | DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n", | 70 | DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n", |
| 71 | mtd->index, mtd->name); | 71 | mtd->index, mtd->name); |
| 72 | 72 | ||
| 73 | sb->s_flags = flags; | ||
| 74 | |||
| 73 | ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); | 75 | ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); |
| 74 | if (ret < 0) { | 76 | if (ret < 0) { |
| 75 | up_write(&sb->s_umount); | 77 | up_write(&sb->s_umount); |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 24e7f9ab3f5a..854d80c330ec 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -3934,11 +3934,13 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code) | |||
| 3934 | /* Chip reset. */ | 3934 | /* Chip reset. */ |
| 3935 | REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val); | 3935 | REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val); |
| 3936 | 3936 | ||
| 3937 | /* Reading back any register after chip reset will hang the | ||
| 3938 | * bus on 5706 A0 and A1. The msleep below provides plenty | ||
| 3939 | * of margin for write posting. | ||
| 3940 | */ | ||
| 3937 | if ((CHIP_ID(bp) == CHIP_ID_5706_A0) || | 3941 | if ((CHIP_ID(bp) == CHIP_ID_5706_A0) || |
| 3938 | (CHIP_ID(bp) == CHIP_ID_5706_A1)) { | 3942 | (CHIP_ID(bp) == CHIP_ID_5706_A1)) |
| 3939 | current->state = TASK_UNINTERRUPTIBLE; | 3943 | msleep(20); |
| 3940 | schedule_timeout(HZ / 50); | ||
| 3941 | } | ||
| 3942 | 3944 | ||
| 3943 | /* Reset takes approximate 30 usec */ | 3945 | /* Reset takes approximate 30 usec */ |
| 3944 | for (i = 0; i < 10; i++) { | 3946 | for (i = 0; i < 10; i++) { |
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h index ab72563b81ee..20e887de2545 100644 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h | |||
| @@ -50,7 +50,9 @@ typedef irqreturn_t(*intr_handler_t) (int, void *); | |||
| 50 | 50 | ||
| 51 | struct vlan_group; | 51 | struct vlan_group; |
| 52 | 52 | ||
| 53 | struct adapter; | ||
| 53 | struct port_info { | 54 | struct port_info { |
| 55 | struct adapter *adapter; | ||
| 54 | struct vlan_group *vlan_grp; | 56 | struct vlan_group *vlan_grp; |
| 55 | const struct port_type_info *port_type; | 57 | const struct port_type_info *port_type; |
| 56 | u8 port_id; | 58 | u8 port_id; |
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h index 16378004507a..2129210a67c1 100644 --- a/drivers/net/cxgb3/common.h +++ b/drivers/net/cxgb3/common.h | |||
| @@ -679,7 +679,8 @@ const struct adapter_info *t3_get_adapter_info(unsigned int board_id); | |||
| 679 | int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data); | 679 | int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data); |
| 680 | int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data); | 680 | int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data); |
| 681 | int t3_seeprom_wp(struct adapter *adapter, int enable); | 681 | int t3_seeprom_wp(struct adapter *adapter, int enable); |
| 682 | int t3_check_tpsram_version(struct adapter *adapter); | 682 | int t3_get_tp_version(struct adapter *adapter, u32 *vers); |
| 683 | int t3_check_tpsram_version(struct adapter *adapter, int *must_load); | ||
| 683 | int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size); | 684 | int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size); |
| 684 | int t3_set_proto_sram(struct adapter *adap, u8 *data); | 685 | int t3_set_proto_sram(struct adapter *adap, u8 *data); |
| 685 | int t3_read_flash(struct adapter *adapter, unsigned int addr, | 686 | int t3_read_flash(struct adapter *adapter, unsigned int addr, |
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index dc5d26988bb3..5ab319cfe5de 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
| @@ -358,11 +358,14 @@ static int init_dummy_netdevs(struct adapter *adap) | |||
| 358 | 358 | ||
| 359 | for (j = 0; j < pi->nqsets - 1; j++) { | 359 | for (j = 0; j < pi->nqsets - 1; j++) { |
| 360 | if (!adap->dummy_netdev[dummy_idx]) { | 360 | if (!adap->dummy_netdev[dummy_idx]) { |
| 361 | nd = alloc_netdev(0, "", ether_setup); | 361 | struct port_info *p; |
| 362 | |||
| 363 | nd = alloc_netdev(sizeof(*p), "", ether_setup); | ||
| 362 | if (!nd) | 364 | if (!nd) |
| 363 | goto free_all; | 365 | goto free_all; |
| 364 | 366 | ||
| 365 | nd->priv = adap; | 367 | p = netdev_priv(nd); |
| 368 | p->adapter = adap; | ||
| 366 | nd->weight = 64; | 369 | nd->weight = 64; |
| 367 | set_bit(__LINK_STATE_START, &nd->state); | 370 | set_bit(__LINK_STATE_START, &nd->state); |
| 368 | adap->dummy_netdev[dummy_idx] = nd; | 371 | adap->dummy_netdev[dummy_idx] = nd; |
| @@ -482,7 +485,8 @@ static ssize_t attr_store(struct device *d, struct device_attribute *attr, | |||
| 482 | #define CXGB3_SHOW(name, val_expr) \ | 485 | #define CXGB3_SHOW(name, val_expr) \ |
| 483 | static ssize_t format_##name(struct net_device *dev, char *buf) \ | 486 | static ssize_t format_##name(struct net_device *dev, char *buf) \ |
| 484 | { \ | 487 | { \ |
| 485 | struct adapter *adap = dev->priv; \ | 488 | struct port_info *pi = netdev_priv(dev); \ |
| 489 | struct adapter *adap = pi->adapter; \ | ||
| 486 | return sprintf(buf, "%u\n", val_expr); \ | 490 | return sprintf(buf, "%u\n", val_expr); \ |
| 487 | } \ | 491 | } \ |
| 488 | static ssize_t show_##name(struct device *d, struct device_attribute *attr, \ | 492 | static ssize_t show_##name(struct device *d, struct device_attribute *attr, \ |
| @@ -493,7 +497,8 @@ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \ | |||
| 493 | 497 | ||
| 494 | static ssize_t set_nfilters(struct net_device *dev, unsigned int val) | 498 | static ssize_t set_nfilters(struct net_device *dev, unsigned int val) |
| 495 | { | 499 | { |
| 496 | struct adapter *adap = dev->priv; | 500 | struct port_info *pi = netdev_priv(dev); |
| 501 | struct adapter *adap = pi->adapter; | ||
| 497 | int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0; | 502 | int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0; |
| 498 | 503 | ||
| 499 | if (adap->flags & FULL_INIT_DONE) | 504 | if (adap->flags & FULL_INIT_DONE) |
| @@ -515,7 +520,8 @@ static ssize_t store_nfilters(struct device *d, struct device_attribute *attr, | |||
| 515 | 520 | ||
| 516 | static ssize_t set_nservers(struct net_device *dev, unsigned int val) | 521 | static ssize_t set_nservers(struct net_device *dev, unsigned int val) |
| 517 | { | 522 | { |
| 518 | struct adapter *adap = dev->priv; | 523 | struct port_info *pi = netdev_priv(dev); |
| 524 | struct adapter *adap = pi->adapter; | ||
| 519 | 525 | ||
| 520 | if (adap->flags & FULL_INIT_DONE) | 526 | if (adap->flags & FULL_INIT_DONE) |
| 521 | return -EBUSY; | 527 | return -EBUSY; |
| @@ -556,9 +562,10 @@ static struct attribute_group cxgb3_attr_group = {.attrs = cxgb3_attrs }; | |||
| 556 | static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr, | 562 | static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr, |
| 557 | char *buf, int sched) | 563 | char *buf, int sched) |
| 558 | { | 564 | { |
| 559 | ssize_t len; | 565 | struct port_info *pi = netdev_priv(to_net_dev(d)); |
| 566 | struct adapter *adap = pi->adapter; | ||
| 560 | unsigned int v, addr, bpt, cpt; | 567 | unsigned int v, addr, bpt, cpt; |
| 561 | struct adapter *adap = to_net_dev(d)->priv; | 568 | ssize_t len; |
| 562 | 569 | ||
| 563 | addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2; | 570 | addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2; |
| 564 | rtnl_lock(); | 571 | rtnl_lock(); |
| @@ -581,10 +588,11 @@ static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr, | |||
| 581 | static ssize_t tm_attr_store(struct device *d, struct device_attribute *attr, | 588 | static ssize_t tm_attr_store(struct device *d, struct device_attribute *attr, |
| 582 | const char *buf, size_t len, int sched) | 589 | const char *buf, size_t len, int sched) |
| 583 | { | 590 | { |
| 591 | struct port_info *pi = netdev_priv(to_net_dev(d)); | ||
| 592 | struct adapter *adap = pi->adapter; | ||
| 593 | unsigned int val; | ||
| 584 | char *endp; | 594 | char *endp; |
| 585 | ssize_t ret; | 595 | ssize_t ret; |
| 586 | unsigned int val; | ||
| 587 | struct adapter *adap = to_net_dev(d)->priv; | ||
| 588 | 596 | ||
| 589 | if (!capable(CAP_NET_ADMIN)) | 597 | if (!capable(CAP_NET_ADMIN)) |
| 590 | return -EPERM; | 598 | return -EPERM; |
| @@ -721,6 +729,7 @@ static void bind_qsets(struct adapter *adap) | |||
| 721 | } | 729 | } |
| 722 | 730 | ||
| 723 | #define FW_FNAME "t3fw-%d.%d.%d.bin" | 731 | #define FW_FNAME "t3fw-%d.%d.%d.bin" |
| 732 | #define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin" | ||
| 724 | 733 | ||
| 725 | static int upgrade_fw(struct adapter *adap) | 734 | static int upgrade_fw(struct adapter *adap) |
| 726 | { | 735 | { |
| @@ -739,6 +748,71 @@ static int upgrade_fw(struct adapter *adap) | |||
| 739 | } | 748 | } |
| 740 | ret = t3_load_fw(adap, fw->data, fw->size); | 749 | ret = t3_load_fw(adap, fw->data, fw->size); |
| 741 | release_firmware(fw); | 750 | release_firmware(fw); |
| 751 | |||
| 752 | if (ret == 0) | ||
| 753 | dev_info(dev, "successful upgrade to firmware %d.%d.%d\n", | ||
| 754 | FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO); | ||
| 755 | else | ||
| 756 | dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n", | ||
| 757 | FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO); | ||
| 758 | |||
| 759 | return ret; | ||
| 760 | } | ||
| 761 | |||
| 762 | static inline char t3rev2char(struct adapter *adapter) | ||
| 763 | { | ||
| 764 | char rev = 0; | ||
| 765 | |||
| 766 | switch(adapter->params.rev) { | ||
| 767 | case T3_REV_B: | ||
| 768 | case T3_REV_B2: | ||
| 769 | rev = 'b'; | ||
| 770 | break; | ||
| 771 | } | ||
| 772 | return rev; | ||
| 773 | } | ||
| 774 | |||
| 775 | int update_tpsram(struct adapter *adap) | ||
| 776 | { | ||
| 777 | const struct firmware *tpsram; | ||
| 778 | char buf[64]; | ||
| 779 | struct device *dev = &adap->pdev->dev; | ||
| 780 | int ret; | ||
| 781 | char rev; | ||
| 782 | |||
| 783 | rev = t3rev2char(adap); | ||
| 784 | if (!rev) | ||
| 785 | return 0; | ||
| 786 | |||
| 787 | snprintf(buf, sizeof(buf), TPSRAM_NAME, rev, | ||
| 788 | TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO); | ||
| 789 | |||
| 790 | ret = request_firmware(&tpsram, buf, dev); | ||
| 791 | if (ret < 0) { | ||
| 792 | dev_err(dev, "could not load TP SRAM: unable to load %s\n", | ||
| 793 | buf); | ||
| 794 | return ret; | ||
| 795 | } | ||
| 796 | |||
| 797 | ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); | ||
| 798 | if (ret) | ||
| 799 | goto release_tpsram; | ||
| 800 | |||
| 801 | ret = t3_set_proto_sram(adap, tpsram->data); | ||
| 802 | if (ret == 0) | ||
| 803 | dev_info(dev, | ||
| 804 | "successful update of protocol engine " | ||
| 805 | "to %d.%d.%d\n", | ||
| 806 | TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO); | ||
| 807 | else | ||
| 808 | dev_err(dev, "failed to update of protocol engine %d.%d.%d\n", | ||
| 809 | TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO); | ||
| 810 | if (ret) | ||
| 811 | dev_err(dev, "loading protocol SRAM failed\n"); | ||
| 812 | |||
| 813 | release_tpsram: | ||
| 814 | release_firmware(tpsram); | ||
| 815 | |||
| 742 | return ret; | 816 | return ret; |
| 743 | } | 817 | } |
| 744 | 818 | ||
| @@ -755,6 +829,7 @@ static int upgrade_fw(struct adapter *adap) | |||
| 755 | static int cxgb_up(struct adapter *adap) | 829 | static int cxgb_up(struct adapter *adap) |
| 756 | { | 830 | { |
| 757 | int err = 0; | 831 | int err = 0; |
| 832 | int must_load; | ||
| 758 | 833 | ||
| 759 | if (!(adap->flags & FULL_INIT_DONE)) { | 834 | if (!(adap->flags & FULL_INIT_DONE)) { |
| 760 | err = t3_check_fw_version(adap); | 835 | err = t3_check_fw_version(adap); |
| @@ -763,6 +838,13 @@ static int cxgb_up(struct adapter *adap) | |||
| 763 | if (err) | 838 | if (err) |
| 764 | goto out; | 839 | goto out; |
| 765 | 840 | ||
| 841 | err = t3_check_tpsram_version(adap, &must_load); | ||
| 842 | if (err == -EINVAL) { | ||
| 843 | err = update_tpsram(adap); | ||
| 844 | if (err && must_load) | ||
| 845 | goto out; | ||
| 846 | } | ||
| 847 | |||
| 766 | err = init_dummy_netdevs(adap); | 848 | err = init_dummy_netdevs(adap); |
| 767 | if (err) | 849 | if (err) |
| 768 | goto out; | 850 | goto out; |
| @@ -858,8 +940,9 @@ static void schedule_chk_task(struct adapter *adap) | |||
| 858 | 940 | ||
| 859 | static int offload_open(struct net_device *dev) | 941 | static int offload_open(struct net_device *dev) |
| 860 | { | 942 | { |
| 861 | struct adapter *adapter = dev->priv; | 943 | struct port_info *pi = netdev_priv(dev); |
| 862 | struct t3cdev *tdev = T3CDEV(dev); | 944 | struct adapter *adapter = pi->adapter; |
| 945 | struct t3cdev *tdev = dev2t3cdev(dev); | ||
| 863 | int adap_up = adapter->open_device_map & PORT_MASK; | 946 | int adap_up = adapter->open_device_map & PORT_MASK; |
| 864 | int err = 0; | 947 | int err = 0; |
| 865 | 948 | ||
| @@ -924,10 +1007,10 @@ static int offload_close(struct t3cdev *tdev) | |||
| 924 | 1007 | ||
| 925 | static int cxgb_open(struct net_device *dev) | 1008 | static int cxgb_open(struct net_device *dev) |
| 926 | { | 1009 | { |
| 927 | int err; | ||
| 928 | struct adapter *adapter = dev->priv; | ||
| 929 | struct port_info *pi = netdev_priv(dev); | 1010 | struct port_info *pi = netdev_priv(dev); |
| 1011 | struct adapter *adapter = pi->adapter; | ||
| 930 | int other_ports = adapter->open_device_map & PORT_MASK; | 1012 | int other_ports = adapter->open_device_map & PORT_MASK; |
| 1013 | int err; | ||
| 931 | 1014 | ||
| 932 | if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0) | 1015 | if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0) |
| 933 | return err; | 1016 | return err; |
| @@ -951,17 +1034,17 @@ static int cxgb_open(struct net_device *dev) | |||
| 951 | 1034 | ||
| 952 | static int cxgb_close(struct net_device *dev) | 1035 | static int cxgb_close(struct net_device *dev) |
| 953 | { | 1036 | { |
| 954 | struct adapter *adapter = dev->priv; | 1037 | struct port_info *pi = netdev_priv(dev); |
| 955 | struct port_info *p = netdev_priv(dev); | 1038 | struct adapter *adapter = pi->adapter; |
| 956 | 1039 | ||
| 957 | t3_port_intr_disable(adapter, p->port_id); | 1040 | t3_port_intr_disable(adapter, pi->port_id); |
| 958 | netif_stop_queue(dev); | 1041 | netif_stop_queue(dev); |
| 959 | p->phy.ops->power_down(&p->phy, 1); | 1042 | pi->phy.ops->power_down(&pi->phy, 1); |
| 960 | netif_carrier_off(dev); | 1043 | netif_carrier_off(dev); |
| 961 | t3_mac_disable(&p->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX); | 1044 | t3_mac_disable(&pi->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX); |
| 962 | 1045 | ||
| 963 | spin_lock(&adapter->work_lock); /* sync with update task */ | 1046 | spin_lock(&adapter->work_lock); /* sync with update task */ |
| 964 | clear_bit(p->port_id, &adapter->open_device_map); | 1047 | clear_bit(pi->port_id, &adapter->open_device_map); |
| 965 | spin_unlock(&adapter->work_lock); | 1048 | spin_unlock(&adapter->work_lock); |
| 966 | 1049 | ||
| 967 | if (!(adapter->open_device_map & PORT_MASK)) | 1050 | if (!(adapter->open_device_map & PORT_MASK)) |
| @@ -976,13 +1059,13 @@ static int cxgb_close(struct net_device *dev) | |||
| 976 | 1059 | ||
| 977 | static struct net_device_stats *cxgb_get_stats(struct net_device *dev) | 1060 | static struct net_device_stats *cxgb_get_stats(struct net_device *dev) |
| 978 | { | 1061 | { |
| 979 | struct adapter *adapter = dev->priv; | 1062 | struct port_info *pi = netdev_priv(dev); |
| 980 | struct port_info *p = netdev_priv(dev); | 1063 | struct adapter *adapter = pi->adapter; |
| 981 | struct net_device_stats *ns = &p->netstats; | 1064 | struct net_device_stats *ns = &pi->netstats; |
| 982 | const struct mac_stats *pstats; | 1065 | const struct mac_stats *pstats; |
| 983 | 1066 | ||
| 984 | spin_lock(&adapter->stats_lock); | 1067 | spin_lock(&adapter->stats_lock); |
| 985 | pstats = t3_mac_update_stats(&p->mac); | 1068 | pstats = t3_mac_update_stats(&pi->mac); |
| 986 | spin_unlock(&adapter->stats_lock); | 1069 | spin_unlock(&adapter->stats_lock); |
| 987 | 1070 | ||
| 988 | ns->tx_bytes = pstats->tx_octets; | 1071 | ns->tx_bytes = pstats->tx_octets; |
| @@ -1015,14 +1098,16 @@ static struct net_device_stats *cxgb_get_stats(struct net_device *dev) | |||
| 1015 | 1098 | ||
| 1016 | static u32 get_msglevel(struct net_device *dev) | 1099 | static u32 get_msglevel(struct net_device *dev) |
| 1017 | { | 1100 | { |
| 1018 | struct adapter *adapter = dev->priv; | 1101 | struct port_info *pi = netdev_priv(dev); |
| 1102 | struct adapter *adapter = pi->adapter; | ||
| 1019 | 1103 | ||
| 1020 | return adapter->msg_enable; | 1104 | return adapter->msg_enable; |
| 1021 | } | 1105 | } |
| 1022 | 1106 | ||
| 1023 | static void set_msglevel(struct net_device *dev, u32 val) | 1107 | static void set_msglevel(struct net_device *dev, u32 val) |
| 1024 | { | 1108 | { |
| 1025 | struct adapter *adapter = dev->priv; | 1109 | struct port_info *pi = netdev_priv(dev); |
| 1110 | struct adapter *adapter = pi->adapter; | ||
| 1026 | 1111 | ||
| 1027 | adapter->msg_enable = val; | 1112 | adapter->msg_enable = val; |
| 1028 | } | 1113 | } |
| @@ -1096,10 +1181,13 @@ static int get_eeprom_len(struct net_device *dev) | |||
| 1096 | 1181 | ||
| 1097 | static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1182 | static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
| 1098 | { | 1183 | { |
| 1184 | struct port_info *pi = netdev_priv(dev); | ||
| 1185 | struct adapter *adapter = pi->adapter; | ||
| 1099 | u32 fw_vers = 0; | 1186 | u32 fw_vers = 0; |
| 1100 | struct adapter *adapter = dev->priv; | 1187 | u32 tp_vers = 0; |
| 1101 | 1188 | ||
| 1102 | t3_get_fw_version(adapter, &fw_vers); | 1189 | t3_get_fw_version(adapter, &fw_vers); |
| 1190 | t3_get_tp_version(adapter, &tp_vers); | ||
| 1103 | 1191 | ||
| 1104 | strcpy(info->driver, DRV_NAME); | 1192 | strcpy(info->driver, DRV_NAME); |
| 1105 | strcpy(info->version, DRV_VERSION); | 1193 | strcpy(info->version, DRV_VERSION); |
| @@ -1108,11 +1196,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
| 1108 | strcpy(info->fw_version, "N/A"); | 1196 | strcpy(info->fw_version, "N/A"); |
| 1109 | else { | 1197 | else { |
| 1110 | snprintf(info->fw_version, sizeof(info->fw_version), | 1198 | snprintf(info->fw_version, sizeof(info->fw_version), |
| 1111 | "%s %u.%u.%u", | 1199 | "%s %u.%u.%u TP %u.%u.%u", |
| 1112 | G_FW_VERSION_TYPE(fw_vers) ? "T" : "N", | 1200 | G_FW_VERSION_TYPE(fw_vers) ? "T" : "N", |
| 1113 | G_FW_VERSION_MAJOR(fw_vers), | 1201 | G_FW_VERSION_MAJOR(fw_vers), |
| 1114 | G_FW_VERSION_MINOR(fw_vers), | 1202 | G_FW_VERSION_MINOR(fw_vers), |
| 1115 | G_FW_VERSION_MICRO(fw_vers)); | 1203 | G_FW_VERSION_MICRO(fw_vers), |
| 1204 | G_TP_VERSION_MAJOR(tp_vers), | ||
| 1205 | G_TP_VERSION_MINOR(tp_vers), | ||
| 1206 | G_TP_VERSION_MICRO(tp_vers)); | ||
| 1116 | } | 1207 | } |
| 1117 | } | 1208 | } |
| 1118 | 1209 | ||
| @@ -1136,8 +1227,8 @@ static unsigned long collect_sge_port_stats(struct adapter *adapter, | |||
| 1136 | static void get_stats(struct net_device *dev, struct ethtool_stats *stats, | 1227 | static void get_stats(struct net_device *dev, struct ethtool_stats *stats, |
| 1137 | u64 *data) | 1228 | u64 *data) |
| 1138 | { | 1229 | { |
| 1139 | struct adapter *adapter = dev->priv; | ||
| 1140 | struct port_info *pi = netdev_priv(dev); | 1230 | struct port_info *pi = netdev_priv(dev); |
| 1231 | struct adapter *adapter = pi->adapter; | ||
| 1141 | const struct mac_stats *s; | 1232 | const struct mac_stats *s; |
| 1142 | 1233 | ||
| 1143 | spin_lock(&adapter->stats_lock); | 1234 | spin_lock(&adapter->stats_lock); |
| @@ -1205,7 +1296,8 @@ static inline void reg_block_dump(struct adapter *ap, void *buf, | |||
| 1205 | static void get_regs(struct net_device *dev, struct ethtool_regs *regs, | 1296 | static void get_regs(struct net_device *dev, struct ethtool_regs *regs, |
| 1206 | void *buf) | 1297 | void *buf) |
| 1207 | { | 1298 | { |
| 1208 | struct adapter *ap = dev->priv; | 1299 | struct port_info *pi = netdev_priv(dev); |
| 1300 | struct adapter *ap = pi->adapter; | ||
| 1209 | 1301 | ||
| 1210 | /* | 1302 | /* |
| 1211 | * Version scheme: | 1303 | * Version scheme: |
| @@ -1246,8 +1338,9 @@ static int restart_autoneg(struct net_device *dev) | |||
| 1246 | 1338 | ||
| 1247 | static int cxgb3_phys_id(struct net_device *dev, u32 data) | 1339 | static int cxgb3_phys_id(struct net_device *dev, u32 data) |
| 1248 | { | 1340 | { |
| 1341 | struct port_info *pi = netdev_priv(dev); | ||
| 1342 | struct adapter *adapter = pi->adapter; | ||
| 1249 | int i; | 1343 | int i; |
| 1250 | struct adapter *adapter = dev->priv; | ||
| 1251 | 1344 | ||
| 1252 | if (data == 0) | 1345 | if (data == 0) |
| 1253 | data = 2; | 1346 | data = 2; |
| @@ -1408,8 +1501,8 @@ static int set_rx_csum(struct net_device *dev, u32 data) | |||
| 1408 | 1501 | ||
| 1409 | static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e) | 1502 | static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e) |
| 1410 | { | 1503 | { |
| 1411 | const struct adapter *adapter = dev->priv; | 1504 | struct port_info *pi = netdev_priv(dev); |
| 1412 | const struct port_info *pi = netdev_priv(dev); | 1505 | struct adapter *adapter = pi->adapter; |
| 1413 | const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset]; | 1506 | const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset]; |
| 1414 | 1507 | ||
| 1415 | e->rx_max_pending = MAX_RX_BUFFERS; | 1508 | e->rx_max_pending = MAX_RX_BUFFERS; |
| @@ -1425,10 +1518,10 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e) | |||
| 1425 | 1518 | ||
| 1426 | static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e) | 1519 | static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e) |
| 1427 | { | 1520 | { |
| 1428 | int i; | 1521 | struct port_info *pi = netdev_priv(dev); |
| 1522 | struct adapter *adapter = pi->adapter; | ||
| 1429 | struct qset_params *q; | 1523 | struct qset_params *q; |
| 1430 | struct adapter *adapter = dev->priv; | 1524 | int i; |
| 1431 | const struct port_info *pi = netdev_priv(dev); | ||
| 1432 | 1525 | ||
| 1433 | if (e->rx_pending > MAX_RX_BUFFERS || | 1526 | if (e->rx_pending > MAX_RX_BUFFERS || |
| 1434 | e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS || | 1527 | e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS || |
| @@ -1457,7 +1550,8 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e) | |||
| 1457 | 1550 | ||
| 1458 | static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) | 1551 | static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) |
| 1459 | { | 1552 | { |
| 1460 | struct adapter *adapter = dev->priv; | 1553 | struct port_info *pi = netdev_priv(dev); |
| 1554 | struct adapter *adapter = pi->adapter; | ||
| 1461 | struct qset_params *qsp = &adapter->params.sge.qset[0]; | 1555 | struct qset_params *qsp = &adapter->params.sge.qset[0]; |
| 1462 | struct sge_qset *qs = &adapter->sge.qs[0]; | 1556 | struct sge_qset *qs = &adapter->sge.qs[0]; |
| 1463 | 1557 | ||
| @@ -1471,7 +1565,8 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) | |||
| 1471 | 1565 | ||
| 1472 | static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c) | 1566 | static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c) |
| 1473 | { | 1567 | { |
| 1474 | struct adapter *adapter = dev->priv; | 1568 | struct port_info *pi = netdev_priv(dev); |
| 1569 | struct adapter *adapter = pi->adapter; | ||
| 1475 | struct qset_params *q = adapter->params.sge.qset; | 1570 | struct qset_params *q = adapter->params.sge.qset; |
| 1476 | 1571 | ||
| 1477 | c->rx_coalesce_usecs = q->coalesce_usecs; | 1572 | c->rx_coalesce_usecs = q->coalesce_usecs; |
| @@ -1481,8 +1576,9 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c) | |||
| 1481 | static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e, | 1576 | static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e, |
| 1482 | u8 * data) | 1577 | u8 * data) |
| 1483 | { | 1578 | { |
| 1579 | struct port_info *pi = netdev_priv(dev); | ||
| 1580 | struct adapter *adapter = pi->adapter; | ||
| 1484 | int i, err = 0; | 1581 | int i, err = 0; |
| 1485 | struct adapter *adapter = dev->priv; | ||
| 1486 | 1582 | ||
| 1487 | u8 *buf = kmalloc(EEPROMSIZE, GFP_KERNEL); | 1583 | u8 *buf = kmalloc(EEPROMSIZE, GFP_KERNEL); |
| 1488 | if (!buf) | 1584 | if (!buf) |
| @@ -1501,10 +1597,11 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e, | |||
| 1501 | static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | 1597 | static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, |
| 1502 | u8 * data) | 1598 | u8 * data) |
| 1503 | { | 1599 | { |
| 1600 | struct port_info *pi = netdev_priv(dev); | ||
| 1601 | struct adapter *adapter = pi->adapter; | ||
| 1602 | u32 aligned_offset, aligned_len, *p; | ||
| 1504 | u8 *buf; | 1603 | u8 *buf; |
| 1505 | int err = 0; | 1604 | int err = 0; |
| 1506 | u32 aligned_offset, aligned_len, *p; | ||
| 1507 | struct adapter *adapter = dev->priv; | ||
| 1508 | 1605 | ||
| 1509 | if (eeprom->magic != EEPROM_MAGIC) | 1606 | if (eeprom->magic != EEPROM_MAGIC) |
| 1510 | return -EINVAL; | 1607 | return -EINVAL; |
| @@ -1592,9 +1689,10 @@ static int in_range(int val, int lo, int hi) | |||
| 1592 | 1689 | ||
| 1593 | static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) | 1690 | static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) |
| 1594 | { | 1691 | { |
| 1595 | int ret; | 1692 | struct port_info *pi = netdev_priv(dev); |
| 1693 | struct adapter *adapter = pi->adapter; | ||
| 1596 | u32 cmd; | 1694 | u32 cmd; |
| 1597 | struct adapter *adapter = dev->priv; | 1695 | int ret; |
| 1598 | 1696 | ||
| 1599 | if (copy_from_user(&cmd, useraddr, sizeof(cmd))) | 1697 | if (copy_from_user(&cmd, useraddr, sizeof(cmd))) |
| 1600 | return -EFAULT; | 1698 | return -EFAULT; |
| @@ -1923,10 +2021,10 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) | |||
| 1923 | 2021 | ||
| 1924 | static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd) | 2022 | static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd) |
| 1925 | { | 2023 | { |
| 1926 | int ret, mmd; | ||
| 1927 | struct adapter *adapter = dev->priv; | ||
| 1928 | struct port_info *pi = netdev_priv(dev); | ||
| 1929 | struct mii_ioctl_data *data = if_mii(req); | 2024 | struct mii_ioctl_data *data = if_mii(req); |
| 2025 | struct port_info *pi = netdev_priv(dev); | ||
| 2026 | struct adapter *adapter = pi->adapter; | ||
| 2027 | int ret, mmd; | ||
| 1930 | 2028 | ||
| 1931 | switch (cmd) { | 2029 | switch (cmd) { |
| 1932 | case SIOCGMIIPHY: | 2030 | case SIOCGMIIPHY: |
| @@ -1994,9 +2092,9 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd) | |||
| 1994 | 2092 | ||
| 1995 | static int cxgb_change_mtu(struct net_device *dev, int new_mtu) | 2093 | static int cxgb_change_mtu(struct net_device *dev, int new_mtu) |
| 1996 | { | 2094 | { |
| 1997 | int ret; | ||
| 1998 | struct adapter *adapter = dev->priv; | ||
| 1999 | struct port_info *pi = netdev_priv(dev); | 2095 | struct port_info *pi = netdev_priv(dev); |
| 2096 | struct adapter *adapter = pi->adapter; | ||
| 2097 | int ret; | ||
| 2000 | 2098 | ||
| 2001 | if (new_mtu < 81) /* accommodate SACK */ | 2099 | if (new_mtu < 81) /* accommodate SACK */ |
| 2002 | return -EINVAL; | 2100 | return -EINVAL; |
| @@ -2013,8 +2111,8 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu) | |||
| 2013 | 2111 | ||
| 2014 | static int cxgb_set_mac_addr(struct net_device *dev, void *p) | 2112 | static int cxgb_set_mac_addr(struct net_device *dev, void *p) |
| 2015 | { | 2113 | { |
| 2016 | struct adapter *adapter = dev->priv; | ||
| 2017 | struct port_info *pi = netdev_priv(dev); | 2114 | struct port_info *pi = netdev_priv(dev); |
| 2115 | struct adapter *adapter = pi->adapter; | ||
| 2018 | struct sockaddr *addr = p; | 2116 | struct sockaddr *addr = p; |
| 2019 | 2117 | ||
| 2020 | if (!is_valid_ether_addr(addr->sa_data)) | 2118 | if (!is_valid_ether_addr(addr->sa_data)) |
| @@ -2050,8 +2148,8 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p) | |||
| 2050 | 2148 | ||
| 2051 | static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp) | 2149 | static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp) |
| 2052 | { | 2150 | { |
| 2053 | struct adapter *adapter = dev->priv; | ||
| 2054 | struct port_info *pi = netdev_priv(dev); | 2151 | struct port_info *pi = netdev_priv(dev); |
| 2152 | struct adapter *adapter = pi->adapter; | ||
| 2055 | 2153 | ||
| 2056 | pi->vlan_grp = grp; | 2154 | pi->vlan_grp = grp; |
| 2057 | if (adapter->params.rev > 0) | 2155 | if (adapter->params.rev > 0) |
| @@ -2070,8 +2168,8 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp) | |||
| 2070 | #ifdef CONFIG_NET_POLL_CONTROLLER | 2168 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 2071 | static void cxgb_netpoll(struct net_device *dev) | 2169 | static void cxgb_netpoll(struct net_device *dev) |
| 2072 | { | 2170 | { |
| 2073 | struct adapter *adapter = dev->priv; | ||
| 2074 | struct port_info *pi = netdev_priv(dev); | 2171 | struct port_info *pi = netdev_priv(dev); |
| 2172 | struct adapter *adapter = pi->adapter; | ||
| 2075 | int qidx; | 2173 | int qidx; |
| 2076 | 2174 | ||
| 2077 | for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) { | 2175 | for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) { |
| @@ -2088,42 +2186,6 @@ static void cxgb_netpoll(struct net_device *dev) | |||
| 2088 | } | 2186 | } |
| 2089 | #endif | 2187 | #endif |
| 2090 | 2188 | ||
| 2091 | #define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin" | ||
| 2092 | int update_tpsram(struct adapter *adap) | ||
| 2093 | { | ||
| 2094 | const struct firmware *tpsram; | ||
| 2095 | char buf[64]; | ||
| 2096 | struct device *dev = &adap->pdev->dev; | ||
| 2097 | int ret; | ||
| 2098 | char rev; | ||
| 2099 | |||
| 2100 | rev = adap->params.rev == T3_REV_B2 ? 'b' : 'a'; | ||
| 2101 | |||
| 2102 | snprintf(buf, sizeof(buf), TPSRAM_NAME, rev, | ||
| 2103 | TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO); | ||
| 2104 | |||
| 2105 | ret = request_firmware(&tpsram, buf, dev); | ||
| 2106 | if (ret < 0) { | ||
| 2107 | dev_err(dev, "could not load TP SRAM: unable to load %s\n", | ||
| 2108 | buf); | ||
| 2109 | return ret; | ||
| 2110 | } | ||
| 2111 | |||
| 2112 | ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); | ||
| 2113 | if (ret) | ||
| 2114 | goto release_tpsram; | ||
| 2115 | |||
| 2116 | ret = t3_set_proto_sram(adap, tpsram->data); | ||
| 2117 | if (ret) | ||
| 2118 | dev_err(dev, "loading protocol SRAM failed\n"); | ||
| 2119 | |||
| 2120 | release_tpsram: | ||
| 2121 | release_firmware(tpsram); | ||
| 2122 | |||
| 2123 | return ret; | ||
| 2124 | } | ||
| 2125 | |||
| 2126 | |||
| 2127 | /* | 2189 | /* |
| 2128 | * Periodic accumulation of MAC statistics. | 2190 | * Periodic accumulation of MAC statistics. |
| 2129 | */ | 2191 | */ |
| @@ -2433,6 +2495,7 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
| 2433 | 2495 | ||
| 2434 | adapter->port[i] = netdev; | 2496 | adapter->port[i] = netdev; |
| 2435 | pi = netdev_priv(netdev); | 2497 | pi = netdev_priv(netdev); |
| 2498 | pi->adapter = adapter; | ||
| 2436 | pi->rx_csum_offload = 1; | 2499 | pi->rx_csum_offload = 1; |
| 2437 | pi->nqsets = 1; | 2500 | pi->nqsets = 1; |
| 2438 | pi->first_qset = i; | 2501 | pi->first_qset = i; |
| @@ -2442,7 +2505,6 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
| 2442 | netdev->irq = pdev->irq; | 2505 | netdev->irq = pdev->irq; |
| 2443 | netdev->mem_start = mmio_start; | 2506 | netdev->mem_start = mmio_start; |
| 2444 | netdev->mem_end = mmio_start + mmio_len - 1; | 2507 | netdev->mem_end = mmio_start + mmio_len - 1; |
| 2445 | netdev->priv = adapter; | ||
| 2446 | netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; | 2508 | netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; |
| 2447 | netdev->features |= NETIF_F_LLTX; | 2509 | netdev->features |= NETIF_F_LLTX; |
| 2448 | if (pci_using_dac) | 2510 | if (pci_using_dac) |
| @@ -2467,18 +2529,11 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
| 2467 | SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops); | 2529 | SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops); |
| 2468 | } | 2530 | } |
| 2469 | 2531 | ||
| 2470 | pci_set_drvdata(pdev, adapter->port[0]); | 2532 | pci_set_drvdata(pdev, adapter); |
| 2471 | if (t3_prep_adapter(adapter, ai, 1) < 0) { | 2533 | if (t3_prep_adapter(adapter, ai, 1) < 0) { |
| 2472 | err = -ENODEV; | 2534 | err = -ENODEV; |
| 2473 | goto out_free_dev; | 2535 | goto out_free_dev; |
| 2474 | } | 2536 | } |
| 2475 | |||
| 2476 | err = t3_check_tpsram_version(adapter); | ||
| 2477 | if (err == -EINVAL) | ||
| 2478 | err = update_tpsram(adapter); | ||
| 2479 | |||
| 2480 | if (err) | ||
| 2481 | goto out_free_dev; | ||
| 2482 | 2537 | ||
| 2483 | /* | 2538 | /* |
| 2484 | * The card is now ready to go. If any errors occur during device | 2539 | * The card is now ready to go. If any errors occur during device |
| @@ -2547,11 +2602,10 @@ out_release_regions: | |||
| 2547 | 2602 | ||
| 2548 | static void __devexit remove_one(struct pci_dev *pdev) | 2603 | static void __devexit remove_one(struct pci_dev *pdev) |
| 2549 | { | 2604 | { |
| 2550 | struct net_device *dev = pci_get_drvdata(pdev); | 2605 | struct adapter *adapter = pci_get_drvdata(pdev); |
| 2551 | 2606 | ||
| 2552 | if (dev) { | 2607 | if (adapter) { |
| 2553 | int i; | 2608 | int i; |
| 2554 | struct adapter *adapter = dev->priv; | ||
| 2555 | 2609 | ||
| 2556 | t3_sge_stop(adapter); | 2610 | t3_sge_stop(adapter); |
| 2557 | sysfs_remove_group(&adapter->port[0]->dev.kobj, | 2611 | sysfs_remove_group(&adapter->port[0]->dev.kobj, |
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c index e620ed4c3ff0..bdff7baeb59d 100644 --- a/drivers/net/cxgb3/cxgb3_offload.c +++ b/drivers/net/cxgb3/cxgb3_offload.c | |||
| @@ -593,6 +593,16 @@ int cxgb3_alloc_stid(struct t3cdev *tdev, struct cxgb3_client *client, | |||
| 593 | 593 | ||
| 594 | EXPORT_SYMBOL(cxgb3_alloc_stid); | 594 | EXPORT_SYMBOL(cxgb3_alloc_stid); |
| 595 | 595 | ||
| 596 | /* Get the t3cdev associated with a net_device */ | ||
| 597 | struct t3cdev *dev2t3cdev(struct net_device *dev) | ||
| 598 | { | ||
| 599 | const struct port_info *pi = netdev_priv(dev); | ||
| 600 | |||
| 601 | return (struct t3cdev *)pi->adapter; | ||
| 602 | } | ||
| 603 | |||
| 604 | EXPORT_SYMBOL(dev2t3cdev); | ||
| 605 | |||
| 596 | static int do_smt_write_rpl(struct t3cdev *dev, struct sk_buff *skb) | 606 | static int do_smt_write_rpl(struct t3cdev *dev, struct sk_buff *skb) |
| 597 | { | 607 | { |
| 598 | struct cpl_smt_write_rpl *rpl = cplhdr(skb); | 608 | struct cpl_smt_write_rpl *rpl = cplhdr(skb); |
| @@ -925,7 +935,7 @@ void cxgb_neigh_update(struct neighbour *neigh) | |||
| 925 | struct net_device *dev = neigh->dev; | 935 | struct net_device *dev = neigh->dev; |
| 926 | 936 | ||
| 927 | if (dev && (is_offloading(dev))) { | 937 | if (dev && (is_offloading(dev))) { |
| 928 | struct t3cdev *tdev = T3CDEV(dev); | 938 | struct t3cdev *tdev = dev2t3cdev(dev); |
| 929 | 939 | ||
| 930 | BUG_ON(!tdev); | 940 | BUG_ON(!tdev); |
| 931 | t3_l2t_update(tdev, neigh); | 941 | t3_l2t_update(tdev, neigh); |
| @@ -973,9 +983,9 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new) | |||
| 973 | "device ignored.\n", __FUNCTION__); | 983 | "device ignored.\n", __FUNCTION__); |
| 974 | return; | 984 | return; |
| 975 | } | 985 | } |
| 976 | tdev = T3CDEV(olddev); | 986 | tdev = dev2t3cdev(olddev); |
| 977 | BUG_ON(!tdev); | 987 | BUG_ON(!tdev); |
| 978 | if (tdev != T3CDEV(newdev)) { | 988 | if (tdev != dev2t3cdev(newdev)) { |
| 979 | printk(KERN_WARNING "%s: Redirect to different " | 989 | printk(KERN_WARNING "%s: Redirect to different " |
| 980 | "offload device ignored.\n", __FUNCTION__); | 990 | "offload device ignored.\n", __FUNCTION__); |
| 981 | return; | 991 | return; |
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h index f15446a32efc..7a379138b5a6 100644 --- a/drivers/net/cxgb3/cxgb3_offload.h +++ b/drivers/net/cxgb3/cxgb3_offload.h | |||
| @@ -51,6 +51,8 @@ void cxgb3_offload_deactivate(struct adapter *adapter); | |||
| 51 | 51 | ||
| 52 | void cxgb3_set_dummy_ops(struct t3cdev *dev); | 52 | void cxgb3_set_dummy_ops(struct t3cdev *dev); |
| 53 | 53 | ||
| 54 | struct t3cdev *dev2t3cdev(struct net_device *dev); | ||
| 55 | |||
| 54 | /* | 56 | /* |
| 55 | * Client registration. Users of T3 driver must register themselves. | 57 | * Client registration. Users of T3 driver must register themselves. |
| 56 | * The T3 driver will call the add function of every client for each T3 | 58 | * The T3 driver will call the add function of every client for each T3 |
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index a2cfd68ac757..58a5f60521ed 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
| @@ -1073,7 +1073,7 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1073 | { | 1073 | { |
| 1074 | unsigned int ndesc, pidx, credits, gen, compl; | 1074 | unsigned int ndesc, pidx, credits, gen, compl; |
| 1075 | const struct port_info *pi = netdev_priv(dev); | 1075 | const struct port_info *pi = netdev_priv(dev); |
| 1076 | struct adapter *adap = dev->priv; | 1076 | struct adapter *adap = pi->adapter; |
| 1077 | struct sge_qset *qs = dev2qset(dev); | 1077 | struct sge_qset *qs = dev2qset(dev); |
| 1078 | struct sge_txq *q = &qs->txq[TXQ_ETH]; | 1078 | struct sge_txq *q = &qs->txq[TXQ_ETH]; |
| 1079 | 1079 | ||
| @@ -1326,7 +1326,8 @@ static void restart_ctrlq(unsigned long data) | |||
| 1326 | struct sk_buff *skb; | 1326 | struct sk_buff *skb; |
| 1327 | struct sge_qset *qs = (struct sge_qset *)data; | 1327 | struct sge_qset *qs = (struct sge_qset *)data; |
| 1328 | struct sge_txq *q = &qs->txq[TXQ_CTRL]; | 1328 | struct sge_txq *q = &qs->txq[TXQ_CTRL]; |
| 1329 | struct adapter *adap = qs->netdev->priv; | 1329 | const struct port_info *pi = netdev_priv(qs->netdev); |
| 1330 | struct adapter *adap = pi->adapter; | ||
| 1330 | 1331 | ||
| 1331 | spin_lock(&q->lock); | 1332 | spin_lock(&q->lock); |
| 1332 | again:reclaim_completed_tx_imm(q); | 1333 | again:reclaim_completed_tx_imm(q); |
| @@ -1531,7 +1532,8 @@ static void restart_offloadq(unsigned long data) | |||
| 1531 | struct sk_buff *skb; | 1532 | struct sk_buff *skb; |
| 1532 | struct sge_qset *qs = (struct sge_qset *)data; | 1533 | struct sge_qset *qs = (struct sge_qset *)data; |
| 1533 | struct sge_txq *q = &qs->txq[TXQ_OFLD]; | 1534 | struct sge_txq *q = &qs->txq[TXQ_OFLD]; |
| 1534 | struct adapter *adap = qs->netdev->priv; | 1535 | const struct port_info *pi = netdev_priv(qs->netdev); |
| 1536 | struct adapter *adap = pi->adapter; | ||
| 1535 | 1537 | ||
| 1536 | spin_lock(&q->lock); | 1538 | spin_lock(&q->lock); |
| 1537 | again:reclaim_completed_tx(adap, q); | 1539 | again:reclaim_completed_tx(adap, q); |
| @@ -1675,7 +1677,8 @@ static inline void deliver_partial_bundle(struct t3cdev *tdev, | |||
| 1675 | */ | 1677 | */ |
| 1676 | static int ofld_poll(struct net_device *dev, int *budget) | 1678 | static int ofld_poll(struct net_device *dev, int *budget) |
| 1677 | { | 1679 | { |
| 1678 | struct adapter *adapter = dev->priv; | 1680 | const struct port_info *pi = netdev_priv(dev); |
| 1681 | struct adapter *adapter = pi->adapter; | ||
| 1679 | struct sge_qset *qs = dev2qset(dev); | 1682 | struct sge_qset *qs = dev2qset(dev); |
| 1680 | struct sge_rspq *q = &qs->rspq; | 1683 | struct sge_rspq *q = &qs->rspq; |
| 1681 | int work_done, limit = min(*budget, dev->quota), avail = limit; | 1684 | int work_done, limit = min(*budget, dev->quota), avail = limit; |
| @@ -2075,7 +2078,8 @@ static inline int is_pure_response(const struct rsp_desc *r) | |||
| 2075 | */ | 2078 | */ |
| 2076 | static int napi_rx_handler(struct net_device *dev, int *budget) | 2079 | static int napi_rx_handler(struct net_device *dev, int *budget) |
| 2077 | { | 2080 | { |
| 2078 | struct adapter *adap = dev->priv; | 2081 | const struct port_info *pi = netdev_priv(dev); |
| 2082 | struct adapter *adap = pi->adapter; | ||
| 2079 | struct sge_qset *qs = dev2qset(dev); | 2083 | struct sge_qset *qs = dev2qset(dev); |
| 2080 | int effective_budget = min(*budget, dev->quota); | 2084 | int effective_budget = min(*budget, dev->quota); |
| 2081 | 2085 | ||
| @@ -2205,7 +2209,8 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q) | |||
| 2205 | irqreturn_t t3_sge_intr_msix(int irq, void *cookie) | 2209 | irqreturn_t t3_sge_intr_msix(int irq, void *cookie) |
| 2206 | { | 2210 | { |
| 2207 | struct sge_qset *qs = cookie; | 2211 | struct sge_qset *qs = cookie; |
| 2208 | struct adapter *adap = qs->netdev->priv; | 2212 | const struct port_info *pi = netdev_priv(qs->netdev); |
| 2213 | struct adapter *adap = pi->adapter; | ||
| 2209 | struct sge_rspq *q = &qs->rspq; | 2214 | struct sge_rspq *q = &qs->rspq; |
| 2210 | 2215 | ||
| 2211 | spin_lock(&q->lock); | 2216 | spin_lock(&q->lock); |
| @@ -2224,7 +2229,8 @@ irqreturn_t t3_sge_intr_msix(int irq, void *cookie) | |||
| 2224 | irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie) | 2229 | irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie) |
| 2225 | { | 2230 | { |
| 2226 | struct sge_qset *qs = cookie; | 2231 | struct sge_qset *qs = cookie; |
| 2227 | struct adapter *adap = qs->netdev->priv; | 2232 | const struct port_info *pi = netdev_priv(qs->netdev); |
| 2233 | struct adapter *adap = pi->adapter; | ||
| 2228 | struct sge_rspq *q = &qs->rspq; | 2234 | struct sge_rspq *q = &qs->rspq; |
| 2229 | 2235 | ||
| 2230 | spin_lock(&q->lock); | 2236 | spin_lock(&q->lock); |
| @@ -2508,7 +2514,8 @@ static void sge_timer_cb(unsigned long data) | |||
| 2508 | { | 2514 | { |
| 2509 | spinlock_t *lock; | 2515 | spinlock_t *lock; |
| 2510 | struct sge_qset *qs = (struct sge_qset *)data; | 2516 | struct sge_qset *qs = (struct sge_qset *)data; |
| 2511 | struct adapter *adap = qs->netdev->priv; | 2517 | const struct port_info *pi = netdev_priv(qs->netdev); |
| 2518 | struct adapter *adap = pi->adapter; | ||
| 2512 | 2519 | ||
| 2513 | if (spin_trylock(&qs->txq[TXQ_ETH].lock)) { | 2520 | if (spin_trylock(&qs->txq[TXQ_ETH].lock)) { |
| 2514 | reclaim_completed_tx(adap, &qs->txq[TXQ_ETH]); | 2521 | reclaim_completed_tx(adap, &qs->txq[TXQ_ETH]); |
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index dd3149d94ba8..b02d15daf5d9 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
| @@ -848,16 +848,15 @@ static int t3_write_flash(struct adapter *adapter, unsigned int addr, | |||
| 848 | } | 848 | } |
| 849 | 849 | ||
| 850 | /** | 850 | /** |
| 851 | * t3_check_tpsram_version - read the tp sram version | 851 | * t3_get_tp_version - read the tp sram version |
| 852 | * @adapter: the adapter | 852 | * @adapter: the adapter |
| 853 | * @vers: where to place the version | ||
| 853 | * | 854 | * |
| 854 | * Reads the protocol sram version from serial eeprom. | 855 | * Reads the protocol sram version from sram. |
| 855 | */ | 856 | */ |
| 856 | int t3_check_tpsram_version(struct adapter *adapter) | 857 | int t3_get_tp_version(struct adapter *adapter, u32 *vers) |
| 857 | { | 858 | { |
| 858 | int ret; | 859 | int ret; |
| 859 | u32 vers; | ||
| 860 | unsigned int major, minor; | ||
| 861 | 860 | ||
| 862 | /* Get version loaded in SRAM */ | 861 | /* Get version loaded in SRAM */ |
| 863 | t3_write_reg(adapter, A_TP_EMBED_OP_FIELD0, 0); | 862 | t3_write_reg(adapter, A_TP_EMBED_OP_FIELD0, 0); |
| @@ -866,7 +865,32 @@ int t3_check_tpsram_version(struct adapter *adapter) | |||
| 866 | if (ret) | 865 | if (ret) |
| 867 | return ret; | 866 | return ret; |
| 868 | 867 | ||
| 869 | vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1); | 868 | *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1); |
| 869 | |||
| 870 | return 0; | ||
| 871 | } | ||
| 872 | |||
| 873 | /** | ||
| 874 | * t3_check_tpsram_version - read the tp sram version | ||
| 875 | * @adapter: the adapter | ||
| 876 | * @must_load: set to 1 if loading a new microcode image is required | ||
| 877 | * | ||
| 878 | * Reads the protocol sram version from flash. | ||
| 879 | */ | ||
| 880 | int t3_check_tpsram_version(struct adapter *adapter, int *must_load) | ||
| 881 | { | ||
| 882 | int ret; | ||
| 883 | u32 vers; | ||
| 884 | unsigned int major, minor; | ||
| 885 | |||
| 886 | if (adapter->params.rev == T3_REV_A) | ||
| 887 | return 0; | ||
| 888 | |||
| 889 | *must_load = 1; | ||
| 890 | |||
| 891 | ret = t3_get_tp_version(adapter, &vers); | ||
| 892 | if (ret) | ||
| 893 | return ret; | ||
| 870 | 894 | ||
| 871 | major = G_TP_VERSION_MAJOR(vers); | 895 | major = G_TP_VERSION_MAJOR(vers); |
| 872 | minor = G_TP_VERSION_MINOR(vers); | 896 | minor = G_TP_VERSION_MINOR(vers); |
| @@ -874,6 +898,16 @@ int t3_check_tpsram_version(struct adapter *adapter) | |||
| 874 | if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) | 898 | if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) |
| 875 | return 0; | 899 | return 0; |
| 876 | 900 | ||
| 901 | if (major != TP_VERSION_MAJOR) | ||
| 902 | CH_ERR(adapter, "found wrong TP version (%u.%u), " | ||
| 903 | "driver needs version %d.%d\n", major, minor, | ||
| 904 | TP_VERSION_MAJOR, TP_VERSION_MINOR); | ||
| 905 | else { | ||
| 906 | *must_load = 0; | ||
| 907 | CH_ERR(adapter, "found wrong TP version (%u.%u), " | ||
| 908 | "driver compiled for version %d.%d\n", major, minor, | ||
| 909 | TP_VERSION_MAJOR, TP_VERSION_MINOR); | ||
| 910 | } | ||
| 877 | return -EINVAL; | 911 | return -EINVAL; |
| 878 | } | 912 | } |
| 879 | 913 | ||
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h index fa4099bc0416..77fcc1a4984e 100644 --- a/drivers/net/cxgb3/t3cdev.h +++ b/drivers/net/cxgb3/t3cdev.h | |||
| @@ -42,9 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #define T3CNAMSIZ 16 | 43 | #define T3CNAMSIZ 16 |
| 44 | 44 | ||
| 45 | /* Get the t3cdev associated with a net_device */ | ||
| 46 | #define T3CDEV(netdev) (struct t3cdev *)(netdev->priv) | ||
| 47 | |||
| 48 | struct cxgb3_client; | 45 | struct cxgb3_client; |
| 49 | 46 | ||
| 50 | enum t3ctype { | 47 | enum t3ctype { |
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 3ca1e8ece548..0834ef0eddb4 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #ifdef CONFIG_SERIAL_8250 | 48 | #ifdef CONFIG_SERIAL_8250 |
| 49 | #include <linux/serial_core.h> | 49 | #include <linux/serial_core.h> |
| 50 | #include <linux/serial_8250.h> | 50 | #include <linux/serial_8250.h> |
| 51 | #include <linux/serial_reg.h> | ||
| 51 | #endif | 52 | #endif |
| 52 | 53 | ||
| 53 | #include <linux/netdevice.h> | 54 | #include <linux/netdevice.h> |
| @@ -1151,13 +1152,41 @@ static int ioc3_is_menet(struct pci_dev *pdev) | |||
| 1151 | * Also look in ip27-pci.c:pci_fixup_ioc3() for some comments on working | 1152 | * Also look in ip27-pci.c:pci_fixup_ioc3() for some comments on working |
| 1152 | * around ioc3 oddities in this respect. | 1153 | * around ioc3 oddities in this respect. |
| 1153 | * | 1154 | * |
| 1154 | * The IOC3 serials use a 22MHz clock rate with an additional divider by 3. | 1155 | * The IOC3 serials use a 22MHz clock rate with an additional divider which |
| 1156 | * can be programmed in the SCR register if the DLAB bit is set. | ||
| 1157 | * | ||
| 1158 | * Register to interrupt zero because we share the interrupt with | ||
| 1159 | * the serial driver which we don't properly support yet. | ||
| 1160 | * | ||
| 1161 | * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been | ||
| 1162 | * registered. | ||
| 1155 | */ | 1163 | */ |
| 1164 | static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart) | ||
| 1165 | { | ||
| 1166 | #define COSMISC_CONSTANT 6 | ||
| 1167 | |||
| 1168 | struct uart_port port = { | ||
| 1169 | .irq = 0, | ||
| 1170 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 1171 | .iotype = UPIO_MEM, | ||
| 1172 | .regshift = 0, | ||
| 1173 | .uartclk = (22000000 << 1) / COSMISC_CONSTANT, | ||
| 1174 | |||
| 1175 | .membase = (unsigned char __iomem *) uart, | ||
| 1176 | .mapbase = (unsigned long) uart, | ||
| 1177 | }; | ||
| 1178 | unsigned char lcr; | ||
| 1179 | |||
| 1180 | lcr = uart->iu_lcr; | ||
| 1181 | uart->iu_lcr = lcr | UART_LCR_DLAB; | ||
| 1182 | uart->iu_scr = COSMISC_CONSTANT, | ||
| 1183 | uart->iu_lcr = lcr; | ||
| 1184 | uart->iu_lcr; | ||
| 1185 | serial8250_register_port(&port); | ||
| 1186 | } | ||
| 1156 | 1187 | ||
| 1157 | static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3) | 1188 | static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3) |
| 1158 | { | 1189 | { |
| 1159 | struct uart_port port; | ||
| 1160 | |||
| 1161 | /* | 1190 | /* |
| 1162 | * We need to recognice and treat the fourth MENET serial as it | 1191 | * We need to recognice and treat the fourth MENET serial as it |
| 1163 | * does not have an SuperIO chip attached to it, therefore attempting | 1192 | * does not have an SuperIO chip attached to it, therefore attempting |
| @@ -1171,24 +1200,35 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3) | |||
| 1171 | return; | 1200 | return; |
| 1172 | 1201 | ||
| 1173 | /* | 1202 | /* |
| 1174 | * Register to interrupt zero because we share the interrupt with | 1203 | * Switch IOC3 to PIO mode. It probably already was but let's be |
| 1175 | * the serial driver which we don't properly support yet. | 1204 | * paranoid |
| 1176 | * | ||
| 1177 | * Can't use UPF_IOREMAP as the whole of IOC3 resources have already | ||
| 1178 | * been registered. | ||
| 1179 | */ | 1205 | */ |
| 1180 | memset(&port, 0, sizeof(port)); | 1206 | ioc3->gpcr_s = GPCR_UARTA_MODESEL | GPCR_UARTB_MODESEL; |
| 1181 | port.irq = 0; | 1207 | ioc3->gpcr_s; |
| 1182 | port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF; | 1208 | ioc3->gppr_6 = 0; |
| 1183 | port.iotype = UPIO_MEM; | 1209 | ioc3->gppr_6; |
| 1184 | port.regshift = 0; | 1210 | ioc3->gppr_7 = 0; |
| 1185 | port.uartclk = 22000000 / 3; | 1211 | ioc3->gppr_7; |
| 1186 | 1212 | ioc3->sscr_a = ioc3->sscr_a & ~SSCR_DMA_EN; | |
| 1187 | port.membase = (unsigned char *) &ioc3->sregs.uarta; | 1213 | ioc3->sscr_a; |
| 1188 | serial8250_register_port(&port); | 1214 | ioc3->sscr_b = ioc3->sscr_b & ~SSCR_DMA_EN; |
| 1189 | 1215 | ioc3->sscr_b; | |
| 1190 | port.membase = (unsigned char *) &ioc3->sregs.uartb; | 1216 | /* Disable all SA/B interrupts except for SA/B_INT in SIO_IEC. */ |
| 1191 | serial8250_register_port(&port); | 1217 | ioc3->sio_iec &= ~ (SIO_IR_SA_TX_MT | SIO_IR_SA_RX_FULL | |
| 1218 | SIO_IR_SA_RX_HIGH | SIO_IR_SA_RX_TIMER | | ||
| 1219 | SIO_IR_SA_DELTA_DCD | SIO_IR_SA_DELTA_CTS | | ||
| 1220 | SIO_IR_SA_TX_EXPLICIT | SIO_IR_SA_MEMERR); | ||
| 1221 | ioc3->sio_iec |= SIO_IR_SA_INT; | ||
| 1222 | ioc3->sscr_a = 0; | ||
| 1223 | ioc3->sio_iec &= ~ (SIO_IR_SB_TX_MT | SIO_IR_SB_RX_FULL | | ||
| 1224 | SIO_IR_SB_RX_HIGH | SIO_IR_SB_RX_TIMER | | ||
| 1225 | SIO_IR_SB_DELTA_DCD | SIO_IR_SB_DELTA_CTS | | ||
| 1226 | SIO_IR_SB_TX_EXPLICIT | SIO_IR_SB_MEMERR); | ||
| 1227 | ioc3->sio_iec |= SIO_IR_SB_INT; | ||
| 1228 | ioc3->sscr_b = 0; | ||
| 1229 | |||
| 1230 | ioc3_8250_register(&ioc3->sregs.uarta); | ||
| 1231 | ioc3_8250_register(&ioc3->sregs.uartb); | ||
| 1192 | } | 1232 | } |
| 1193 | #endif | 1233 | #endif |
| 1194 | 1234 | ||
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h index 3276866b17e2..d72f8f8fcb50 100644 --- a/drivers/net/netxen/netxen_nic_hdr.h +++ b/drivers/net/netxen/netxen_nic_hdr.h | |||
| @@ -649,9 +649,11 @@ enum { | |||
| 649 | #define PCIX_INT_VECTOR (0x10100) | 649 | #define PCIX_INT_VECTOR (0x10100) |
| 650 | #define PCIX_INT_MASK (0x10104) | 650 | #define PCIX_INT_MASK (0x10104) |
| 651 | 651 | ||
| 652 | #define PCIX_MN_WINDOW (0x10200) | 652 | #define PCIX_MN_WINDOW_F0 (0x10200) |
| 653 | #define PCIX_MN_WINDOW(_f) (PCIX_MN_WINDOW_F0 + (0x20 * (_f))) | ||
| 653 | #define PCIX_MS_WINDOW (0x10204) | 654 | #define PCIX_MS_WINDOW (0x10204) |
| 654 | #define PCIX_SN_WINDOW (0x10208) | 655 | #define PCIX_SN_WINDOW_F0 (0x10208) |
| 656 | #define PCIX_SN_WINDOW(_f) (PCIX_SN_WINDOW_F0 + (0x20 * (_f))) | ||
| 655 | #define PCIX_CRB_WINDOW (0x10210) | 657 | #define PCIX_CRB_WINDOW (0x10210) |
| 656 | #define PCIX_CRB_WINDOW_F0 (0x10210) | 658 | #define PCIX_CRB_WINDOW_F0 (0x10210) |
| 657 | #define PCIX_CRB_WINDOW_F1 (0x10230) | 659 | #define PCIX_CRB_WINDOW_F1 (0x10230) |
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index aac15421bd1e..a7b8d7f23259 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -904,11 +904,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter, | |||
| 904 | ddr_mn_window = window; | 904 | ddr_mn_window = window; |
| 905 | writel(window, PCI_OFFSET_SECOND_RANGE(adapter, | 905 | writel(window, PCI_OFFSET_SECOND_RANGE(adapter, |
| 906 | NETXEN_PCIX_PH_REG | 906 | NETXEN_PCIX_PH_REG |
| 907 | (PCIX_MN_WINDOW))); | 907 | (PCIX_MN_WINDOW(adapter->ahw.pci_func)))); |
| 908 | /* MUST make sure window is set before we forge on... */ | 908 | /* MUST make sure window is set before we forge on... */ |
| 909 | readl(PCI_OFFSET_SECOND_RANGE(adapter, | 909 | readl(PCI_OFFSET_SECOND_RANGE(adapter, |
| 910 | NETXEN_PCIX_PH_REG | 910 | NETXEN_PCIX_PH_REG |
| 911 | (PCIX_MN_WINDOW))); | 911 | (PCIX_MN_WINDOW(adapter->ahw.pci_func)))); |
| 912 | } | 912 | } |
| 913 | addr -= (window * NETXEN_WINDOW_ONE); | 913 | addr -= (window * NETXEN_WINDOW_ONE); |
| 914 | addr += NETXEN_PCI_DDR_NET; | 914 | addr += NETXEN_PCI_DDR_NET; |
| @@ -929,11 +929,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter, | |||
| 929 | writel((window << 22), | 929 | writel((window << 22), |
| 930 | PCI_OFFSET_SECOND_RANGE(adapter, | 930 | PCI_OFFSET_SECOND_RANGE(adapter, |
| 931 | NETXEN_PCIX_PH_REG | 931 | NETXEN_PCIX_PH_REG |
| 932 | (PCIX_SN_WINDOW))); | 932 | (PCIX_SN_WINDOW(adapter->ahw.pci_func)))); |
| 933 | /* MUST make sure window is set before we forge on... */ | 933 | /* MUST make sure window is set before we forge on... */ |
| 934 | readl(PCI_OFFSET_SECOND_RANGE(adapter, | 934 | readl(PCI_OFFSET_SECOND_RANGE(adapter, |
| 935 | NETXEN_PCIX_PH_REG | 935 | NETXEN_PCIX_PH_REG |
| 936 | (PCIX_SN_WINDOW))); | 936 | (PCIX_SN_WINDOW(adapter->ahw.pci_func)))); |
| 937 | } | 937 | } |
| 938 | addr -= (window * 0x400000); | 938 | addr -= (window * 0x400000); |
| 939 | addr += NETXEN_PCI_QDR_NET; | 939 | addr += NETXEN_PCI_QDR_NET; |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 08a62acde8bf..3122d0101638 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -639,10 +639,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 639 | NETXEN_CRB_NORMALIZE(adapter, | 639 | NETXEN_CRB_NORMALIZE(adapter, |
| 640 | NETXEN_ROMUSB_GLB_PEGTUNE_DONE)); | 640 | NETXEN_ROMUSB_GLB_PEGTUNE_DONE)); |
| 641 | /* Handshake with the card before we register the devices. */ | 641 | /* Handshake with the card before we register the devices. */ |
| 642 | writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE)); | ||
| 643 | netxen_pinit_from_rom(adapter, 0); | ||
| 644 | msleep(1); | ||
| 645 | netxen_load_firmware(adapter); | ||
| 646 | netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE); | 642 | netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE); |
| 647 | } | 643 | } |
| 648 | 644 | ||
| @@ -750,9 +746,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) | |||
| 750 | 746 | ||
| 751 | netxen_nic_disable_int(adapter); | 747 | netxen_nic_disable_int(adapter); |
| 752 | 748 | ||
| 753 | if (adapter->irq) | ||
| 754 | free_irq(adapter->irq, adapter); | ||
| 755 | |||
| 756 | if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) { | 749 | if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) { |
| 757 | init_firmware_done++; | 750 | init_firmware_done++; |
| 758 | netxen_free_hw_resources(adapter); | 751 | netxen_free_hw_resources(adapter); |
| @@ -776,13 +769,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) | |||
| 776 | } | 769 | } |
| 777 | } | 770 | } |
| 778 | 771 | ||
| 779 | if (adapter->flags & NETXEN_NIC_MSI_ENABLED) | ||
| 780 | pci_disable_msi(pdev); | ||
| 781 | |||
| 782 | vfree(adapter->cmd_buf_arr); | 772 | vfree(adapter->cmd_buf_arr); |
| 783 | 773 | ||
| 784 | pci_disable_device(pdev); | ||
| 785 | |||
| 786 | if (adapter->portnum == 0) { | 774 | if (adapter->portnum == 0) { |
| 787 | if (init_firmware_done) { | 775 | if (init_firmware_done) { |
| 788 | i = 100; | 776 | i = 100; |
| @@ -833,12 +821,19 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) | |||
| 833 | } | 821 | } |
| 834 | } | 822 | } |
| 835 | 823 | ||
| 824 | if (adapter->irq) | ||
| 825 | free_irq(adapter->irq, adapter); | ||
| 826 | |||
| 827 | if (adapter->flags & NETXEN_NIC_MSI_ENABLED) | ||
| 828 | pci_disable_msi(pdev); | ||
| 829 | |||
| 836 | iounmap(adapter->ahw.db_base); | 830 | iounmap(adapter->ahw.db_base); |
| 837 | iounmap(adapter->ahw.pci_base0); | 831 | iounmap(adapter->ahw.pci_base0); |
| 838 | iounmap(adapter->ahw.pci_base1); | 832 | iounmap(adapter->ahw.pci_base1); |
| 839 | iounmap(adapter->ahw.pci_base2); | 833 | iounmap(adapter->ahw.pci_base2); |
| 840 | 834 | ||
| 841 | pci_release_regions(pdev); | 835 | pci_release_regions(pdev); |
| 836 | pci_disable_device(pdev); | ||
| 842 | pci_set_drvdata(pdev, NULL); | 837 | pci_set_drvdata(pdev, NULL); |
| 843 | 838 | ||
| 844 | free_netdev(netdev); | 839 | free_netdev(netdev); |
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 13d1c0a2a25f..e56503918436 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
| @@ -556,7 +556,6 @@ static int gelic_net_stop(struct net_device *netdev) | |||
| 556 | { | 556 | { |
| 557 | struct gelic_net_card *card = netdev_priv(netdev); | 557 | struct gelic_net_card *card = netdev_priv(netdev); |
| 558 | 558 | ||
| 559 | netif_poll_disable(netdev); | ||
| 560 | netif_stop_queue(netdev); | 559 | netif_stop_queue(netdev); |
| 561 | 560 | ||
| 562 | /* turn off DMA, force end */ | 561 | /* turn off DMA, force end */ |
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h index ec18bae05df0..6d4959807abc 100644 --- a/drivers/s390/net/qeth.h +++ b/drivers/s390/net/qeth.h | |||
| @@ -1178,9 +1178,9 @@ qeth_ipaddr_to_string(enum qeth_prot_versions proto, const __u8 *addr, | |||
| 1178 | char *buf) | 1178 | char *buf) |
| 1179 | { | 1179 | { |
| 1180 | if (proto == QETH_PROT_IPV4) | 1180 | if (proto == QETH_PROT_IPV4) |
| 1181 | return qeth_ipaddr4_to_string(addr, buf); | 1181 | qeth_ipaddr4_to_string(addr, buf); |
| 1182 | else if (proto == QETH_PROT_IPV6) | 1182 | else if (proto == QETH_PROT_IPV6) |
| 1183 | return qeth_ipaddr6_to_string(addr, buf); | 1183 | qeth_ipaddr6_to_string(addr, buf); |
| 1184 | } | 1184 | } |
| 1185 | 1185 | ||
| 1186 | static inline int | 1186 | static inline int |
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 57f69434fbf9..f3e6fbeb2123 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
| @@ -561,7 +561,7 @@ qeth_set_offline(struct ccwgroup_device *cgdev) | |||
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | static int | 563 | static int |
| 564 | qeth_wait_for_threads(struct qeth_card *card, unsigned long threads); | 564 | qeth_threads_running(struct qeth_card *card, unsigned long threads); |
| 565 | 565 | ||
| 566 | 566 | ||
| 567 | static void | 567 | static void |
| @@ -576,8 +576,7 @@ qeth_remove_device(struct ccwgroup_device *cgdev) | |||
| 576 | if (!card) | 576 | if (!card) |
| 577 | return; | 577 | return; |
| 578 | 578 | ||
| 579 | if (qeth_wait_for_threads(card, 0xffffffff)) | 579 | wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0); |
| 580 | return; | ||
| 581 | 580 | ||
| 582 | if (cgdev->state == CCWGROUP_ONLINE){ | 581 | if (cgdev->state == CCWGROUP_ONLINE){ |
| 583 | card->use_hard_stop = 1; | 582 | card->use_hard_stop = 1; |
| @@ -1542,16 +1541,21 @@ qeth_idx_write_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob) | |||
| 1542 | card = CARD_FROM_CDEV(channel->ccwdev); | 1541 | card = CARD_FROM_CDEV(channel->ccwdev); |
| 1543 | 1542 | ||
| 1544 | if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) { | 1543 | if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) { |
| 1545 | PRINT_ERR("IDX_ACTIVATE on write channel device %s: negative " | 1544 | if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19) |
| 1546 | "reply\n", CARD_WDEV_ID(card)); | 1545 | PRINT_ERR("IDX_ACTIVATE on write channel device %s: " |
| 1546 | "adapter exclusively used by another host\n", | ||
| 1547 | CARD_WDEV_ID(card)); | ||
| 1548 | else | ||
| 1549 | PRINT_ERR("IDX_ACTIVATE on write channel device %s: " | ||
| 1550 | "negative reply\n", CARD_WDEV_ID(card)); | ||
| 1547 | goto out; | 1551 | goto out; |
| 1548 | } | 1552 | } |
| 1549 | memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2); | 1553 | memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2); |
| 1550 | if ((temp & ~0x0100) != qeth_peer_func_level(card->info.func_level)) { | 1554 | if ((temp & ~0x0100) != qeth_peer_func_level(card->info.func_level)) { |
| 1551 | PRINT_WARN("IDX_ACTIVATE on write channel device %s: " | 1555 | PRINT_WARN("IDX_ACTIVATE on write channel device %s: " |
| 1552 | "function level mismatch " | 1556 | "function level mismatch " |
| 1553 | "(sent: 0x%x, received: 0x%x)\n", | 1557 | "(sent: 0x%x, received: 0x%x)\n", |
| 1554 | CARD_WDEV_ID(card), card->info.func_level, temp); | 1558 | CARD_WDEV_ID(card), card->info.func_level, temp); |
| 1555 | goto out; | 1559 | goto out; |
| 1556 | } | 1560 | } |
| 1557 | channel->state = CH_STATE_UP; | 1561 | channel->state = CH_STATE_UP; |
| @@ -1597,8 +1601,13 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob) | |||
| 1597 | goto out; | 1601 | goto out; |
| 1598 | } | 1602 | } |
| 1599 | if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) { | 1603 | if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) { |
| 1600 | PRINT_ERR("IDX_ACTIVATE on read channel device %s: negative " | 1604 | if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19) |
| 1601 | "reply\n", CARD_RDEV_ID(card)); | 1605 | PRINT_ERR("IDX_ACTIVATE on read channel device %s: " |
| 1606 | "adapter exclusively used by another host\n", | ||
| 1607 | CARD_RDEV_ID(card)); | ||
| 1608 | else | ||
| 1609 | PRINT_ERR("IDX_ACTIVATE on read channel device %s: " | ||
| 1610 | "negative reply\n", CARD_RDEV_ID(card)); | ||
| 1602 | goto out; | 1611 | goto out; |
| 1603 | } | 1612 | } |
| 1604 | 1613 | ||
| @@ -1613,8 +1622,8 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob) | |||
| 1613 | memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2); | 1622 | memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2); |
| 1614 | if (temp != qeth_peer_func_level(card->info.func_level)) { | 1623 | if (temp != qeth_peer_func_level(card->info.func_level)) { |
| 1615 | PRINT_WARN("IDX_ACTIVATE on read channel device %s: function " | 1624 | PRINT_WARN("IDX_ACTIVATE on read channel device %s: function " |
| 1616 | "level mismatch (sent: 0x%x, received: 0x%x)\n", | 1625 | "level mismatch (sent: 0x%x, received: 0x%x)\n", |
| 1617 | CARD_RDEV_ID(card), card->info.func_level, temp); | 1626 | CARD_RDEV_ID(card), card->info.func_level, temp); |
| 1618 | goto out; | 1627 | goto out; |
| 1619 | } | 1628 | } |
| 1620 | memcpy(&card->token.issuer_rm_r, | 1629 | memcpy(&card->token.issuer_rm_r, |
| @@ -2496,7 +2505,7 @@ qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb, | |||
| 2496 | struct iphdr *ip_hdr; | 2505 | struct iphdr *ip_hdr; |
| 2497 | 2506 | ||
| 2498 | QETH_DBF_TEXT(trace,5,"skbfktr"); | 2507 | QETH_DBF_TEXT(trace,5,"skbfktr"); |
| 2499 | skb_set_mac_header(skb, -QETH_FAKE_LL_LEN_TR); | 2508 | skb_set_mac_header(skb, (int)-QETH_FAKE_LL_LEN_TR); |
| 2500 | /* this is a fake ethernet header */ | 2509 | /* this is a fake ethernet header */ |
| 2501 | fake_hdr = tr_hdr(skb); | 2510 | fake_hdr = tr_hdr(skb); |
| 2502 | 2511 | ||
| @@ -2804,13 +2813,16 @@ qeth_queue_input_buffer(struct qeth_card *card, int index) | |||
| 2804 | if (newcount < count) { | 2813 | if (newcount < count) { |
| 2805 | /* we are in memory shortage so we switch back to | 2814 | /* we are in memory shortage so we switch back to |
| 2806 | traditional skb allocation and drop packages */ | 2815 | traditional skb allocation and drop packages */ |
| 2807 | if (atomic_cmpxchg(&card->force_alloc_skb, 0, 1)) | 2816 | if (!atomic_read(&card->force_alloc_skb) && |
| 2808 | printk(KERN_WARNING | 2817 | net_ratelimit()) |
| 2809 | "qeth: switch to alloc skb\n"); | 2818 | PRINT_WARN("Switch to alloc skb\n"); |
| 2819 | atomic_set(&card->force_alloc_skb, 3); | ||
| 2810 | count = newcount; | 2820 | count = newcount; |
| 2811 | } else { | 2821 | } else { |
| 2812 | if (atomic_cmpxchg(&card->force_alloc_skb, 1, 0)) | 2822 | if ((atomic_read(&card->force_alloc_skb) == 1) && |
| 2813 | printk(KERN_WARNING "qeth: switch to sg\n"); | 2823 | net_ratelimit()) |
| 2824 | PRINT_WARN("Switch to sg\n"); | ||
| 2825 | atomic_add_unless(&card->force_alloc_skb, -1, 0); | ||
| 2814 | } | 2826 | } |
| 2815 | 2827 | ||
| 2816 | /* | 2828 | /* |
| @@ -3354,10 +3366,12 @@ out_freeoutq: | |||
| 3354 | while (i > 0) | 3366 | while (i > 0) |
| 3355 | kfree(card->qdio.out_qs[--i]); | 3367 | kfree(card->qdio.out_qs[--i]); |
| 3356 | kfree(card->qdio.out_qs); | 3368 | kfree(card->qdio.out_qs); |
| 3369 | card->qdio.out_qs = NULL; | ||
| 3357 | out_freepool: | 3370 | out_freepool: |
| 3358 | qeth_free_buffer_pool(card); | 3371 | qeth_free_buffer_pool(card); |
| 3359 | out_freeinq: | 3372 | out_freeinq: |
| 3360 | kfree(card->qdio.in_q); | 3373 | kfree(card->qdio.in_q); |
| 3374 | card->qdio.in_q = NULL; | ||
| 3361 | out_nomem: | 3375 | out_nomem: |
| 3362 | atomic_set(&card->qdio.state, QETH_QDIO_UNINITIALIZED); | 3376 | atomic_set(&card->qdio.state, QETH_QDIO_UNINITIALIZED); |
| 3363 | return -ENOMEM; | 3377 | return -ENOMEM; |
| @@ -3373,16 +3387,20 @@ qeth_free_qdio_buffers(struct qeth_card *card) | |||
| 3373 | QETH_QDIO_UNINITIALIZED) | 3387 | QETH_QDIO_UNINITIALIZED) |
| 3374 | return; | 3388 | return; |
| 3375 | kfree(card->qdio.in_q); | 3389 | kfree(card->qdio.in_q); |
| 3390 | card->qdio.in_q = NULL; | ||
| 3376 | /* inbound buffer pool */ | 3391 | /* inbound buffer pool */ |
| 3377 | qeth_free_buffer_pool(card); | 3392 | qeth_free_buffer_pool(card); |
| 3378 | /* free outbound qdio_qs */ | 3393 | /* free outbound qdio_qs */ |
| 3379 | for (i = 0; i < card->qdio.no_out_queues; ++i){ | 3394 | if (card->qdio.out_qs) { |
| 3380 | for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) | 3395 | for (i = 0; i < card->qdio.no_out_queues; ++i) { |
| 3381 | qeth_clear_output_buffer(card->qdio.out_qs[i], | 3396 | for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) |
| 3382 | &card->qdio.out_qs[i]->bufs[j]); | 3397 | qeth_clear_output_buffer(card->qdio.out_qs[i], |
| 3383 | kfree(card->qdio.out_qs[i]); | 3398 | &card->qdio.out_qs[i]->bufs[j]); |
| 3399 | kfree(card->qdio.out_qs[i]); | ||
| 3400 | } | ||
| 3401 | kfree(card->qdio.out_qs); | ||
| 3402 | card->qdio.out_qs = NULL; | ||
| 3384 | } | 3403 | } |
| 3385 | kfree(card->qdio.out_qs); | ||
| 3386 | } | 3404 | } |
| 3387 | 3405 | ||
| 3388 | static void | 3406 | static void |
| @@ -3393,7 +3411,7 @@ qeth_clear_qdio_buffers(struct qeth_card *card) | |||
| 3393 | QETH_DBF_TEXT(trace, 2, "clearqdbf"); | 3411 | QETH_DBF_TEXT(trace, 2, "clearqdbf"); |
| 3394 | /* clear outbound buffers to free skbs */ | 3412 | /* clear outbound buffers to free skbs */ |
| 3395 | for (i = 0; i < card->qdio.no_out_queues; ++i) | 3413 | for (i = 0; i < card->qdio.no_out_queues; ++i) |
| 3396 | if (card->qdio.out_qs[i]){ | 3414 | if (card->qdio.out_qs && card->qdio.out_qs[i]) { |
| 3397 | for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) | 3415 | for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) |
| 3398 | qeth_clear_output_buffer(card->qdio.out_qs[i], | 3416 | qeth_clear_output_buffer(card->qdio.out_qs[i], |
| 3399 | &card->qdio.out_qs[i]->bufs[j]); | 3417 | &card->qdio.out_qs[i]->bufs[j]); |
| @@ -4553,6 +4571,53 @@ qeth_get_elements_no(struct qeth_card *card, void *hdr, | |||
| 4553 | return elements_needed; | 4571 | return elements_needed; |
| 4554 | } | 4572 | } |
| 4555 | 4573 | ||
| 4574 | static void qeth_tx_csum(struct sk_buff *skb) | ||
| 4575 | { | ||
| 4576 | int tlen; | ||
| 4577 | |||
| 4578 | if (skb->protocol == htons(ETH_P_IP)) { | ||
| 4579 | tlen = ntohs(ip_hdr(skb)->tot_len) - (ip_hdr(skb)->ihl << 2); | ||
| 4580 | switch (ip_hdr(skb)->protocol) { | ||
| 4581 | case IPPROTO_TCP: | ||
| 4582 | tcp_hdr(skb)->check = 0; | ||
| 4583 | tcp_hdr(skb)->check = csum_tcpudp_magic( | ||
| 4584 | ip_hdr(skb)->saddr, ip_hdr(skb)->daddr, | ||
| 4585 | tlen, ip_hdr(skb)->protocol, | ||
| 4586 | skb_checksum(skb, skb_transport_offset(skb), | ||
| 4587 | tlen, 0)); | ||
| 4588 | break; | ||
| 4589 | case IPPROTO_UDP: | ||
| 4590 | udp_hdr(skb)->check = 0; | ||
| 4591 | udp_hdr(skb)->check = csum_tcpudp_magic( | ||
| 4592 | ip_hdr(skb)->saddr, ip_hdr(skb)->daddr, | ||
| 4593 | tlen, ip_hdr(skb)->protocol, | ||
| 4594 | skb_checksum(skb, skb_transport_offset(skb), | ||
| 4595 | tlen, 0)); | ||
| 4596 | break; | ||
| 4597 | } | ||
| 4598 | } else if (skb->protocol == htons(ETH_P_IPV6)) { | ||
| 4599 | switch (ipv6_hdr(skb)->nexthdr) { | ||
| 4600 | case IPPROTO_TCP: | ||
| 4601 | tcp_hdr(skb)->check = 0; | ||
| 4602 | tcp_hdr(skb)->check = csum_ipv6_magic( | ||
| 4603 | &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr, | ||
| 4604 | ipv6_hdr(skb)->payload_len, | ||
| 4605 | ipv6_hdr(skb)->nexthdr, | ||
| 4606 | skb_checksum(skb, skb_transport_offset(skb), | ||
| 4607 | ipv6_hdr(skb)->payload_len, 0)); | ||
| 4608 | break; | ||
| 4609 | case IPPROTO_UDP: | ||
| 4610 | udp_hdr(skb)->check = 0; | ||
| 4611 | udp_hdr(skb)->check = csum_ipv6_magic( | ||
| 4612 | &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr, | ||
| 4613 | ipv6_hdr(skb)->payload_len, | ||
| 4614 | ipv6_hdr(skb)->nexthdr, | ||
| 4615 | skb_checksum(skb, skb_transport_offset(skb), | ||
| 4616 | ipv6_hdr(skb)->payload_len, 0)); | ||
| 4617 | break; | ||
| 4618 | } | ||
| 4619 | } | ||
| 4620 | } | ||
| 4556 | 4621 | ||
| 4557 | static int | 4622 | static int |
| 4558 | qeth_send_packet(struct qeth_card *card, struct sk_buff *skb) | 4623 | qeth_send_packet(struct qeth_card *card, struct sk_buff *skb) |
| @@ -4638,12 +4703,22 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb) | |||
| 4638 | elements_needed += elems; | 4703 | elements_needed += elems; |
| 4639 | } | 4704 | } |
| 4640 | 4705 | ||
| 4706 | if ((large_send == QETH_LARGE_SEND_NO) && | ||
| 4707 | (skb->ip_summed == CHECKSUM_PARTIAL)) | ||
| 4708 | qeth_tx_csum(new_skb); | ||
| 4709 | |||
| 4641 | if (card->info.type != QETH_CARD_TYPE_IQD) | 4710 | if (card->info.type != QETH_CARD_TYPE_IQD) |
| 4642 | rc = qeth_do_send_packet(card, queue, new_skb, hdr, | 4711 | rc = qeth_do_send_packet(card, queue, new_skb, hdr, |
| 4643 | elements_needed, ctx); | 4712 | elements_needed, ctx); |
| 4644 | else | 4713 | else { |
| 4714 | if ((skb->protocol == htons(ETH_P_ARP)) && | ||
| 4715 | (card->dev->flags & IFF_NOARP)) { | ||
| 4716 | __qeth_free_new_skb(skb, new_skb); | ||
| 4717 | return -EPERM; | ||
| 4718 | } | ||
| 4645 | rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr, | 4719 | rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr, |
| 4646 | elements_needed, ctx); | 4720 | elements_needed, ctx); |
| 4721 | } | ||
| 4647 | if (!rc) { | 4722 | if (!rc) { |
| 4648 | card->stats.tx_packets++; | 4723 | card->stats.tx_packets++; |
| 4649 | card->stats.tx_bytes += tx_bytes; | 4724 | card->stats.tx_bytes += tx_bytes; |
| @@ -6385,20 +6460,18 @@ qeth_deregister_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr) | |||
| 6385 | static u32 | 6460 | static u32 |
| 6386 | qeth_ethtool_get_tx_csum(struct net_device *dev) | 6461 | qeth_ethtool_get_tx_csum(struct net_device *dev) |
| 6387 | { | 6462 | { |
| 6388 | /* We may need to say that we support tx csum offload if | 6463 | return (dev->features & NETIF_F_HW_CSUM) != 0; |
| 6389 | * we do EDDP or TSO. There are discussions going on to | ||
| 6390 | * enforce rules in the stack and in ethtool that make | ||
| 6391 | * SG and TSO depend on HW_CSUM. At the moment there are | ||
| 6392 | * no such rules.... | ||
| 6393 | * If we say yes here, we have to checksum outbound packets | ||
| 6394 | * any time. */ | ||
| 6395 | return 0; | ||
| 6396 | } | 6464 | } |
| 6397 | 6465 | ||
| 6398 | static int | 6466 | static int |
| 6399 | qeth_ethtool_set_tx_csum(struct net_device *dev, u32 data) | 6467 | qeth_ethtool_set_tx_csum(struct net_device *dev, u32 data) |
| 6400 | { | 6468 | { |
| 6401 | return -EINVAL; | 6469 | if (data) |
| 6470 | dev->features |= NETIF_F_HW_CSUM; | ||
| 6471 | else | ||
| 6472 | dev->features &= ~NETIF_F_HW_CSUM; | ||
| 6473 | |||
| 6474 | return 0; | ||
| 6402 | } | 6475 | } |
| 6403 | 6476 | ||
| 6404 | static u32 | 6477 | static u32 |
| @@ -7412,7 +7485,8 @@ qeth_start_ipa_tso(struct qeth_card *card) | |||
| 7412 | } | 7485 | } |
| 7413 | if (rc && (card->options.large_send == QETH_LARGE_SEND_TSO)){ | 7486 | if (rc && (card->options.large_send == QETH_LARGE_SEND_TSO)){ |
| 7414 | card->options.large_send = QETH_LARGE_SEND_NO; | 7487 | card->options.large_send = QETH_LARGE_SEND_NO; |
| 7415 | card->dev->features &= ~ (NETIF_F_TSO | NETIF_F_SG); | 7488 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | |
| 7489 | NETIF_F_HW_CSUM); | ||
| 7416 | } | 7490 | } |
| 7417 | return rc; | 7491 | return rc; |
| 7418 | } | 7492 | } |
| @@ -7552,22 +7626,26 @@ qeth_set_large_send(struct qeth_card *card, enum qeth_large_send_types type) | |||
| 7552 | card->options.large_send = type; | 7626 | card->options.large_send = type; |
| 7553 | switch (card->options.large_send) { | 7627 | switch (card->options.large_send) { |
| 7554 | case QETH_LARGE_SEND_EDDP: | 7628 | case QETH_LARGE_SEND_EDDP: |
| 7555 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG; | 7629 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG | |
| 7630 | NETIF_F_HW_CSUM; | ||
| 7556 | break; | 7631 | break; |
| 7557 | case QETH_LARGE_SEND_TSO: | 7632 | case QETH_LARGE_SEND_TSO: |
| 7558 | if (qeth_is_supported(card, IPA_OUTBOUND_TSO)){ | 7633 | if (qeth_is_supported(card, IPA_OUTBOUND_TSO)){ |
| 7559 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG; | 7634 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG | |
| 7635 | NETIF_F_HW_CSUM; | ||
| 7560 | } else { | 7636 | } else { |
| 7561 | PRINT_WARN("TSO not supported on %s. " | 7637 | PRINT_WARN("TSO not supported on %s. " |
| 7562 | "large_send set to 'no'.\n", | 7638 | "large_send set to 'no'.\n", |
| 7563 | card->dev->name); | 7639 | card->dev->name); |
| 7564 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG); | 7640 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | |
| 7641 | NETIF_F_HW_CSUM); | ||
| 7565 | card->options.large_send = QETH_LARGE_SEND_NO; | 7642 | card->options.large_send = QETH_LARGE_SEND_NO; |
| 7566 | rc = -EOPNOTSUPP; | 7643 | rc = -EOPNOTSUPP; |
| 7567 | } | 7644 | } |
| 7568 | break; | 7645 | break; |
| 7569 | default: /* includes QETH_LARGE_SEND_NO */ | 7646 | default: /* includes QETH_LARGE_SEND_NO */ |
| 7570 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG); | 7647 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | |
| 7648 | NETIF_F_HW_CSUM); | ||
| 7571 | break; | 7649 | break; |
| 7572 | } | 7650 | } |
| 7573 | if (card->state == CARD_STATE_UP) | 7651 | if (card->state == CARD_STATE_UP) |
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h index 1d8083c91765..6de2da5ed5fd 100644 --- a/drivers/s390/net/qeth_mpc.h +++ b/drivers/s390/net/qeth_mpc.h | |||
| @@ -565,6 +565,7 @@ extern unsigned char IDX_ACTIVATE_WRITE[]; | |||
| 565 | #define QETH_IDX_ACT_QDIO_DEV_REALADDR(buffer) (buffer+0x20) | 565 | #define QETH_IDX_ACT_QDIO_DEV_REALADDR(buffer) (buffer+0x20) |
| 566 | #define QETH_IS_IDX_ACT_POS_REPLY(buffer) (((buffer)[0x08]&3)==2) | 566 | #define QETH_IS_IDX_ACT_POS_REPLY(buffer) (((buffer)[0x08]&3)==2) |
| 567 | #define QETH_IDX_REPLY_LEVEL(buffer) (buffer+0x12) | 567 | #define QETH_IDX_REPLY_LEVEL(buffer) (buffer+0x12) |
| 568 | #define QETH_IDX_ACT_CAUSE_CODE(buffer) (buffer)[0x09] | ||
| 568 | 569 | ||
| 569 | #define PDU_ENCAPSULATION(buffer) \ | 570 | #define PDU_ENCAPSULATION(buffer) \ |
| 570 | (buffer + *(buffer + (*(buffer+0x0b)) + \ | 571 | (buffer + *(buffer + (*(buffer+0x0b)) + \ |
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c index bb0287ad1aac..2cc3f3a0e393 100644 --- a/drivers/s390/net/qeth_sys.c +++ b/drivers/s390/net/qeth_sys.c | |||
| @@ -1760,10 +1760,10 @@ qeth_remove_device_attributes(struct device *dev) | |||
| 1760 | { | 1760 | { |
| 1761 | struct qeth_card *card = dev->driver_data; | 1761 | struct qeth_card *card = dev->driver_data; |
| 1762 | 1762 | ||
| 1763 | if (card->info.type == QETH_CARD_TYPE_OSN) | 1763 | if (card->info.type == QETH_CARD_TYPE_OSN) { |
| 1764 | return sysfs_remove_group(&dev->kobj, | 1764 | sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group); |
| 1765 | &qeth_osn_device_attr_group); | 1765 | return; |
| 1766 | 1766 | } | |
| 1767 | sysfs_remove_group(&dev->kobj, &qeth_device_attr_group); | 1767 | sysfs_remove_group(&dev->kobj, &qeth_device_attr_group); |
| 1768 | sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group); | 1768 | sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group); |
| 1769 | sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group); | 1769 | sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group); |
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index bd66339f7a3f..1ea1ed82c352 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
| @@ -610,7 +610,7 @@ static int pci_netmos_init(struct pci_dev *dev) | |||
| 610 | /* enable IO_Space bit */ | 610 | /* enable IO_Space bit */ |
| 611 | #define ITE_887x_POSIO_ENABLE (1 << 31) | 611 | #define ITE_887x_POSIO_ENABLE (1 << 31) |
| 612 | 612 | ||
| 613 | static int __devinit pci_ite887x_init(struct pci_dev *dev) | 613 | static int pci_ite887x_init(struct pci_dev *dev) |
| 614 | { | 614 | { |
| 615 | /* inta_addr are the configuration addresses of the ITE */ | 615 | /* inta_addr are the configuration addresses of the ITE */ |
| 616 | static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0, | 616 | static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0, |
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index ad144054da30..b0469749310a 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
| @@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) | |||
| 251 | xfer->rx_dma = dma_map_single(dev, | 251 | xfer->rx_dma = dma_map_single(dev, |
| 252 | xfer->rx_buf, xfer->len, | 252 | xfer->rx_buf, xfer->len, |
| 253 | DMA_FROM_DEVICE); | 253 | DMA_FROM_DEVICE); |
| 254 | if (dma_mapping_error(xfer->tx_dma)) { | 254 | if (dma_mapping_error(xfer->rx_dma)) { |
| 255 | if (xfer->tx_buf) | 255 | if (xfer->tx_buf) |
| 256 | dma_unmap_single(dev, | 256 | dma_unmap_single(dev, |
| 257 | xfer->tx_dma, xfer->len, | 257 | xfer->tx_dma, xfer->len, |
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 48587c27050d..f540ed77a102 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
| @@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev) | |||
| 1303 | #define bfin5xx_spi_resume NULL | 1303 | #define bfin5xx_spi_resume NULL |
| 1304 | #endif /* CONFIG_PM */ | 1304 | #endif /* CONFIG_PM */ |
| 1305 | 1305 | ||
| 1306 | MODULE_ALIAS("bfin-spi-master"); /* for platform bus hotplug */ | ||
| 1306 | static struct platform_driver bfin5xx_spi_driver = { | 1307 | static struct platform_driver bfin5xx_spi_driver = { |
| 1307 | .driver = { | 1308 | .driver = { |
| 1308 | .name = "bfin-spi-master", | 1309 | .name = "bfin-spi-master", |
| 1309 | .owner = THIS_MODULE, | 1310 | .owner = THIS_MODULE, |
| 1310 | }, | 1311 | }, |
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index aee9ad6f633c..bd9177f51de9 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
| @@ -1735,7 +1735,7 @@ static int spi_imx_resume(struct platform_device *pdev) | |||
| 1735 | 1735 | ||
| 1736 | static struct platform_driver driver = { | 1736 | static struct platform_driver driver = { |
| 1737 | .driver = { | 1737 | .driver = { |
| 1738 | .name = "imx-spi", | 1738 | .name = "spi_imx", |
| 1739 | .bus = &platform_bus_type, | 1739 | .bus = &platform_bus_type, |
| 1740 | .owner = THIS_MODULE, | 1740 | .owner = THIS_MODULE, |
| 1741 | }, | 1741 | }, |
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 2adf856e44c2..fcbf1b8a5264 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
| @@ -530,6 +530,7 @@ static int __devexit mpc83xx_spi_remove(struct platform_device *dev) | |||
| 530 | return 0; | 530 | return 0; |
| 531 | } | 531 | } |
| 532 | 532 | ||
| 533 | MODULE_ALIAS("mpc83xx_spi"); /* for platform bus hotplug */ | ||
| 533 | static struct platform_driver mpc83xx_spi_driver = { | 534 | static struct platform_driver mpc83xx_spi_driver = { |
| 534 | .probe = mpc83xx_spi_probe, | 535 | .probe = mpc83xx_spi_probe, |
| 535 | .remove = __devexit_p(mpc83xx_spi_remove), | 536 | .remove = __devexit_p(mpc83xx_spi_remove), |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 5cf48123e0ef..e9b683f7d7b3 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
| @@ -427,6 +427,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev) | |||
| 427 | #define s3c24xx_spi_resume NULL | 427 | #define s3c24xx_spi_resume NULL |
| 428 | #endif | 428 | #endif |
| 429 | 429 | ||
| 430 | MODULE_ALIAS("s3c2410_spi"); /* for platform bus hotplug */ | ||
| 430 | static struct platform_driver s3c24xx_spidrv = { | 431 | static struct platform_driver s3c24xx_spidrv = { |
| 431 | .probe = s3c24xx_spi_probe, | 432 | .probe = s3c24xx_spi_probe, |
| 432 | .remove = s3c24xx_spi_remove, | 433 | .remove = s3c24xx_spi_remove, |
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index 611ac22b7cdc..0fa25e2e80fe 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c | |||
| @@ -180,7 +180,7 @@ static struct platform_driver s3c2410_spigpio_drv = { | |||
| 180 | .suspend = s3c2410_spigpio_suspend, | 180 | .suspend = s3c2410_spigpio_suspend, |
| 181 | .resume = s3c2410_spigpio_resume, | 181 | .resume = s3c2410_spigpio_resume, |
| 182 | .driver = { | 182 | .driver = { |
| 183 | .name = "s3c24xx-spi-gpio", | 183 | .name = "spi_s3c24xx_gpio", |
| 184 | .owner = THIS_MODULE, | 184 | .owner = THIS_MODULE, |
| 185 | }, | 185 | }, |
| 186 | }; | 186 | }; |
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c index 08e981c40646..b7f4bb239eaf 100644 --- a/drivers/spi/spi_txx9.c +++ b/drivers/spi/spi_txx9.c | |||
| @@ -453,7 +453,7 @@ static int __exit txx9spi_remove(struct platform_device *dev) | |||
| 453 | static struct platform_driver txx9spi_driver = { | 453 | static struct platform_driver txx9spi_driver = { |
| 454 | .remove = __exit_p(txx9spi_remove), | 454 | .remove = __exit_p(txx9spi_remove), |
| 455 | .driver = { | 455 | .driver = { |
| 456 | .name = "txx9spi", | 456 | .name = "spi_txx9", |
| 457 | .owner = THIS_MODULE, | 457 | .owner = THIS_MODULE, |
| 458 | }, | 458 | }, |
| 459 | }; | 459 | }; |
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index f0bf9a68e96b..5d04f520c123 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <syslib/virtex_devices.h> | 22 | #include <syslib/virtex_devices.h> |
| 23 | 23 | ||
| 24 | #define XILINX_SPI_NAME "xspi" | 24 | #define XILINX_SPI_NAME "xilinx_spi" |
| 25 | 25 | ||
| 26 | /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e) | 26 | /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e) |
| 27 | * Product Specification", DS464 | 27 | * Product Specification", DS464 |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 5db6b1e489b0..a22ccf9485a4 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
| @@ -182,7 +182,7 @@ config FONT_8x8 | |||
| 182 | 182 | ||
| 183 | config FONT_8x16 | 183 | config FONT_8x16 |
| 184 | bool "VGA 8x16 font" if FONTS | 184 | bool "VGA 8x16 font" if FONTS |
| 185 | depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON | 185 | depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON |
| 186 | default y if !SPARC && !FONTS | 186 | default y if !SPARC && !FONTS |
| 187 | help | 187 | help |
| 188 | This is the "high resolution" font for the VGA frame buffer (the one | 188 | This is the "high resolution" font for the VGA frame buffer (the one |
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 5d40ad13ab5c..131954b3fb98 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
| @@ -357,10 +357,6 @@ static struct dentry *ecryptfs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 357 | ecryptfs_printk(KERN_DEBUG, "Is a special file; returning\n"); | 357 | ecryptfs_printk(KERN_DEBUG, "Is a special file; returning\n"); |
| 358 | goto out; | 358 | goto out; |
| 359 | } | 359 | } |
| 360 | if (special_file(lower_inode->i_mode)) { | ||
| 361 | ecryptfs_printk(KERN_DEBUG, "Is a special file; returning\n"); | ||
| 362 | goto out; | ||
| 363 | } | ||
| 364 | if (!nd) { | 360 | if (!nd) { |
| 365 | ecryptfs_printk(KERN_DEBUG, "We have a NULL nd, just leave" | 361 | ecryptfs_printk(KERN_DEBUG, "We have a NULL nd, just leave" |
| 366 | "as we *think* we are about to unlink\n"); | 362 | "as we *think* we are about to unlink\n"); |
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index e4ab7bc14efe..fd3f94d4a668 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c | |||
| @@ -834,7 +834,8 @@ static void ecryptfs_sync_page(struct page *page) | |||
| 834 | ecryptfs_printk(KERN_DEBUG, "find_lock_page failed\n"); | 834 | ecryptfs_printk(KERN_DEBUG, "find_lock_page failed\n"); |
| 835 | return; | 835 | return; |
| 836 | } | 836 | } |
| 837 | lower_page->mapping->a_ops->sync_page(lower_page); | 837 | if (lower_page->mapping->a_ops->sync_page) |
| 838 | lower_page->mapping->a_ops->sync_page(lower_page); | ||
| 838 | ecryptfs_printk(KERN_DEBUG, "Unlocking page with index = [0x%.16x]\n", | 839 | ecryptfs_printk(KERN_DEBUG, "Unlocking page with index = [0x%.16x]\n", |
| 839 | lower_page->index); | 840 | lower_page->index); |
| 840 | unlock_page(lower_page); | 841 | unlock_page(lower_page); |
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index c848a191525d..950c2fbb815b 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -82,14 +82,19 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 82 | int ret; | 82 | int ret; |
| 83 | 83 | ||
| 84 | /* | 84 | /* |
| 85 | * vma alignment has already been checked by prepare_hugepage_range. | 85 | * vma address alignment (but not the pgoff alignment) has |
| 86 | * If you add any error returns here, do so after setting VM_HUGETLB, | 86 | * already been checked by prepare_hugepage_range. If you add |
| 87 | * so is_vm_hugetlb_page tests below unmap_region go the right way | 87 | * any error returns here, do so after setting VM_HUGETLB, so |
| 88 | * when do_mmap_pgoff unwinds (may be important on powerpc and ia64). | 88 | * is_vm_hugetlb_page tests below unmap_region go the right |
| 89 | * way when do_mmap_pgoff unwinds (may be important on powerpc | ||
| 90 | * and ia64). | ||
| 89 | */ | 91 | */ |
| 90 | vma->vm_flags |= VM_HUGETLB | VM_RESERVED; | 92 | vma->vm_flags |= VM_HUGETLB | VM_RESERVED; |
| 91 | vma->vm_ops = &hugetlb_vm_ops; | 93 | vma->vm_ops = &hugetlb_vm_ops; |
| 92 | 94 | ||
| 95 | if (vma->vm_pgoff & ~(HPAGE_MASK >> PAGE_SHIFT)) | ||
| 96 | return -EINVAL; | ||
| 97 | |||
| 93 | vma_len = (loff_t)(vma->vm_end - vma->vm_start); | 98 | vma_len = (loff_t)(vma->vm_end - vma->vm_start); |
| 94 | 99 | ||
| 95 | mutex_lock(&inode->i_mutex); | 100 | mutex_lock(&inode->i_mutex); |
| @@ -132,7 +137,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
| 132 | return -ENOMEM; | 137 | return -ENOMEM; |
| 133 | 138 | ||
| 134 | if (flags & MAP_FIXED) { | 139 | if (flags & MAP_FIXED) { |
| 135 | if (prepare_hugepage_range(addr, len, pgoff)) | 140 | if (prepare_hugepage_range(addr, len)) |
| 136 | return -EINVAL; | 141 | return -EINVAL; |
| 137 | return addr; | 142 | return addr; |
| 138 | } | 143 | } |
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 1d3b7a9fc828..8bc727b71696 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
| @@ -627,7 +627,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, | |||
| 627 | struct inode *inode = OFNI_EDONI_2SFFJ(f); | 627 | struct inode *inode = OFNI_EDONI_2SFFJ(f); |
| 628 | struct page *pg; | 628 | struct page *pg; |
| 629 | 629 | ||
| 630 | pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, | 630 | pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, |
| 631 | (void *)jffs2_do_readpage_unlock, inode); | 631 | (void *)jffs2_do_readpage_unlock, inode); |
| 632 | if (IS_ERR(pg)) | 632 | if (IS_ERR(pg)) |
| 633 | return (void *)pg; | 633 | return (void *)pg; |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index b2a851c1b8cb..46139003ea0c 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -1303,34 +1303,6 @@ static void nfs_clone_super(struct super_block *sb, | |||
| 1303 | nfs_initialise_sb(sb); | 1303 | nfs_initialise_sb(sb); |
| 1304 | } | 1304 | } |
| 1305 | 1305 | ||
| 1306 | static int nfs_set_super(struct super_block *s, void *_server) | ||
| 1307 | { | ||
| 1308 | struct nfs_server *server = _server; | ||
| 1309 | int ret; | ||
| 1310 | |||
| 1311 | s->s_fs_info = server; | ||
| 1312 | ret = set_anon_super(s, server); | ||
| 1313 | if (ret == 0) | ||
| 1314 | server->s_dev = s->s_dev; | ||
| 1315 | return ret; | ||
| 1316 | } | ||
| 1317 | |||
| 1318 | static int nfs_compare_super(struct super_block *sb, void *data) | ||
| 1319 | { | ||
| 1320 | struct nfs_server *server = data, *old = NFS_SB(sb); | ||
| 1321 | |||
| 1322 | if (memcmp(&old->nfs_client->cl_addr, | ||
| 1323 | &server->nfs_client->cl_addr, | ||
| 1324 | sizeof(old->nfs_client->cl_addr)) != 0) | ||
| 1325 | return 0; | ||
| 1326 | /* Note: NFS_MOUNT_UNSHARED == NFS4_MOUNT_UNSHARED */ | ||
| 1327 | if (old->flags & NFS_MOUNT_UNSHARED) | ||
| 1328 | return 0; | ||
| 1329 | if (memcmp(&old->fsid, &server->fsid, sizeof(old->fsid)) != 0) | ||
| 1330 | return 0; | ||
| 1331 | return 1; | ||
| 1332 | } | ||
| 1333 | |||
| 1334 | #define NFS_MS_MASK (MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_SYNCHRONOUS) | 1306 | #define NFS_MS_MASK (MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_SYNCHRONOUS) |
| 1335 | 1307 | ||
| 1336 | static int nfs_compare_mount_options(const struct super_block *s, const struct nfs_server *b, int flags) | 1308 | static int nfs_compare_mount_options(const struct super_block *s, const struct nfs_server *b, int flags) |
| @@ -1359,9 +1331,46 @@ static int nfs_compare_mount_options(const struct super_block *s, const struct n | |||
| 1359 | goto Ebusy; | 1331 | goto Ebusy; |
| 1360 | if (clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) | 1332 | if (clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) |
| 1361 | goto Ebusy; | 1333 | goto Ebusy; |
| 1362 | return 0; | 1334 | return 1; |
| 1363 | Ebusy: | 1335 | Ebusy: |
| 1364 | return -EBUSY; | 1336 | return 0; |
| 1337 | } | ||
| 1338 | |||
| 1339 | struct nfs_sb_mountdata { | ||
| 1340 | struct nfs_server *server; | ||
| 1341 | int mntflags; | ||
| 1342 | }; | ||
| 1343 | |||
| 1344 | static int nfs_set_super(struct super_block *s, void *data) | ||
| 1345 | { | ||
| 1346 | struct nfs_sb_mountdata *sb_mntdata = data; | ||
| 1347 | struct nfs_server *server = sb_mntdata->server; | ||
| 1348 | int ret; | ||
| 1349 | |||
| 1350 | s->s_flags = sb_mntdata->mntflags; | ||
| 1351 | s->s_fs_info = server; | ||
| 1352 | ret = set_anon_super(s, server); | ||
| 1353 | if (ret == 0) | ||
| 1354 | server->s_dev = s->s_dev; | ||
| 1355 | return ret; | ||
| 1356 | } | ||
| 1357 | |||
| 1358 | static int nfs_compare_super(struct super_block *sb, void *data) | ||
| 1359 | { | ||
| 1360 | struct nfs_sb_mountdata *sb_mntdata = data; | ||
| 1361 | struct nfs_server *server = sb_mntdata->server, *old = NFS_SB(sb); | ||
| 1362 | int mntflags = sb_mntdata->mntflags; | ||
| 1363 | |||
| 1364 | if (memcmp(&old->nfs_client->cl_addr, | ||
| 1365 | &server->nfs_client->cl_addr, | ||
| 1366 | sizeof(old->nfs_client->cl_addr)) != 0) | ||
| 1367 | return 0; | ||
| 1368 | /* Note: NFS_MOUNT_UNSHARED == NFS4_MOUNT_UNSHARED */ | ||
| 1369 | if (old->flags & NFS_MOUNT_UNSHARED) | ||
| 1370 | return 0; | ||
| 1371 | if (memcmp(&old->fsid, &server->fsid, sizeof(old->fsid)) != 0) | ||
| 1372 | return 0; | ||
| 1373 | return nfs_compare_mount_options(sb, server, mntflags); | ||
| 1365 | } | 1374 | } |
| 1366 | 1375 | ||
| 1367 | static int nfs_get_sb(struct file_system_type *fs_type, | 1376 | static int nfs_get_sb(struct file_system_type *fs_type, |
| @@ -1373,6 +1382,9 @@ static int nfs_get_sb(struct file_system_type *fs_type, | |||
| 1373 | struct nfs_mount_data *data = raw_data; | 1382 | struct nfs_mount_data *data = raw_data; |
| 1374 | struct dentry *mntroot; | 1383 | struct dentry *mntroot; |
| 1375 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1384 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1385 | struct nfs_sb_mountdata sb_mntdata = { | ||
| 1386 | .mntflags = flags, | ||
| 1387 | }; | ||
| 1376 | int error; | 1388 | int error; |
| 1377 | 1389 | ||
| 1378 | /* Validate the mount data */ | 1390 | /* Validate the mount data */ |
| @@ -1386,28 +1398,25 @@ static int nfs_get_sb(struct file_system_type *fs_type, | |||
| 1386 | error = PTR_ERR(server); | 1398 | error = PTR_ERR(server); |
| 1387 | goto out; | 1399 | goto out; |
| 1388 | } | 1400 | } |
| 1401 | sb_mntdata.server = server; | ||
| 1389 | 1402 | ||
| 1390 | if (server->flags & NFS_MOUNT_UNSHARED) | 1403 | if (server->flags & NFS_MOUNT_UNSHARED) |
| 1391 | compare_super = NULL; | 1404 | compare_super = NULL; |
| 1392 | 1405 | ||
| 1393 | /* Get a superblock - note that we may end up sharing one that already exists */ | 1406 | /* Get a superblock - note that we may end up sharing one that already exists */ |
| 1394 | s = sget(fs_type, compare_super, nfs_set_super, server); | 1407 | s = sget(fs_type, compare_super, nfs_set_super, &sb_mntdata); |
| 1395 | if (IS_ERR(s)) { | 1408 | if (IS_ERR(s)) { |
| 1396 | error = PTR_ERR(s); | 1409 | error = PTR_ERR(s); |
| 1397 | goto out_err_nosb; | 1410 | goto out_err_nosb; |
| 1398 | } | 1411 | } |
| 1399 | 1412 | ||
| 1400 | if (s->s_fs_info != server) { | 1413 | if (s->s_fs_info != server) { |
| 1401 | error = nfs_compare_mount_options(s, server, flags); | ||
| 1402 | nfs_free_server(server); | 1414 | nfs_free_server(server); |
| 1403 | server = NULL; | 1415 | server = NULL; |
| 1404 | if (error < 0) | ||
| 1405 | goto error_splat_super; | ||
| 1406 | } | 1416 | } |
| 1407 | 1417 | ||
| 1408 | if (!s->s_root) { | 1418 | if (!s->s_root) { |
| 1409 | /* initial superblock/root creation */ | 1419 | /* initial superblock/root creation */ |
| 1410 | s->s_flags = flags; | ||
| 1411 | nfs_fill_super(s, data); | 1420 | nfs_fill_super(s, data); |
| 1412 | } | 1421 | } |
| 1413 | 1422 | ||
| @@ -1460,6 +1469,9 @@ static int nfs_xdev_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1460 | struct nfs_server *server; | 1469 | struct nfs_server *server; |
| 1461 | struct dentry *mntroot; | 1470 | struct dentry *mntroot; |
| 1462 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1471 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1472 | struct nfs_sb_mountdata sb_mntdata = { | ||
| 1473 | .mntflags = flags, | ||
| 1474 | }; | ||
| 1463 | int error; | 1475 | int error; |
| 1464 | 1476 | ||
| 1465 | dprintk("--> nfs_xdev_get_sb()\n"); | 1477 | dprintk("--> nfs_xdev_get_sb()\n"); |
| @@ -1470,28 +1482,25 @@ static int nfs_xdev_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1470 | error = PTR_ERR(server); | 1482 | error = PTR_ERR(server); |
| 1471 | goto out_err_noserver; | 1483 | goto out_err_noserver; |
| 1472 | } | 1484 | } |
| 1485 | sb_mntdata.server = server; | ||
| 1473 | 1486 | ||
| 1474 | if (server->flags & NFS_MOUNT_UNSHARED) | 1487 | if (server->flags & NFS_MOUNT_UNSHARED) |
| 1475 | compare_super = NULL; | 1488 | compare_super = NULL; |
| 1476 | 1489 | ||
| 1477 | /* Get a superblock - note that we may end up sharing one that already exists */ | 1490 | /* Get a superblock - note that we may end up sharing one that already exists */ |
| 1478 | s = sget(&nfs_fs_type, compare_super, nfs_set_super, server); | 1491 | s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata); |
| 1479 | if (IS_ERR(s)) { | 1492 | if (IS_ERR(s)) { |
| 1480 | error = PTR_ERR(s); | 1493 | error = PTR_ERR(s); |
| 1481 | goto out_err_nosb; | 1494 | goto out_err_nosb; |
| 1482 | } | 1495 | } |
| 1483 | 1496 | ||
| 1484 | if (s->s_fs_info != server) { | 1497 | if (s->s_fs_info != server) { |
| 1485 | error = nfs_compare_mount_options(s, server, flags); | ||
| 1486 | nfs_free_server(server); | 1498 | nfs_free_server(server); |
| 1487 | server = NULL; | 1499 | server = NULL; |
| 1488 | if (error < 0) | ||
| 1489 | goto error_splat_super; | ||
| 1490 | } | 1500 | } |
| 1491 | 1501 | ||
| 1492 | if (!s->s_root) { | 1502 | if (!s->s_root) { |
| 1493 | /* initial superblock/root creation */ | 1503 | /* initial superblock/root creation */ |
| 1494 | s->s_flags = flags; | ||
| 1495 | nfs_clone_super(s, data->sb); | 1504 | nfs_clone_super(s, data->sb); |
| 1496 | } | 1505 | } |
| 1497 | 1506 | ||
| @@ -1729,6 +1738,9 @@ static int nfs4_get_sb(struct file_system_type *fs_type, | |||
| 1729 | struct dentry *mntroot; | 1738 | struct dentry *mntroot; |
| 1730 | char *mntpath = NULL, *hostname = NULL, *ip_addr = NULL; | 1739 | char *mntpath = NULL, *hostname = NULL, *ip_addr = NULL; |
| 1731 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1740 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1741 | struct nfs_sb_mountdata sb_mntdata = { | ||
| 1742 | .mntflags = flags, | ||
| 1743 | }; | ||
| 1732 | int error; | 1744 | int error; |
| 1733 | 1745 | ||
| 1734 | /* Validate the mount data */ | 1746 | /* Validate the mount data */ |
| @@ -1744,12 +1756,13 @@ static int nfs4_get_sb(struct file_system_type *fs_type, | |||
| 1744 | error = PTR_ERR(server); | 1756 | error = PTR_ERR(server); |
| 1745 | goto out; | 1757 | goto out; |
| 1746 | } | 1758 | } |
| 1759 | sb_mntdata.server = server; | ||
| 1747 | 1760 | ||
| 1748 | if (server->flags & NFS4_MOUNT_UNSHARED) | 1761 | if (server->flags & NFS4_MOUNT_UNSHARED) |
| 1749 | compare_super = NULL; | 1762 | compare_super = NULL; |
| 1750 | 1763 | ||
| 1751 | /* Get a superblock - note that we may end up sharing one that already exists */ | 1764 | /* Get a superblock - note that we may end up sharing one that already exists */ |
| 1752 | s = sget(fs_type, compare_super, nfs_set_super, server); | 1765 | s = sget(fs_type, compare_super, nfs_set_super, &sb_mntdata); |
| 1753 | if (IS_ERR(s)) { | 1766 | if (IS_ERR(s)) { |
| 1754 | error = PTR_ERR(s); | 1767 | error = PTR_ERR(s); |
| 1755 | goto out_free; | 1768 | goto out_free; |
| @@ -1762,7 +1775,6 @@ static int nfs4_get_sb(struct file_system_type *fs_type, | |||
| 1762 | 1775 | ||
| 1763 | if (!s->s_root) { | 1776 | if (!s->s_root) { |
| 1764 | /* initial superblock/root creation */ | 1777 | /* initial superblock/root creation */ |
| 1765 | s->s_flags = flags; | ||
| 1766 | nfs4_fill_super(s); | 1778 | nfs4_fill_super(s); |
| 1767 | } | 1779 | } |
| 1768 | 1780 | ||
| @@ -1816,6 +1828,9 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1816 | struct nfs_server *server; | 1828 | struct nfs_server *server; |
| 1817 | struct dentry *mntroot; | 1829 | struct dentry *mntroot; |
| 1818 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1830 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1831 | struct nfs_sb_mountdata sb_mntdata = { | ||
| 1832 | .mntflags = flags, | ||
| 1833 | }; | ||
| 1819 | int error; | 1834 | int error; |
| 1820 | 1835 | ||
| 1821 | dprintk("--> nfs4_xdev_get_sb()\n"); | 1836 | dprintk("--> nfs4_xdev_get_sb()\n"); |
| @@ -1826,12 +1841,13 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1826 | error = PTR_ERR(server); | 1841 | error = PTR_ERR(server); |
| 1827 | goto out_err_noserver; | 1842 | goto out_err_noserver; |
| 1828 | } | 1843 | } |
| 1844 | sb_mntdata.server = server; | ||
| 1829 | 1845 | ||
| 1830 | if (server->flags & NFS4_MOUNT_UNSHARED) | 1846 | if (server->flags & NFS4_MOUNT_UNSHARED) |
| 1831 | compare_super = NULL; | 1847 | compare_super = NULL; |
| 1832 | 1848 | ||
| 1833 | /* Get a superblock - note that we may end up sharing one that already exists */ | 1849 | /* Get a superblock - note that we may end up sharing one that already exists */ |
| 1834 | s = sget(&nfs_fs_type, compare_super, nfs_set_super, server); | 1850 | s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata); |
| 1835 | if (IS_ERR(s)) { | 1851 | if (IS_ERR(s)) { |
| 1836 | error = PTR_ERR(s); | 1852 | error = PTR_ERR(s); |
| 1837 | goto out_err_nosb; | 1853 | goto out_err_nosb; |
| @@ -1844,7 +1860,6 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1844 | 1860 | ||
| 1845 | if (!s->s_root) { | 1861 | if (!s->s_root) { |
| 1846 | /* initial superblock/root creation */ | 1862 | /* initial superblock/root creation */ |
| 1847 | s->s_flags = flags; | ||
| 1848 | nfs4_clone_super(s, data->sb); | 1863 | nfs4_clone_super(s, data->sb); |
| 1849 | } | 1864 | } |
| 1850 | 1865 | ||
| @@ -1887,6 +1902,9 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1887 | struct dentry *mntroot; | 1902 | struct dentry *mntroot; |
| 1888 | struct nfs_fh mntfh; | 1903 | struct nfs_fh mntfh; |
| 1889 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; | 1904 | int (*compare_super)(struct super_block *, void *) = nfs_compare_super; |
| 1905 | struct nfs_sb_mountdata sb_mntdata = { | ||
| 1906 | .mntflags = flags, | ||
| 1907 | }; | ||
| 1890 | int error; | 1908 | int error; |
| 1891 | 1909 | ||
| 1892 | dprintk("--> nfs4_referral_get_sb()\n"); | 1910 | dprintk("--> nfs4_referral_get_sb()\n"); |
| @@ -1897,12 +1915,13 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1897 | error = PTR_ERR(server); | 1915 | error = PTR_ERR(server); |
| 1898 | goto out_err_noserver; | 1916 | goto out_err_noserver; |
| 1899 | } | 1917 | } |
| 1918 | sb_mntdata.server = server; | ||
| 1900 | 1919 | ||
| 1901 | if (server->flags & NFS4_MOUNT_UNSHARED) | 1920 | if (server->flags & NFS4_MOUNT_UNSHARED) |
| 1902 | compare_super = NULL; | 1921 | compare_super = NULL; |
| 1903 | 1922 | ||
| 1904 | /* Get a superblock - note that we may end up sharing one that already exists */ | 1923 | /* Get a superblock - note that we may end up sharing one that already exists */ |
| 1905 | s = sget(&nfs_fs_type, compare_super, nfs_set_super, server); | 1924 | s = sget(&nfs_fs_type, compare_super, nfs_set_super, &sb_mntdata); |
| 1906 | if (IS_ERR(s)) { | 1925 | if (IS_ERR(s)) { |
| 1907 | error = PTR_ERR(s); | 1926 | error = PTR_ERR(s); |
| 1908 | goto out_err_nosb; | 1927 | goto out_err_nosb; |
| @@ -1915,7 +1934,6 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags, | |||
| 1915 | 1934 | ||
| 1916 | if (!s->s_root) { | 1935 | if (!s->s_root) { |
| 1917 | /* initial superblock/root creation */ | 1936 | /* initial superblock/root creation */ |
| 1918 | s->s_flags = flags; | ||
| 1919 | nfs4_fill_super(s); | 1937 | nfs4_fill_super(s); |
| 1920 | } | 1938 | } |
| 1921 | 1939 | ||
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 276f7207a564..87e87dcd3f9c 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c | |||
| @@ -540,26 +540,24 @@ static void udf_table_free_blocks(struct super_block *sb, | |||
| 540 | if (epos.offset + adsize > sb->s_blocksize) { | 540 | if (epos.offset + adsize > sb->s_blocksize) { |
| 541 | loffset = epos.offset; | 541 | loffset = epos.offset; |
| 542 | aed->lengthAllocDescs = cpu_to_le32(adsize); | 542 | aed->lengthAllocDescs = cpu_to_le32(adsize); |
| 543 | sptr = UDF_I_DATA(inode) + epos.offset - | 543 | sptr = UDF_I_DATA(table) + epos.offset - adsize; |
| 544 | udf_file_entry_alloc_offset(inode) + | ||
| 545 | UDF_I_LENEATTR(inode) - adsize; | ||
| 546 | dptr = epos.bh->b_data + sizeof(struct allocExtDesc); | 544 | dptr = epos.bh->b_data + sizeof(struct allocExtDesc); |
| 547 | memcpy(dptr, sptr, adsize); | 545 | memcpy(dptr, sptr, adsize); |
| 548 | epos.offset = sizeof(struct allocExtDesc) + adsize; | 546 | epos.offset = sizeof(struct allocExtDesc) + adsize; |
| 549 | } else { | 547 | } else { |
| 550 | loffset = epos.offset + adsize; | 548 | loffset = epos.offset + adsize; |
| 551 | aed->lengthAllocDescs = cpu_to_le32(0); | 549 | aed->lengthAllocDescs = cpu_to_le32(0); |
| 552 | sptr = oepos.bh->b_data + epos.offset; | ||
| 553 | epos.offset = sizeof(struct allocExtDesc); | ||
| 554 | |||
| 555 | if (oepos.bh) { | 550 | if (oepos.bh) { |
| 551 | sptr = oepos.bh->b_data + epos.offset; | ||
| 556 | aed = (struct allocExtDesc *)oepos.bh->b_data; | 552 | aed = (struct allocExtDesc *)oepos.bh->b_data; |
| 557 | aed->lengthAllocDescs = | 553 | aed->lengthAllocDescs = |
| 558 | cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) + adsize); | 554 | cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) + adsize); |
| 559 | } else { | 555 | } else { |
| 556 | sptr = UDF_I_DATA(table) + epos.offset; | ||
| 560 | UDF_I_LENALLOC(table) += adsize; | 557 | UDF_I_LENALLOC(table) += adsize; |
| 561 | mark_inode_dirty(table); | 558 | mark_inode_dirty(table); |
| 562 | } | 559 | } |
| 560 | epos.offset = sizeof(struct allocExtDesc); | ||
| 563 | } | 561 | } |
| 564 | if (UDF_SB_UDFREV(sb) >= 0x0200) | 562 | if (UDF_SB_UDFREV(sb) >= 0x0200) |
| 565 | udf_new_tag(epos.bh->b_data, TAG_IDENT_AED, 3, 1, | 563 | udf_new_tag(epos.bh->b_data, TAG_IDENT_AED, 3, 1, |
diff --git a/fs/udf/super.c b/fs/udf/super.c index 382be7be5ae3..c68a6e730b97 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
| @@ -89,7 +89,7 @@ static int udf_find_fileset(struct super_block *, kernel_lb_addr *, | |||
| 89 | static void udf_load_pvoldesc(struct super_block *, struct buffer_head *); | 89 | static void udf_load_pvoldesc(struct super_block *, struct buffer_head *); |
| 90 | static void udf_load_fileset(struct super_block *, struct buffer_head *, | 90 | static void udf_load_fileset(struct super_block *, struct buffer_head *, |
| 91 | kernel_lb_addr *); | 91 | kernel_lb_addr *); |
| 92 | static void udf_load_partdesc(struct super_block *, struct buffer_head *); | 92 | static int udf_load_partdesc(struct super_block *, struct buffer_head *); |
| 93 | static void udf_open_lvid(struct super_block *); | 93 | static void udf_open_lvid(struct super_block *); |
| 94 | static void udf_close_lvid(struct super_block *); | 94 | static void udf_close_lvid(struct super_block *); |
| 95 | static unsigned int udf_count_free(struct super_block *); | 95 | static unsigned int udf_count_free(struct super_block *); |
| @@ -877,7 +877,7 @@ static void udf_load_fileset(struct super_block *sb, struct buffer_head *bh, | |||
| 877 | root->logicalBlockNum, root->partitionReferenceNum); | 877 | root->logicalBlockNum, root->partitionReferenceNum); |
| 878 | } | 878 | } |
| 879 | 879 | ||
| 880 | static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) | 880 | static int udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) |
| 881 | { | 881 | { |
| 882 | struct partitionDesc *p; | 882 | struct partitionDesc *p; |
| 883 | int i; | 883 | int i; |
| @@ -912,6 +912,11 @@ static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) | |||
| 912 | 912 | ||
| 913 | UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table = | 913 | UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table = |
| 914 | udf_iget(sb, loc); | 914 | udf_iget(sb, loc); |
| 915 | if (!UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table) { | ||
| 916 | udf_debug("cannot load unallocSpaceTable (part %d)\n", | ||
| 917 | i); | ||
| 918 | return 1; | ||
| 919 | } | ||
| 915 | UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_UNALLOC_TABLE; | 920 | UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_UNALLOC_TABLE; |
| 916 | udf_debug("unallocSpaceTable (part %d) @ %ld\n", | 921 | udf_debug("unallocSpaceTable (part %d) @ %ld\n", |
| 917 | i, UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table->i_ino); | 922 | i, UDF_SB_PARTMAPS(sb)[i].s_uspace.s_table->i_ino); |
| @@ -938,6 +943,11 @@ static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) | |||
| 938 | 943 | ||
| 939 | UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table = | 944 | UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table = |
| 940 | udf_iget(sb, loc); | 945 | udf_iget(sb, loc); |
| 946 | if (!UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table) { | ||
| 947 | udf_debug("cannot load freedSpaceTable (part %d)\n", | ||
| 948 | i); | ||
| 949 | return 1; | ||
| 950 | } | ||
| 941 | UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_FREED_TABLE; | 951 | UDF_SB_PARTFLAGS(sb,i) |= UDF_PART_FLAG_FREED_TABLE; |
| 942 | udf_debug("freedSpaceTable (part %d) @ %ld\n", | 952 | udf_debug("freedSpaceTable (part %d) @ %ld\n", |
| 943 | i, UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table->i_ino); | 953 | i, UDF_SB_PARTMAPS(sb)[i].s_fspace.s_table->i_ino); |
| @@ -966,6 +976,7 @@ static void udf_load_partdesc(struct super_block *sb, struct buffer_head *bh) | |||
| 966 | le16_to_cpu(p->partitionNumber), i, UDF_SB_PARTTYPE(sb,i), | 976 | le16_to_cpu(p->partitionNumber), i, UDF_SB_PARTTYPE(sb,i), |
| 967 | UDF_SB_PARTROOT(sb,i), UDF_SB_PARTLEN(sb,i)); | 977 | UDF_SB_PARTROOT(sb,i), UDF_SB_PARTLEN(sb,i)); |
| 968 | } | 978 | } |
| 979 | return 0; | ||
| 969 | } | 980 | } |
| 970 | 981 | ||
| 971 | static int udf_load_logicalvol(struct super_block *sb, struct buffer_head *bh, | 982 | static int udf_load_logicalvol(struct super_block *sb, struct buffer_head *bh, |
| @@ -1177,12 +1188,19 @@ static int udf_process_sequence(struct super_block *sb, long block, long lastblo | |||
| 1177 | udf_load_logicalvol(sb, bh, fileset); | 1188 | udf_load_logicalvol(sb, bh, fileset); |
| 1178 | } else if (i == VDS_POS_PARTITION_DESC) { | 1189 | } else if (i == VDS_POS_PARTITION_DESC) { |
| 1179 | struct buffer_head *bh2 = NULL; | 1190 | struct buffer_head *bh2 = NULL; |
| 1180 | udf_load_partdesc(sb, bh); | 1191 | if (udf_load_partdesc(sb, bh)) { |
| 1192 | brelse(bh); | ||
| 1193 | return 1; | ||
| 1194 | } | ||
| 1181 | for (j = vds[i].block + 1; j < vds[VDS_POS_TERMINATING_DESC].block; j++) { | 1195 | for (j = vds[i].block + 1; j < vds[VDS_POS_TERMINATING_DESC].block; j++) { |
| 1182 | bh2 = udf_read_tagged(sb, j, j, &ident); | 1196 | bh2 = udf_read_tagged(sb, j, j, &ident); |
| 1183 | gd = (struct generic_desc *)bh2->b_data; | 1197 | gd = (struct generic_desc *)bh2->b_data; |
| 1184 | if (ident == TAG_IDENT_PD) | 1198 | if (ident == TAG_IDENT_PD) |
| 1185 | udf_load_partdesc(sb, bh2); | 1199 | if (udf_load_partdesc(sb, bh2)) { |
| 1200 | brelse(bh); | ||
| 1201 | brelse(bh2); | ||
| 1202 | return 1; | ||
| 1203 | } | ||
| 1186 | brelse(bh2); | 1204 | brelse(bh2); |
| 1187 | } | 1205 | } |
| 1188 | } | 1206 | } |
diff --git a/include/asm-arm/arch-at91/irqs.h b/include/asm-arm/arch-at91/irqs.h index 1127a3b5e928..70b1216dce5d 100644 --- a/include/asm-arm/arch-at91/irqs.h +++ b/include/asm-arm/arch-at91/irqs.h | |||
| @@ -42,4 +42,7 @@ | |||
| 42 | */ | 42 | */ |
| 43 | #define NR_IRQS (NR_AIC_IRQS + (5 * 32)) | 43 | #define NR_IRQS (NR_AIC_IRQS + (5 * 32)) |
| 44 | 44 | ||
| 45 | /* FIQ is AIC source 0. */ | ||
| 46 | #define FIQ_START AT91_ID_FIQ | ||
| 47 | |||
| 45 | #endif | 48 | #endif |
diff --git a/include/asm-arm/arch-omap/irda.h b/include/asm-arm/arch-omap/irda.h index 345a649ec838..96bb12fab438 100644 --- a/include/asm-arm/arch-omap/irda.h +++ b/include/asm-arm/arch-omap/irda.h | |||
| @@ -31,6 +31,7 @@ struct omap_irda_config { | |||
| 31 | unsigned long src_start; | 31 | unsigned long src_start; |
| 32 | int tx_trigger; | 32 | int tx_trigger; |
| 33 | int rx_trigger; | 33 | int rx_trigger; |
| 34 | int mode; | ||
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| 36 | #endif | 37 | #endif |
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h index d1294a46c70c..6c1c968b2987 100644 --- a/include/asm-arm/cacheflush.h +++ b/include/asm-arm/cacheflush.h | |||
| @@ -426,6 +426,13 @@ static inline void flush_anon_page(struct vm_area_struct *vma, | |||
| 426 | */ | 426 | */ |
| 427 | #define flush_icache_page(vma,page) do { } while (0) | 427 | #define flush_icache_page(vma,page) do { } while (0) |
| 428 | 428 | ||
| 429 | static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt, | ||
| 430 | unsigned offset, size_t size) | ||
| 431 | { | ||
| 432 | const void *start = (void __force *)virt + offset; | ||
| 433 | dmac_inv_range(start, start + size); | ||
| 434 | } | ||
| 435 | |||
| 429 | #define __cacheid_present(val) (val != read_cpuid(CPUID_ID)) | 436 | #define __cacheid_present(val) (val != read_cpuid(CPUID_ID)) |
| 430 | #define __cacheid_type_v7(val) ((val & (7 << 29)) == (4 << 29)) | 437 | #define __cacheid_type_v7(val) ((val & (7 << 29)) == (4 << 29)) |
| 431 | 438 | ||
diff --git a/include/asm-arm/plat-s3c/map.h b/include/asm-arm/plat-s3c/map.h index 95a82b0e84a1..b84289d32a54 100644 --- a/include/asm-arm/plat-s3c/map.h +++ b/include/asm-arm/plat-s3c/map.h | |||
| @@ -30,11 +30,11 @@ | |||
| 30 | #define S3C_ADDR(x) (S3C_ADDR_BASE + (x)) | 30 | #define S3C_ADDR(x) (S3C_ADDR_BASE + (x)) |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | #define S3C_VA_IRQ S3C_ADDR(0x000000000) /* irq controller(s) */ | 33 | #define S3C_VA_IRQ S3C_ADDR(0x00000000) /* irq controller(s) */ |
| 34 | #define S3C_VA_SYS S3C_ADDR(0x001000000) /* system control */ | 34 | #define S3C_VA_SYS S3C_ADDR(0x00100000) /* system control */ |
| 35 | #define S3C_VA_MEM S3C_ADDR(0x002000000) /* system control */ | 35 | #define S3C_VA_MEM S3C_ADDR(0x00200000) /* system control */ |
| 36 | #define S3C_VA_TIMER S3C_ADDR(0x003000000) /* timer block */ | 36 | #define S3C_VA_TIMER S3C_ADDR(0x00300000) /* timer block */ |
| 37 | #define S3C_VA_WATCHDOG S3C_ADDR(0x004000000) /* watchdog */ | 37 | #define S3C_VA_WATCHDOG S3C_ADDR(0x00400000) /* watchdog */ |
| 38 | #define S3C_VA_UART S3C_ADDR(0x010000000) /* UART */ | 38 | #define S3C_VA_UART S3C_ADDR(0x01000000) /* UART */ |
| 39 | 39 | ||
| 40 | #endif /* __ASM_PLAT_MAP_H */ | 40 | #endif /* __ASM_PLAT_MAP_H */ |
diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h index d5a4559b9555..5111e8717be3 100644 --- a/include/asm-sparc64/device.h +++ b/include/asm-sparc64/device.h | |||
| @@ -16,8 +16,6 @@ struct dev_archdata { | |||
| 16 | 16 | ||
| 17 | struct device_node *prom_node; | 17 | struct device_node *prom_node; |
| 18 | struct of_device *op; | 18 | struct of_device *op; |
| 19 | |||
| 20 | unsigned int msi_num; | ||
| 21 | }; | 19 | }; |
| 22 | 20 | ||
| 23 | #endif /* _ASM_SPARC64_DEVICE_H */ | 21 | #endif /* _ASM_SPARC64_DEVICE_H */ |
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h index e6c436ef9356..c00ad152771b 100644 --- a/include/asm-sparc64/irq.h +++ b/include/asm-sparc64/irq.h | |||
| @@ -16,21 +16,21 @@ | |||
| 16 | #include <asm/ptrace.h> | 16 | #include <asm/ptrace.h> |
| 17 | 17 | ||
| 18 | /* IMAP/ICLR register defines */ | 18 | /* IMAP/ICLR register defines */ |
| 19 | #define IMAP_VALID 0x80000000 /* IRQ Enabled */ | 19 | #define IMAP_VALID 0x80000000UL /* IRQ Enabled */ |
| 20 | #define IMAP_TID_UPA 0x7c000000 /* UPA TargetID */ | 20 | #define IMAP_TID_UPA 0x7c000000UL /* UPA TargetID */ |
| 21 | #define IMAP_TID_JBUS 0x7c000000 /* JBUS TargetID */ | 21 | #define IMAP_TID_JBUS 0x7c000000UL /* JBUS TargetID */ |
| 22 | #define IMAP_TID_SHIFT 26 | 22 | #define IMAP_TID_SHIFT 26 |
| 23 | #define IMAP_AID_SAFARI 0x7c000000 /* Safari AgentID */ | 23 | #define IMAP_AID_SAFARI 0x7c000000UL /* Safari AgentID */ |
| 24 | #define IMAP_AID_SHIFT 26 | 24 | #define IMAP_AID_SHIFT 26 |
| 25 | #define IMAP_NID_SAFARI 0x03e00000 /* Safari NodeID */ | 25 | #define IMAP_NID_SAFARI 0x03e00000UL /* Safari NodeID */ |
| 26 | #define IMAP_NID_SHIFT 21 | 26 | #define IMAP_NID_SHIFT 21 |
| 27 | #define IMAP_IGN 0x000007c0 /* IRQ Group Number */ | 27 | #define IMAP_IGN 0x000007c0UL /* IRQ Group Number */ |
| 28 | #define IMAP_INO 0x0000003f /* IRQ Number */ | 28 | #define IMAP_INO 0x0000003fUL /* IRQ Number */ |
| 29 | #define IMAP_INR 0x000007ff /* Full interrupt number*/ | 29 | #define IMAP_INR 0x000007ffUL /* Full interrupt number*/ |
| 30 | 30 | ||
| 31 | #define ICLR_IDLE 0x00000000 /* Idle state */ | 31 | #define ICLR_IDLE 0x00000000UL /* Idle state */ |
| 32 | #define ICLR_TRANSMIT 0x00000001 /* Transmit state */ | 32 | #define ICLR_TRANSMIT 0x00000001UL /* Transmit state */ |
| 33 | #define ICLR_PENDING 0x00000003 /* Pending state */ | 33 | #define ICLR_PENDING 0x00000003UL /* Pending state */ |
| 34 | 34 | ||
| 35 | /* The largest number of unique interrupt sources we support. | 35 | /* The largest number of unique interrupt sources we support. |
| 36 | * If this needs to ever be larger than 255, you need to change | 36 | * If this needs to ever be larger than 255, you need to change |
| @@ -53,6 +53,9 @@ extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, | |||
| 53 | extern void sun4v_destroy_msi(unsigned int virt_irq); | 53 | extern void sun4v_destroy_msi(unsigned int virt_irq); |
| 54 | extern unsigned int sbus_build_irq(void *sbus, unsigned int ino); | 54 | extern unsigned int sbus_build_irq(void *sbus, unsigned int ino); |
| 55 | 55 | ||
| 56 | extern void sparc64_set_msi(unsigned int virt_irq, u32 msi); | ||
| 57 | extern u32 sparc64_get_msi(unsigned int virt_irq); | ||
| 58 | |||
| 56 | extern void fixup_irqs(void); | 59 | extern void fixup_irqs(void); |
| 57 | 60 | ||
| 58 | static __inline__ void set_softint(unsigned long bits) | 61 | static __inline__ void set_softint(unsigned long bits) |
diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S index e3f010bd12b3..cb0248616d49 100644 --- a/include/asm-um/common.lds.S +++ b/include/asm-um/common.lds.S | |||
| @@ -16,82 +16,112 @@ | |||
| 16 | 16 | ||
| 17 | . = ALIGN(4096); | 17 | . = ALIGN(4096); |
| 18 | .note : { *(.note.*) } | 18 | .note : { *(.note.*) } |
| 19 | __start___ex_table = .; | 19 | __ex_table : { |
| 20 | __ex_table : { *(__ex_table) } | 20 | __start___ex_table = .; |
| 21 | __stop___ex_table = .; | 21 | *(__ex_table) |
| 22 | __stop___ex_table = .; | ||
| 23 | } | ||
| 22 | 24 | ||
| 23 | BUG_TABLE | 25 | BUG_TABLE |
| 24 | 26 | ||
| 25 | __uml_setup_start = .; | 27 | .uml.setup.init : { |
| 26 | .uml.setup.init : { *(.uml.setup.init) } | 28 | __uml_setup_start = .; |
| 27 | __uml_setup_end = .; | 29 | *(.uml.setup.init) |
| 30 | __uml_setup_end = .; | ||
| 31 | } | ||
| 28 | 32 | ||
| 29 | __uml_help_start = .; | 33 | .uml.help.init : { |
| 30 | .uml.help.init : { *(.uml.help.init) } | 34 | __uml_help_start = .; |
| 31 | __uml_help_end = .; | 35 | *(.uml.help.init) |
| 36 | __uml_help_end = .; | ||
| 37 | } | ||
| 32 | 38 | ||
| 33 | __uml_postsetup_start = .; | 39 | .uml.postsetup.init : { |
| 34 | .uml.postsetup.init : { *(.uml.postsetup.init) } | 40 | __uml_postsetup_start = .; |
| 35 | __uml_postsetup_end = .; | 41 | *(.uml.postsetup.init) |
| 42 | __uml_postsetup_end = .; | ||
| 43 | } | ||
| 36 | 44 | ||
| 37 | __setup_start = .; | 45 | .init.setup : { |
| 38 | .init.setup : { *(.init.setup) } | 46 | __setup_start = .; |
| 39 | __setup_end = .; | 47 | *(.init.setup) |
| 48 | __setup_end = .; | ||
| 49 | } | ||
| 40 | 50 | ||
| 41 | . = ALIGN(32); | 51 | . = ALIGN(32); |
| 42 | __per_cpu_start = . ; | 52 | .data.percpu : { |
| 43 | .data.percpu : { *(.data.percpu) } | 53 | __per_cpu_start = . ; |
| 44 | __per_cpu_end = . ; | 54 | *(.data.percpu) |
| 55 | __per_cpu_end = . ; | ||
| 56 | } | ||
| 45 | 57 | ||
| 46 | __initcall_start = .; | ||
| 47 | .initcall.init : { | 58 | .initcall.init : { |
| 59 | __initcall_start = .; | ||
| 48 | INITCALLS | 60 | INITCALLS |
| 61 | __initcall_end = .; | ||
| 49 | } | 62 | } |
| 50 | __initcall_end = .; | ||
| 51 | 63 | ||
| 52 | __con_initcall_start = .; | 64 | .con_initcall.init : { |
| 53 | .con_initcall.init : { *(.con_initcall.init) } | 65 | __con_initcall_start = .; |
| 54 | __con_initcall_end = .; | 66 | *(.con_initcall.init) |
| 67 | __con_initcall_end = .; | ||
| 68 | } | ||
| 55 | 69 | ||
| 56 | __uml_initcall_start = .; | 70 | .uml.initcall.init : { |
| 57 | .uml.initcall.init : { *(.uml.initcall.init) } | 71 | __uml_initcall_start = .; |
| 58 | __uml_initcall_end = .; | 72 | *(.uml.initcall.init) |
| 73 | __uml_initcall_end = .; | ||
| 74 | } | ||
| 59 | __init_end = .; | 75 | __init_end = .; |
| 60 | 76 | ||
| 61 | SECURITY_INIT | 77 | SECURITY_INIT |
| 62 | 78 | ||
| 63 | __exitcall_begin = .; | 79 | .exitcall : { |
| 64 | .exitcall : { *(.exitcall.exit) } | 80 | __exitcall_begin = .; |
| 65 | __exitcall_end = .; | 81 | *(.exitcall.exit) |
| 82 | __exitcall_end = .; | ||
| 83 | } | ||
| 66 | 84 | ||
| 67 | __uml_exitcall_begin = .; | 85 | .uml.exitcall : { |
| 68 | .uml.exitcall : { *(.uml.exitcall.exit) } | 86 | __uml_exitcall_begin = .; |
| 69 | __uml_exitcall_end = .; | 87 | *(.uml.exitcall.exit) |
| 88 | __uml_exitcall_end = .; | ||
| 89 | } | ||
| 70 | 90 | ||
| 71 | . = ALIGN(4); | 91 | . = ALIGN(4); |
| 72 | __alt_instructions = .; | 92 | .altinstructions : { |
| 73 | .altinstructions : { *(.altinstructions) } | 93 | __alt_instructions = .; |
| 74 | __alt_instructions_end = .; | 94 | *(.altinstructions) |
| 95 | __alt_instructions_end = .; | ||
| 96 | } | ||
| 75 | .altinstr_replacement : { *(.altinstr_replacement) } | 97 | .altinstr_replacement : { *(.altinstr_replacement) } |
| 76 | /* .exit.text is discard at runtime, not link time, to deal with references | 98 | /* .exit.text is discard at runtime, not link time, to deal with references |
| 77 | from .altinstructions and .eh_frame */ | 99 | from .altinstructions and .eh_frame */ |
| 78 | .exit.text : { *(.exit.text) } | 100 | .exit.text : { *(.exit.text) } |
| 79 | .exit.data : { *(.exit.data) } | 101 | .exit.data : { *(.exit.data) } |
| 80 | 102 | ||
| 81 | __preinit_array_start = .; | 103 | .preinit_array : { |
| 82 | .preinit_array : { *(.preinit_array) } | 104 | __preinit_array_start = .; |
| 83 | __preinit_array_end = .; | 105 | *(.preinit_array) |
| 84 | __init_array_start = .; | 106 | __preinit_array_end = .; |
| 85 | .init_array : { *(.init_array) } | 107 | } |
| 86 | __init_array_end = .; | 108 | .init_array : { |
| 87 | __fini_array_start = .; | 109 | __init_array_start = .; |
| 88 | .fini_array : { *(.fini_array) } | 110 | *(.init_array) |
| 89 | __fini_array_end = .; | 111 | __init_array_end = .; |
| 112 | } | ||
| 113 | .fini_array : { | ||
| 114 | __fini_array_start = .; | ||
| 115 | *(.fini_array) | ||
| 116 | __fini_array_end = .; | ||
| 117 | } | ||
| 90 | 118 | ||
| 91 | . = ALIGN(4096); | 119 | . = ALIGN(4096); |
| 92 | __initramfs_start = .; | 120 | .init.ramfs : { |
| 93 | .init.ramfs : { *(.init.ramfs) } | 121 | __initramfs_start = .; |
| 94 | __initramfs_end = .; | 122 | *(.init.ramfs) |
| 123 | __initramfs_end = .; | ||
| 124 | } | ||
| 95 | 125 | ||
| 96 | /* Sections to be discarded */ | 126 | /* Sections to be discarded */ |
| 97 | /DISCARD/ : { | 127 | /DISCARD/ : { |
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h index 8a8246d03936..bfe27aa2c9c4 100644 --- a/include/asm-um/elf-x86_64.h +++ b/include/asm-um/elf-x86_64.h | |||
| @@ -6,7 +6,9 @@ | |||
| 6 | #ifndef __UM_ELF_X86_64_H | 6 | #ifndef __UM_ELF_X86_64_H |
| 7 | #define __UM_ELF_X86_64_H | 7 | #define __UM_ELF_X86_64_H |
| 8 | 8 | ||
| 9 | #include <linux/sched.h> | ||
| 9 | #include <asm/user.h> | 10 | #include <asm/user.h> |
| 11 | #include "skas.h" | ||
| 10 | 12 | ||
| 11 | /* x86-64 relocation types, taken from asm-x86_64/elf.h */ | 13 | /* x86-64 relocation types, taken from asm-x86_64/elf.h */ |
| 12 | #define R_X86_64_NONE 0 /* No reloc */ | 14 | #define R_X86_64_NONE 0 /* No reloc */ |
| @@ -64,6 +66,44 @@ typedef struct { } elf_fpregset_t; | |||
| 64 | PT_REGS_R15(regs) = 0; \ | 66 | PT_REGS_R15(regs) = 0; \ |
| 65 | } while (0) | 67 | } while (0) |
| 66 | 68 | ||
| 69 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | ||
| 70 | (pr_reg)[0] = (regs)->regs.gp[0]; \ | ||
| 71 | (pr_reg)[1] = (regs)->regs.gp[1]; \ | ||
| 72 | (pr_reg)[2] = (regs)->regs.gp[2]; \ | ||
| 73 | (pr_reg)[3] = (regs)->regs.gp[3]; \ | ||
| 74 | (pr_reg)[4] = (regs)->regs.gp[4]; \ | ||
| 75 | (pr_reg)[5] = (regs)->regs.gp[5]; \ | ||
| 76 | (pr_reg)[6] = (regs)->regs.gp[6]; \ | ||
| 77 | (pr_reg)[7] = (regs)->regs.gp[7]; \ | ||
| 78 | (pr_reg)[8] = (regs)->regs.gp[8]; \ | ||
| 79 | (pr_reg)[9] = (regs)->regs.gp[9]; \ | ||
| 80 | (pr_reg)[10] = (regs)->regs.gp[10]; \ | ||
| 81 | (pr_reg)[11] = (regs)->regs.gp[11]; \ | ||
| 82 | (pr_reg)[12] = (regs)->regs.gp[12]; \ | ||
| 83 | (pr_reg)[13] = (regs)->regs.gp[13]; \ | ||
| 84 | (pr_reg)[14] = (regs)->regs.gp[14]; \ | ||
| 85 | (pr_reg)[15] = (regs)->regs.gp[15]; \ | ||
| 86 | (pr_reg)[16] = (regs)->regs.gp[16]; \ | ||
| 87 | (pr_reg)[17] = (regs)->regs.gp[17]; \ | ||
| 88 | (pr_reg)[18] = (regs)->regs.gp[18]; \ | ||
| 89 | (pr_reg)[19] = (regs)->regs.gp[19]; \ | ||
| 90 | (pr_reg)[20] = (regs)->regs.gp[20]; \ | ||
| 91 | (pr_reg)[21] = current->thread.arch.fs; \ | ||
| 92 | (pr_reg)[22] = 0; \ | ||
| 93 | (pr_reg)[23] = 0; \ | ||
| 94 | (pr_reg)[24] = 0; \ | ||
| 95 | (pr_reg)[25] = 0; \ | ||
| 96 | (pr_reg)[26] = 0; | ||
| 97 | |||
| 98 | static inline int elf_core_copy_fpregs(struct task_struct *t, | ||
| 99 | elf_fpregset_t *fpu) | ||
| 100 | { | ||
| 101 | int cpu = current_thread->cpu; | ||
| 102 | return save_fp_registers(userspace_pid[cpu], (unsigned long *) fpu); | ||
| 103 | } | ||
| 104 | |||
| 105 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) | ||
| 106 | |||
| 67 | #ifdef TIF_IA32 /* XXX */ | 107 | #ifdef TIF_IA32 /* XXX */ |
| 68 | #error XXX, indeed | 108 | #error XXX, indeed |
| 69 | clear_thread_flag(TIF_IA32); | 109 | clear_thread_flag(TIF_IA32); |
diff --git a/include/linux/ata.h b/include/linux/ata.h index 23a22df039d8..c043c1ccf1c5 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -73,6 +73,19 @@ enum { | |||
| 73 | ATA_PIO5 = ATA_PIO4 | (1 << 5), | 73 | ATA_PIO5 = ATA_PIO4 | (1 << 5), |
| 74 | ATA_PIO6 = ATA_PIO5 | (1 << 6), | 74 | ATA_PIO6 = ATA_PIO5 | (1 << 6), |
| 75 | 75 | ||
| 76 | ATA_SWDMA0 = (1 << 0), | ||
| 77 | ATA_SWDMA1 = ATA_SWDMA0 | (1 << 1), | ||
| 78 | ATA_SWDMA2 = ATA_SWDMA1 | (1 << 2), | ||
| 79 | |||
| 80 | ATA_SWDMA2_ONLY = (1 << 2), | ||
| 81 | |||
| 82 | ATA_MWDMA0 = (1 << 0), | ||
| 83 | ATA_MWDMA1 = ATA_MWDMA0 | (1 << 1), | ||
| 84 | ATA_MWDMA2 = ATA_MWDMA1 | (1 << 2), | ||
| 85 | |||
| 86 | ATA_MWDMA12_ONLY = (1 << 1) | (1 << 2), | ||
| 87 | ATA_MWDMA2_ONLY = (1 << 2), | ||
| 88 | |||
| 76 | ATA_UDMA0 = (1 << 0), | 89 | ATA_UDMA0 = (1 << 0), |
| 77 | ATA_UDMA1 = ATA_UDMA0 | (1 << 1), | 90 | ATA_UDMA1 = ATA_UDMA0 | (1 << 1), |
| 78 | ATA_UDMA2 = ATA_UDMA1 | (1 << 2), | 91 | ATA_UDMA2 = ATA_UDMA1 | (1 << 2), |
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 1d5ded0836ee..0ad72c4cf312 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
| @@ -126,16 +126,16 @@ static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex) | |||
| 126 | static inline int cpu_is_offline(int cpu) { return 0; } | 126 | static inline int cpu_is_offline(int cpu) { return 0; } |
| 127 | #endif /* CONFIG_HOTPLUG_CPU */ | 127 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 128 | 128 | ||
| 129 | #ifdef CONFIG_SUSPEND_SMP | 129 | #ifdef CONFIG_PM_SLEEP_SMP |
| 130 | extern int suspend_cpu_hotplug; | 130 | extern int suspend_cpu_hotplug; |
| 131 | 131 | ||
| 132 | extern int disable_nonboot_cpus(void); | 132 | extern int disable_nonboot_cpus(void); |
| 133 | extern void enable_nonboot_cpus(void); | 133 | extern void enable_nonboot_cpus(void); |
| 134 | #else | 134 | #else /* !CONFIG_PM_SLEEP_SMP */ |
| 135 | #define suspend_cpu_hotplug 0 | 135 | #define suspend_cpu_hotplug 0 |
| 136 | 136 | ||
| 137 | static inline int disable_nonboot_cpus(void) { return 0; } | 137 | static inline int disable_nonboot_cpus(void) { return 0; } |
| 138 | static inline void enable_nonboot_cpus(void) {} | 138 | static inline void enable_nonboot_cpus(void) {} |
| 139 | #endif | 139 | #endif /* !CONFIG_PM_SLEEP_SMP */ |
| 140 | 140 | ||
| 141 | #endif /* _LINUX_CPU_H_ */ | 141 | #endif /* _LINUX_CPU_H_ */ |
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index e6a71c82d204..3a19b032c0eb 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
| @@ -66,11 +66,8 @@ void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr, | |||
| 66 | * If the arch doesn't supply something else, assume that hugepage | 66 | * If the arch doesn't supply something else, assume that hugepage |
| 67 | * size aligned regions are ok without further preparation. | 67 | * size aligned regions are ok without further preparation. |
| 68 | */ | 68 | */ |
| 69 | static inline int prepare_hugepage_range(unsigned long addr, unsigned long len, | 69 | static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) |
| 70 | pgoff_t pgoff) | ||
| 71 | { | 70 | { |
| 72 | if (pgoff & (~HPAGE_MASK >> PAGE_SHIFT)) | ||
| 73 | return -EINVAL; | ||
| 74 | if (len & ~HPAGE_MASK) | 71 | if (len & ~HPAGE_MASK) |
| 75 | return -EINVAL; | 72 | return -EINVAL; |
| 76 | if (addr & ~HPAGE_MASK) | 73 | if (addr & ~HPAGE_MASK) |
| @@ -78,8 +75,7 @@ static inline int prepare_hugepage_range(unsigned long addr, unsigned long len, | |||
| 78 | return 0; | 75 | return 0; |
| 79 | } | 76 | } |
| 80 | #else | 77 | #else |
| 81 | int prepare_hugepage_range(unsigned long addr, unsigned long len, | 78 | int prepare_hugepage_range(unsigned long addr, unsigned long len); |
| 82 | pgoff_t pgoff); | ||
| 83 | #endif | 79 | #endif |
| 84 | 80 | ||
| 85 | #ifndef ARCH_HAS_SETCLEAR_HUGE_PTE | 81 | #ifndef ARCH_HAS_SETCLEAR_HUGE_PTE |
| @@ -117,7 +113,7 @@ static inline unsigned long hugetlb_total_pages(void) | |||
| 117 | #define hugetlb_report_meminfo(buf) 0 | 113 | #define hugetlb_report_meminfo(buf) 0 |
| 118 | #define hugetlb_report_node_meminfo(n, buf) 0 | 114 | #define hugetlb_report_node_meminfo(n, buf) 0 |
| 119 | #define follow_huge_pmd(mm, addr, pmd, write) NULL | 115 | #define follow_huge_pmd(mm, addr, pmd, write) NULL |
| 120 | #define prepare_hugepage_range(addr,len,pgoff) (-EINVAL) | 116 | #define prepare_hugepage_range(addr,len) (-EINVAL) |
| 121 | #define pmd_huge(x) 0 | 117 | #define pmd_huge(x) 0 |
| 122 | #define is_hugepage_only_range(mm, addr, len) 0 | 118 | #define is_hugepage_only_range(mm, addr, len) 0 |
| 123 | #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; }) | 119 | #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; }) |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 41978a557318..a67bb9075e9b 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -303,6 +303,7 @@ enum { | |||
| 303 | ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ | 303 | ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ |
| 304 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ | 304 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ |
| 305 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ | 305 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ |
| 306 | ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */ | ||
| 306 | }; | 307 | }; |
| 307 | 308 | ||
| 308 | enum hsm_task_states { | 309 | enum hsm_task_states { |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 06d23e10a16d..17168f3cc73f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -374,10 +374,9 @@ | |||
| 374 | #define PCI_DEVICE_ID_ATI_IXP400_SATA 0x4379 | 374 | #define PCI_DEVICE_ID_ATI_IXP400_SATA 0x4379 |
| 375 | #define PCI_DEVICE_ID_ATI_IXP400_SATA2 0x437a | 375 | #define PCI_DEVICE_ID_ATI_IXP400_SATA2 0x437a |
| 376 | #define PCI_DEVICE_ID_ATI_IXP600_SATA 0x4380 | 376 | #define PCI_DEVICE_ID_ATI_IXP600_SATA 0x4380 |
| 377 | #define PCI_DEVICE_ID_ATI_IXP600_SMBUS 0x4385 | 377 | #define PCI_DEVICE_ID_ATI_SBX00_SMBUS 0x4385 |
| 378 | #define PCI_DEVICE_ID_ATI_IXP600_IDE 0x438c | 378 | #define PCI_DEVICE_ID_ATI_IXP600_IDE 0x438c |
| 379 | #define PCI_DEVICE_ID_ATI_IXP700_SATA 0x4390 | 379 | #define PCI_DEVICE_ID_ATI_IXP700_SATA 0x4390 |
| 380 | #define PCI_DEVICE_ID_ATI_IXP700_SMBUS 0x4395 | ||
| 381 | #define PCI_DEVICE_ID_ATI_IXP700_IDE 0x439c | 380 | #define PCI_DEVICE_ID_ATI_IXP700_IDE 0x439c |
| 382 | 381 | ||
| 383 | #define PCI_VENDOR_ID_VLSI 0x1004 | 382 | #define PCI_VENDOR_ID_VLSI 0x1004 |
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index c91476ce314a..dff3192374f8 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -351,6 +351,8 @@ enum | |||
| 351 | #define RTAX_INITCWND RTAX_INITCWND | 351 | #define RTAX_INITCWND RTAX_INITCWND |
| 352 | RTAX_FEATURES, | 352 | RTAX_FEATURES, |
| 353 | #define RTAX_FEATURES RTAX_FEATURES | 353 | #define RTAX_FEATURES RTAX_FEATURES |
| 354 | RTAX_RTO_MIN, | ||
| 355 | #define RTAX_RTO_MIN RTAX_RTO_MIN | ||
| 354 | __RTAX_MAX | 356 | __RTAX_MAX |
| 355 | }; | 357 | }; |
| 356 | 358 | ||
diff --git a/include/linux/sched.h b/include/linux/sched.h index bd6a0320a770..f4e324ed2e44 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -904,6 +904,7 @@ struct sched_entity { | |||
| 904 | 904 | ||
| 905 | u64 exec_start; | 905 | u64 exec_start; |
| 906 | u64 sum_exec_runtime; | 906 | u64 sum_exec_runtime; |
| 907 | u64 prev_sum_exec_runtime; | ||
| 907 | u64 wait_start_fair; | 908 | u64 wait_start_fair; |
| 908 | u64 sleep_start_fair; | 909 | u64 sleep_start_fair; |
| 909 | 910 | ||
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 124270df8734..74962077f632 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h | |||
| @@ -78,7 +78,7 @@ extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; | |||
| 78 | * Sorry that the following has to be that ugly but some versions of GCC | 78 | * Sorry that the following has to be that ugly but some versions of GCC |
| 79 | * have trouble with constant propagation and loops. | 79 | * have trouble with constant propagation and loops. |
| 80 | */ | 80 | */ |
| 81 | static inline int kmalloc_index(size_t size) | 81 | static __always_inline int kmalloc_index(size_t size) |
| 82 | { | 82 | { |
| 83 | if (!size) | 83 | if (!size) |
| 84 | return 0; | 84 | return 0; |
| @@ -133,7 +133,7 @@ static inline int kmalloc_index(size_t size) | |||
| 133 | * This ought to end up with a global pointer to the right cache | 133 | * This ought to end up with a global pointer to the right cache |
| 134 | * in kmalloc_caches. | 134 | * in kmalloc_caches. |
| 135 | */ | 135 | */ |
| 136 | static inline struct kmem_cache *kmalloc_slab(size_t size) | 136 | static __always_inline struct kmem_cache *kmalloc_slab(size_t size) |
| 137 | { | 137 | { |
| 138 | int index = kmalloc_index(size); | 138 | int index = kmalloc_index(size); |
| 139 | 139 | ||
| @@ -166,7 +166,7 @@ static inline struct kmem_cache *kmalloc_slab(size_t size) | |||
| 166 | void *kmem_cache_alloc(struct kmem_cache *, gfp_t); | 166 | void *kmem_cache_alloc(struct kmem_cache *, gfp_t); |
| 167 | void *__kmalloc(size_t size, gfp_t flags); | 167 | void *__kmalloc(size_t size, gfp_t flags); |
| 168 | 168 | ||
| 169 | static inline void *kmalloc(size_t size, gfp_t flags) | 169 | static __always_inline void *kmalloc(size_t size, gfp_t flags) |
| 170 | { | 170 | { |
| 171 | if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) { | 171 | if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) { |
| 172 | struct kmem_cache *s = kmalloc_slab(size); | 172 | struct kmem_cache *s = kmalloc_slab(size); |
| @@ -183,7 +183,7 @@ static inline void *kmalloc(size_t size, gfp_t flags) | |||
| 183 | void *__kmalloc_node(size_t size, gfp_t flags, int node); | 183 | void *__kmalloc_node(size_t size, gfp_t flags, int node); |
| 184 | void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); | 184 | void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); |
| 185 | 185 | ||
| 186 | static inline void *kmalloc_node(size_t size, gfp_t flags, int node) | 186 | static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) |
| 187 | { | 187 | { |
| 188 | if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) { | 188 | if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) { |
| 189 | struct kmem_cache *s = kmalloc_slab(size); | 189 | struct kmem_cache *s = kmalloc_slab(size); |
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h index 73cb9943c8a8..991c85bb9e36 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h | |||
| @@ -214,7 +214,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc, | |||
| 214 | const struct sctp_chunk *); | 214 | const struct sctp_chunk *); |
| 215 | struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *, | 215 | struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *, |
| 216 | const struct sctp_chunk *); | 216 | const struct sctp_chunk *); |
| 217 | void sctp_init_cause(struct sctp_chunk *, __be16 cause, const void *, size_t); | 217 | void sctp_init_cause(struct sctp_chunk *, __be16 cause, size_t); |
| 218 | struct sctp_chunk *sctp_make_abort(const struct sctp_association *, | 218 | struct sctp_chunk *sctp_make_abort(const struct sctp_association *, |
| 219 | const struct sctp_chunk *, | 219 | const struct sctp_chunk *, |
| 220 | const size_t hint); | 220 | const size_t hint); |
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index ee4559b11302..c0d5848c33dc 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -726,6 +726,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, | |||
| 726 | struct iovec *data); | 726 | struct iovec *data); |
| 727 | void sctp_chunk_free(struct sctp_chunk *); | 727 | void sctp_chunk_free(struct sctp_chunk *); |
| 728 | void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); | 728 | void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); |
| 729 | void *sctp_addto_param(struct sctp_chunk *, int len, const void *data); | ||
| 729 | struct sctp_chunk *sctp_chunkify(struct sk_buff *, | 730 | struct sctp_chunk *sctp_chunkify(struct sk_buff *, |
| 730 | const struct sctp_association *, | 731 | const struct sctp_association *, |
| 731 | struct sock *); | 732 | struct sock *); |
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h index 39ea3f442b47..cd33270e86dd 100644 --- a/include/net/sctp/ulpqueue.h +++ b/include/net/sctp/ulpqueue.h | |||
| @@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc); | |||
| 83 | /* Skip over an SSN. */ | 83 | /* Skip over an SSN. */ |
| 84 | void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn); | 84 | void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn); |
| 85 | 85 | ||
| 86 | void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *, __u32); | ||
| 86 | #endif /* __sctp_ulpqueue_h__ */ | 87 | #endif /* __sctp_ulpqueue_h__ */ |
| 87 | 88 | ||
| 88 | 89 | ||
diff --git a/init/main.c b/init/main.c index 450e6ee52ab6..9def935ab13a 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -397,10 +397,6 @@ static void __init smp_init(void) | |||
| 397 | { | 397 | { |
| 398 | unsigned int cpu; | 398 | unsigned int cpu; |
| 399 | 399 | ||
| 400 | #ifndef CONFIG_HOTPLUG_CPU | ||
| 401 | cpu_possible_map = cpu_present_map; | ||
| 402 | #endif | ||
| 403 | |||
| 404 | /* FIXME: This should be done in userspace --RR */ | 400 | /* FIXME: This should be done in userspace --RR */ |
| 405 | for_each_present_cpu(cpu) { | 401 | for_each_present_cpu(cpu) { |
| 406 | if (num_online_cpus() >= max_cpus) | 402 | if (num_online_cpus() >= max_cpus) |
| @@ -545,10 +541,6 @@ asmlinkage void __init start_kernel(void) | |||
| 545 | setup_arch(&command_line); | 541 | setup_arch(&command_line); |
| 546 | setup_command_line(command_line); | 542 | setup_command_line(command_line); |
| 547 | unwind_setup(); | 543 | unwind_setup(); |
| 548 | #ifndef CONFIG_HOTPLUG_CPU | ||
| 549 | if (max_cpus < 2) | ||
| 550 | cpu_possible_map = cpu_online_map; | ||
| 551 | #endif | ||
| 552 | setup_per_cpu_areas(); | 544 | setup_per_cpu_areas(); |
| 553 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ | 545 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ |
| 554 | 546 | ||
diff --git a/kernel/cpu.c b/kernel/cpu.c index 181ae7086029..38033db8d8ec 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -273,7 +273,7 @@ int __cpuinit cpu_up(unsigned int cpu) | |||
| 273 | return err; | 273 | return err; |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | #ifdef CONFIG_SUSPEND_SMP | 276 | #ifdef CONFIG_PM_SLEEP_SMP |
| 277 | static cpumask_t frozen_cpus; | 277 | static cpumask_t frozen_cpus; |
| 278 | 278 | ||
| 279 | int disable_nonboot_cpus(void) | 279 | int disable_nonboot_cpus(void) |
| @@ -334,4 +334,4 @@ void enable_nonboot_cpus(void) | |||
| 334 | out: | 334 | out: |
| 335 | mutex_unlock(&cpu_add_remove_lock); | 335 | mutex_unlock(&cpu_add_remove_lock); |
| 336 | } | 336 | } |
| 337 | #endif | 337 | #endif /* CONFIG_PM_SLEEP_SMP */ |
diff --git a/kernel/exit.c b/kernel/exit.c index 9578c1ae19ca..06b24b3aa370 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -975,6 +975,7 @@ fastcall NORET_TYPE void do_exit(long code) | |||
| 975 | if (unlikely(tsk->audit_context)) | 975 | if (unlikely(tsk->audit_context)) |
| 976 | audit_free(tsk); | 976 | audit_free(tsk); |
| 977 | 977 | ||
| 978 | tsk->exit_code = code; | ||
| 978 | taskstats_exit(tsk, group_dead); | 979 | taskstats_exit(tsk, group_dead); |
| 979 | 980 | ||
| 980 | exit_mm(tsk); | 981 | exit_mm(tsk); |
| @@ -996,7 +997,6 @@ fastcall NORET_TYPE void do_exit(long code) | |||
| 996 | if (tsk->binfmt) | 997 | if (tsk->binfmt) |
| 997 | module_put(tsk->binfmt->module); | 998 | module_put(tsk->binfmt->module); |
| 998 | 999 | ||
| 999 | tsk->exit_code = code; | ||
| 1000 | proc_exit_connector(tsk); | 1000 | proc_exit_connector(tsk); |
| 1001 | exit_task_namespaces(tsk); | 1001 | exit_task_namespaces(tsk); |
| 1002 | exit_notify(tsk); | 1002 | exit_notify(tsk); |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 853aefbd184b..7230d914eaa2 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -547,14 +547,11 @@ int request_irq(unsigned int irq, irq_handler_t handler, | |||
| 547 | * We do this before actually registering it, to make sure that | 547 | * We do this before actually registering it, to make sure that |
| 548 | * a 'real' IRQ doesn't run in parallel with our fake | 548 | * a 'real' IRQ doesn't run in parallel with our fake |
| 549 | */ | 549 | */ |
| 550 | if (irqflags & IRQF_DISABLED) { | 550 | unsigned long flags; |
| 551 | unsigned long flags; | ||
| 552 | 551 | ||
| 553 | local_irq_save(flags); | 552 | local_irq_save(flags); |
| 554 | handler(irq, dev_id); | 553 | handler(irq, dev_id); |
| 555 | local_irq_restore(flags); | 554 | local_irq_restore(flags); |
| 556 | } else | ||
| 557 | handler(irq, dev_id); | ||
| 558 | } | 555 | } |
| 559 | #endif | 556 | #endif |
| 560 | 557 | ||
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 412859f8d94a..c8580a1e6873 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -72,15 +72,10 @@ config PM_TRACE | |||
| 72 | CAUTION: this option will cause your machine's real-time clock to be | 72 | CAUTION: this option will cause your machine's real-time clock to be |
| 73 | set to an invalid time after a resume. | 73 | set to an invalid time after a resume. |
| 74 | 74 | ||
| 75 | config SUSPEND_SMP_POSSIBLE | 75 | config PM_SLEEP_SMP |
| 76 | bool | ||
| 77 | depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC)) | ||
| 78 | depends on SMP | ||
| 79 | default y | ||
| 80 | |||
| 81 | config SUSPEND_SMP | ||
| 82 | bool | 76 | bool |
| 83 | depends on SUSPEND_SMP_POSSIBLE && PM_SLEEP | 77 | depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE |
| 78 | depends on PM_SLEEP | ||
| 84 | select HOTPLUG_CPU | 79 | select HOTPLUG_CPU |
| 85 | default y | 80 | default y |
| 86 | 81 | ||
| @@ -89,20 +84,46 @@ config PM_SLEEP | |||
| 89 | depends on SUSPEND || HIBERNATION | 84 | depends on SUSPEND || HIBERNATION |
| 90 | default y | 85 | default y |
| 91 | 86 | ||
| 87 | config SUSPEND_UP_POSSIBLE | ||
| 88 | bool | ||
| 89 | depends on (X86 && !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \ | ||
| 90 | || SUPERH || FRV | ||
| 91 | depends on !SMP | ||
| 92 | default y | ||
| 93 | |||
| 94 | config SUSPEND_SMP_POSSIBLE | ||
| 95 | bool | ||
| 96 | depends on (X86 && !X86_VOYAGER) \ | ||
| 97 | || (PPC && (PPC_PSERIES || PPC_PMAC)) || ARM | ||
| 98 | depends on SMP | ||
| 99 | default y | ||
| 100 | |||
| 92 | config SUSPEND | 101 | config SUSPEND |
| 93 | bool "Suspend to RAM and standby" | 102 | bool "Suspend to RAM and standby" |
| 94 | depends on PM | 103 | depends on PM |
| 95 | depends on !SMP || SUSPEND_SMP_POSSIBLE | 104 | depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE |
| 96 | default y | 105 | default y |
| 97 | ---help--- | 106 | ---help--- |
| 98 | Allow the system to enter sleep states in which main memory is | 107 | Allow the system to enter sleep states in which main memory is |
| 99 | powered and thus its contents are preserved, such as the | 108 | powered and thus its contents are preserved, such as the |
| 100 | suspend-to-RAM state (i.e. the ACPI S3 state). | 109 | suspend-to-RAM state (i.e. the ACPI S3 state). |
| 101 | 110 | ||
| 111 | config HIBERNATION_UP_POSSIBLE | ||
| 112 | bool | ||
| 113 | depends on X86 || PPC64_SWSUSP || FRV || PPC32 | ||
| 114 | depends on !SMP | ||
| 115 | default y | ||
| 116 | |||
| 117 | config HIBERNATION_SMP_POSSIBLE | ||
| 118 | bool | ||
| 119 | depends on (X86 && !X86_VOYAGER) || PPC64_SWSUSP | ||
| 120 | depends on SMP | ||
| 121 | default y | ||
| 122 | |||
| 102 | config HIBERNATION | 123 | config HIBERNATION |
| 103 | bool "Hibernation (aka 'suspend to disk')" | 124 | bool "Hibernation (aka 'suspend to disk')" |
| 104 | depends on PM && SWAP | 125 | depends on PM && SWAP |
| 105 | depends on ((X86 || PPC64_SWSUSP || FRV || PPC32) && !SMP) || SUSPEND_SMP_POSSIBLE | 126 | depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE |
| 106 | ---help--- | 127 | ---help--- |
| 107 | Enable the suspend to disk (STD) functionality, which is usually | 128 | Enable the suspend to disk (STD) functionality, which is usually |
| 108 | called "hibernation" in user interfaces. STD checkpoints the | 129 | called "hibernation" in user interfaces. STD checkpoints the |
diff --git a/kernel/sched.c b/kernel/sched.c index 9fe473a190de..b533d6db78aa 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -1587,6 +1587,7 @@ static void __sched_fork(struct task_struct *p) | |||
| 1587 | p->se.wait_start_fair = 0; | 1587 | p->se.wait_start_fair = 0; |
| 1588 | p->se.exec_start = 0; | 1588 | p->se.exec_start = 0; |
| 1589 | p->se.sum_exec_runtime = 0; | 1589 | p->se.sum_exec_runtime = 0; |
| 1590 | p->se.prev_sum_exec_runtime = 0; | ||
| 1590 | p->se.delta_exec = 0; | 1591 | p->se.delta_exec = 0; |
| 1591 | p->se.delta_fair_run = 0; | 1592 | p->se.delta_fair_run = 0; |
| 1592 | p->se.delta_fair_sleep = 0; | 1593 | p->se.delta_fair_sleep = 0; |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index ee3771850aaf..ce39282d9c0d 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -354,7 +354,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr) | |||
| 354 | delta_fair = calc_delta_fair(delta_exec, lw); | 354 | delta_fair = calc_delta_fair(delta_exec, lw); |
| 355 | delta_mine = calc_delta_mine(delta_exec, curr->load.weight, lw); | 355 | delta_mine = calc_delta_mine(delta_exec, curr->load.weight, lw); |
| 356 | 356 | ||
| 357 | if (cfs_rq->sleeper_bonus > sysctl_sched_latency) { | 357 | if (cfs_rq->sleeper_bonus > sysctl_sched_min_granularity) { |
| 358 | delta = min((u64)delta_mine, cfs_rq->sleeper_bonus); | 358 | delta = min((u64)delta_mine, cfs_rq->sleeper_bonus); |
| 359 | delta = min(delta, (unsigned long)( | 359 | delta = min(delta, (unsigned long)( |
| 360 | (long)sysctl_sched_runtime_limit - curr->wait_runtime)); | 360 | (long)sysctl_sched_runtime_limit - curr->wait_runtime)); |
| @@ -489,6 +489,9 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
| 489 | { | 489 | { |
| 490 | unsigned long delta_fair; | 490 | unsigned long delta_fair; |
| 491 | 491 | ||
| 492 | if (unlikely(!se->wait_start_fair)) | ||
| 493 | return; | ||
| 494 | |||
| 492 | delta_fair = (unsigned long)min((u64)(2*sysctl_sched_runtime_limit), | 495 | delta_fair = (unsigned long)min((u64)(2*sysctl_sched_runtime_limit), |
| 493 | (u64)(cfs_rq->fair_clock - se->wait_start_fair)); | 496 | (u64)(cfs_rq->fair_clock - se->wait_start_fair)); |
| 494 | 497 | ||
| @@ -668,7 +671,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) | |||
| 668 | /* | 671 | /* |
| 669 | * Preempt the current task with a newly woken task if needed: | 672 | * Preempt the current task with a newly woken task if needed: |
| 670 | */ | 673 | */ |
| 671 | static void | 674 | static int |
| 672 | __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, | 675 | __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, |
| 673 | struct sched_entity *curr, unsigned long granularity) | 676 | struct sched_entity *curr, unsigned long granularity) |
| 674 | { | 677 | { |
| @@ -679,8 +682,11 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, | |||
| 679 | * preempt the current task unless the best task has | 682 | * preempt the current task unless the best task has |
| 680 | * a larger than sched_granularity fairness advantage: | 683 | * a larger than sched_granularity fairness advantage: |
| 681 | */ | 684 | */ |
| 682 | if (__delta > niced_granularity(curr, granularity)) | 685 | if (__delta > niced_granularity(curr, granularity)) { |
| 683 | resched_task(rq_of(cfs_rq)->curr); | 686 | resched_task(rq_of(cfs_rq)->curr); |
| 687 | return 1; | ||
| 688 | } | ||
| 689 | return 0; | ||
| 684 | } | 690 | } |
| 685 | 691 | ||
| 686 | static inline void | 692 | static inline void |
| @@ -725,6 +731,7 @@ static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev) | |||
| 725 | 731 | ||
| 726 | static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) | 732 | static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) |
| 727 | { | 733 | { |
| 734 | unsigned long gran, ideal_runtime, delta_exec; | ||
| 728 | struct sched_entity *next; | 735 | struct sched_entity *next; |
| 729 | 736 | ||
| 730 | /* | 737 | /* |
| @@ -741,8 +748,22 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) | |||
| 741 | if (next == curr) | 748 | if (next == curr) |
| 742 | return; | 749 | return; |
| 743 | 750 | ||
| 744 | __check_preempt_curr_fair(cfs_rq, next, curr, | 751 | gran = sched_granularity(cfs_rq); |
| 745 | sched_granularity(cfs_rq)); | 752 | ideal_runtime = niced_granularity(curr, |
| 753 | max(sysctl_sched_latency / cfs_rq->nr_running, | ||
| 754 | (unsigned long)sysctl_sched_min_granularity)); | ||
| 755 | /* | ||
| 756 | * If we executed more than what the latency constraint suggests, | ||
| 757 | * reduce the rescheduling granularity. This way the total latency | ||
| 758 | * of how much a task is not scheduled converges to | ||
| 759 | * sysctl_sched_latency: | ||
| 760 | */ | ||
| 761 | delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; | ||
| 762 | if (delta_exec > ideal_runtime) | ||
| 763 | gran = 0; | ||
| 764 | |||
| 765 | if (__check_preempt_curr_fair(cfs_rq, next, curr, gran)) | ||
| 766 | curr->prev_sum_exec_runtime = curr->sum_exec_runtime; | ||
| 746 | } | 767 | } |
| 747 | 768 | ||
| 748 | /************************************************** | 769 | /************************************************** |
| @@ -1076,31 +1097,34 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr) | |||
| 1076 | static void task_new_fair(struct rq *rq, struct task_struct *p) | 1097 | static void task_new_fair(struct rq *rq, struct task_struct *p) |
| 1077 | { | 1098 | { |
| 1078 | struct cfs_rq *cfs_rq = task_cfs_rq(p); | 1099 | struct cfs_rq *cfs_rq = task_cfs_rq(p); |
| 1079 | struct sched_entity *se = &p->se; | 1100 | struct sched_entity *se = &p->se, *curr = cfs_rq_curr(cfs_rq); |
| 1080 | 1101 | ||
| 1081 | sched_info_queued(p); | 1102 | sched_info_queued(p); |
| 1082 | 1103 | ||
| 1104 | update_curr(cfs_rq); | ||
| 1083 | update_stats_enqueue(cfs_rq, se); | 1105 | update_stats_enqueue(cfs_rq, se); |
| 1084 | /* | 1106 | /* |
| 1085 | * Child runs first: we let it run before the parent | 1107 | * Child runs first: we let it run before the parent |
| 1086 | * until it reschedules once. We set up the key so that | 1108 | * until it reschedules once. We set up the key so that |
| 1087 | * it will preempt the parent: | 1109 | * it will preempt the parent: |
| 1088 | */ | 1110 | */ |
| 1089 | p->se.fair_key = current->se.fair_key - | 1111 | se->fair_key = curr->fair_key - |
| 1090 | niced_granularity(&rq->curr->se, sched_granularity(cfs_rq)) - 1; | 1112 | niced_granularity(curr, sched_granularity(cfs_rq)) - 1; |
| 1091 | /* | 1113 | /* |
| 1092 | * The first wait is dominated by the child-runs-first logic, | 1114 | * The first wait is dominated by the child-runs-first logic, |
| 1093 | * so do not credit it with that waiting time yet: | 1115 | * so do not credit it with that waiting time yet: |
| 1094 | */ | 1116 | */ |
| 1095 | if (sysctl_sched_features & SCHED_FEAT_SKIP_INITIAL) | 1117 | if (sysctl_sched_features & SCHED_FEAT_SKIP_INITIAL) |
| 1096 | p->se.wait_start_fair = 0; | 1118 | se->wait_start_fair = 0; |
| 1097 | 1119 | ||
| 1098 | /* | 1120 | /* |
| 1099 | * The statistical average of wait_runtime is about | 1121 | * The statistical average of wait_runtime is about |
| 1100 | * -granularity/2, so initialize the task with that: | 1122 | * -granularity/2, so initialize the task with that: |
| 1101 | */ | 1123 | */ |
| 1102 | if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) | 1124 | if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) { |
| 1103 | p->se.wait_runtime = -(sched_granularity(cfs_rq) / 2); | 1125 | se->wait_runtime = -(sched_granularity(cfs_rq) / 2); |
| 1126 | schedstat_add(cfs_rq, wait_runtime, se->wait_runtime); | ||
| 1127 | } | ||
| 1104 | 1128 | ||
| 1105 | __enqueue_entity(cfs_rq, se); | 1129 | __enqueue_entity(cfs_rq, se); |
| 1106 | } | 1130 | } |
diff --git a/kernel/signal.c b/kernel/signal.c index ad63109e413c..3169bed0b4d0 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1300,20 +1300,19 @@ struct sigqueue *sigqueue_alloc(void) | |||
| 1300 | void sigqueue_free(struct sigqueue *q) | 1300 | void sigqueue_free(struct sigqueue *q) |
| 1301 | { | 1301 | { |
| 1302 | unsigned long flags; | 1302 | unsigned long flags; |
| 1303 | spinlock_t *lock = ¤t->sighand->siglock; | ||
| 1304 | |||
| 1303 | BUG_ON(!(q->flags & SIGQUEUE_PREALLOC)); | 1305 | BUG_ON(!(q->flags & SIGQUEUE_PREALLOC)); |
| 1304 | /* | 1306 | /* |
| 1305 | * If the signal is still pending remove it from the | 1307 | * If the signal is still pending remove it from the |
| 1306 | * pending queue. | 1308 | * pending queue. We must hold ->siglock while testing |
| 1309 | * q->list to serialize with collect_signal(). | ||
| 1307 | */ | 1310 | */ |
| 1308 | if (unlikely(!list_empty(&q->list))) { | 1311 | spin_lock_irqsave(lock, flags); |
| 1309 | spinlock_t *lock = ¤t->sighand->siglock; | 1312 | if (!list_empty(&q->list)) |
| 1310 | read_lock(&tasklist_lock); | 1313 | list_del_init(&q->list); |
| 1311 | spin_lock_irqsave(lock, flags); | 1314 | spin_unlock_irqrestore(lock, flags); |
| 1312 | if (!list_empty(&q->list)) | 1315 | |
| 1313 | list_del_init(&q->list); | ||
| 1314 | spin_unlock_irqrestore(lock, flags); | ||
| 1315 | read_unlock(&tasklist_lock); | ||
| 1316 | } | ||
| 1317 | q->flags &= ~SIGQUEUE_PREALLOC; | 1316 | q->flags &= ~SIGQUEUE_PREALLOC; |
| 1318 | __sigqueue_free(q); | 1317 | __sigqueue_free(q); |
| 1319 | } | 1318 | } |
diff --git a/kernel/sys.c b/kernel/sys.c index 449b81b98b3d..1b33b05d346b 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -1442,7 +1442,6 @@ asmlinkage long sys_times(struct tms __user * tbuf) | |||
| 1442 | * Auch. Had to add the 'did_exec' flag to conform completely to POSIX. | 1442 | * Auch. Had to add the 'did_exec' flag to conform completely to POSIX. |
| 1443 | * LBT 04.03.94 | 1443 | * LBT 04.03.94 |
| 1444 | */ | 1444 | */ |
| 1445 | |||
| 1446 | asmlinkage long sys_setpgid(pid_t pid, pid_t pgid) | 1445 | asmlinkage long sys_setpgid(pid_t pid, pid_t pgid) |
| 1447 | { | 1446 | { |
| 1448 | struct task_struct *p; | 1447 | struct task_struct *p; |
| @@ -1470,7 +1469,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid) | |||
| 1470 | if (!thread_group_leader(p)) | 1469 | if (!thread_group_leader(p)) |
| 1471 | goto out; | 1470 | goto out; |
| 1472 | 1471 | ||
| 1473 | if (p->real_parent == group_leader) { | 1472 | if (p->real_parent->tgid == group_leader->tgid) { |
| 1474 | err = -EPERM; | 1473 | err = -EPERM; |
| 1475 | if (task_session(p) != task_session(group_leader)) | 1474 | if (task_session(p) != task_session(group_leader)) |
| 1476 | goto out; | 1475 | goto out; |
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index d055d987850c..85af9422ea6e 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c | |||
| @@ -81,6 +81,7 @@ void free_user_ns(struct kref *kref) | |||
| 81 | struct user_namespace *ns; | 81 | struct user_namespace *ns; |
| 82 | 82 | ||
| 83 | ns = container_of(kref, struct user_namespace, kref); | 83 | ns = container_of(kref, struct user_namespace, kref); |
| 84 | free_uid(ns->root_user); | ||
| 84 | kfree(ns); | 85 | kfree(ns); |
| 85 | } | 86 | } |
| 86 | 87 | ||
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 172abffeb2e3..bb54b88c3d5a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -955,6 +955,11 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, | |||
| 955 | goto out; | 955 | goto out; |
| 956 | } | 956 | } |
| 957 | 957 | ||
| 958 | if (!nodes_subset(new, node_online_map)) { | ||
| 959 | err = -EINVAL; | ||
| 960 | goto out; | ||
| 961 | } | ||
| 962 | |||
| 958 | err = security_task_movememory(task); | 963 | err = security_task_movememory(task); |
| 959 | if (err) | 964 | if (err) |
| 960 | goto out; | 965 | goto out; |
diff --git a/mm/migrate.c b/mm/migrate.c index 37c73b902008..e2fdbce1874b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -611,6 +611,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, | |||
| 611 | int rc = 0; | 611 | int rc = 0; |
| 612 | int *result = NULL; | 612 | int *result = NULL; |
| 613 | struct page *newpage = get_new_page(page, private, &result); | 613 | struct page *newpage = get_new_page(page, private, &result); |
| 614 | int rcu_locked = 0; | ||
| 614 | 615 | ||
| 615 | if (!newpage) | 616 | if (!newpage) |
| 616 | return -ENOMEM; | 617 | return -ENOMEM; |
| @@ -636,8 +637,13 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, | |||
| 636 | * we cannot notice that anon_vma is freed while we migrates a page. | 637 | * we cannot notice that anon_vma is freed while we migrates a page. |
| 637 | * This rcu_read_lock() delays freeing anon_vma pointer until the end | 638 | * This rcu_read_lock() delays freeing anon_vma pointer until the end |
| 638 | * of migration. File cache pages are no problem because of page_lock() | 639 | * of migration. File cache pages are no problem because of page_lock() |
| 640 | * File Caches may use write_page() or lock_page() in migration, then, | ||
| 641 | * just care Anon page here. | ||
| 639 | */ | 642 | */ |
| 640 | rcu_read_lock(); | 643 | if (PageAnon(page)) { |
| 644 | rcu_read_lock(); | ||
| 645 | rcu_locked = 1; | ||
| 646 | } | ||
| 641 | /* | 647 | /* |
| 642 | * This is a corner case handling. | 648 | * This is a corner case handling. |
| 643 | * When a new swap-cache is read into, it is linked to LRU | 649 | * When a new swap-cache is read into, it is linked to LRU |
| @@ -656,7 +662,8 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, | |||
| 656 | if (rc) | 662 | if (rc) |
| 657 | remove_migration_ptes(page, page); | 663 | remove_migration_ptes(page, page); |
| 658 | rcu_unlock: | 664 | rcu_unlock: |
| 659 | rcu_read_unlock(); | 665 | if (rcu_locked) |
| 666 | rcu_read_unlock(); | ||
| 660 | 667 | ||
| 661 | unlock: | 668 | unlock: |
| 662 | 669 | ||
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6427653023aa..1a8c59571cb7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -2345,6 +2345,8 @@ static int __cpuinit process_zones(int cpu) | |||
| 2345 | return 0; | 2345 | return 0; |
| 2346 | bad: | 2346 | bad: |
| 2347 | for_each_zone(dzone) { | 2347 | for_each_zone(dzone) { |
| 2348 | if (!populated_zone(dzone)) | ||
| 2349 | continue; | ||
| 2348 | if (dzone == zone) | 2350 | if (dzone == zone) |
| 2349 | break; | 2351 | break; |
| 2350 | kfree(zone_pcp(dzone, cpu)); | 2352 | kfree(zone_pcp(dzone, cpu)); |
| @@ -3813,7 +3813,9 @@ static int __init slab_sysfs_init(void) | |||
| 3813 | 3813 | ||
| 3814 | list_for_each_entry(s, &slab_caches, list) { | 3814 | list_for_each_entry(s, &slab_caches, list) { |
| 3815 | err = sysfs_slab_add(s); | 3815 | err = sysfs_slab_add(s); |
| 3816 | BUG_ON(err); | 3816 | if (err) |
| 3817 | printk(KERN_ERR "SLUB: Unable to add boot slab %s" | ||
| 3818 | " to sysfs\n", s->name); | ||
| 3817 | } | 3819 | } |
| 3818 | 3820 | ||
| 3819 | while (alias_list) { | 3821 | while (alias_list) { |
| @@ -3821,7 +3823,9 @@ static int __init slab_sysfs_init(void) | |||
| 3821 | 3823 | ||
| 3822 | alias_list = alias_list->next; | 3824 | alias_list = alias_list->next; |
| 3823 | err = sysfs_slab_alias(al->s, al->name); | 3825 | err = sysfs_slab_alias(al->s, al->name); |
| 3824 | BUG_ON(err); | 3826 | if (err) |
| 3827 | printk(KERN_ERR "SLUB: Unable to add boot slab alias" | ||
| 3828 | " %s to sysfs\n", s->name); | ||
| 3825 | kfree(al); | 3829 | kfree(al); |
| 3826 | } | 3830 | } |
| 3827 | 3831 | ||
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 69b70977f000..eb57502bb264 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
| @@ -384,6 +384,11 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, | |||
| 384 | if (hold_time(br) == 0) | 384 | if (hold_time(br) == 0) |
| 385 | return; | 385 | return; |
| 386 | 386 | ||
| 387 | /* ignore packets unless we are using this port */ | ||
| 388 | if (!(source->state == BR_STATE_LEARNING || | ||
| 389 | source->state == BR_STATE_FORWARDING)) | ||
| 390 | return; | ||
| 391 | |||
| 387 | fdb = fdb_find(head, addr); | 392 | fdb = fdb_find(head, addr); |
| 388 | if (likely(fdb)) { | 393 | if (likely(fdb)) { |
| 389 | /* attempt to update an entry for a local interface */ | 394 | /* attempt to update an entry for a local interface */ |
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 749f0e8f541d..9272f12f664c 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
| @@ -33,17 +33,17 @@ | |||
| 33 | */ | 33 | */ |
| 34 | static int port_cost(struct net_device *dev) | 34 | static int port_cost(struct net_device *dev) |
| 35 | { | 35 | { |
| 36 | if (dev->ethtool_ops->get_settings) { | 36 | if (dev->ethtool_ops && dev->ethtool_ops->get_settings) { |
| 37 | struct ethtool_cmd ecmd = { ETHTOOL_GSET }; | 37 | struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, }; |
| 38 | int err = dev->ethtool_ops->get_settings(dev, &ecmd); | 38 | |
| 39 | if (!err) { | 39 | if (!dev->ethtool_ops->get_settings(dev, &ecmd)) { |
| 40 | switch(ecmd.speed) { | 40 | switch(ecmd.speed) { |
| 41 | case SPEED_100: | ||
| 42 | return 19; | ||
| 43 | case SPEED_1000: | ||
| 44 | return 4; | ||
| 45 | case SPEED_10000: | 41 | case SPEED_10000: |
| 46 | return 2; | 42 | return 2; |
| 43 | case SPEED_1000: | ||
| 44 | return 4; | ||
| 45 | case SPEED_100: | ||
| 46 | return 19; | ||
| 47 | case SPEED_10: | 47 | case SPEED_10: |
| 48 | return 100; | 48 | return 100; |
| 49 | } | 49 | } |
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 5c18595b7616..6f468fc3357a 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
| @@ -101,9 +101,8 @@ static int br_handle_local_finish(struct sk_buff *skb) | |||
| 101 | { | 101 | { |
| 102 | struct net_bridge_port *p = rcu_dereference(skb->dev->br_port); | 102 | struct net_bridge_port *p = rcu_dereference(skb->dev->br_port); |
| 103 | 103 | ||
| 104 | if (p && p->state != BR_STATE_DISABLED) | 104 | if (p) |
| 105 | br_fdb_update(p->br, p, eth_hdr(skb)->h_source); | 105 | br_fdb_update(p->br, p, eth_hdr(skb)->h_source); |
| 106 | |||
| 107 | return 0; /* process further */ | 106 | return 0; /* process further */ |
| 108 | } | 107 | } |
| 109 | 108 | ||
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 7bae576ac115..36fdea71d742 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
| @@ -380,7 +380,6 @@ struct pktgen_thread { | |||
| 380 | /* Field for thread to receive "posted" events terminate, stop ifs etc. */ | 380 | /* Field for thread to receive "posted" events terminate, stop ifs etc. */ |
| 381 | 381 | ||
| 382 | u32 control; | 382 | u32 control; |
| 383 | int pid; | ||
| 384 | int cpu; | 383 | int cpu; |
| 385 | 384 | ||
| 386 | wait_queue_head_t queue; | 385 | wait_queue_head_t queue; |
| @@ -3331,8 +3330,9 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev) | |||
| 3331 | } | 3330 | } |
| 3332 | 3331 | ||
| 3333 | if ((netif_queue_stopped(odev) || | 3332 | if ((netif_queue_stopped(odev) || |
| 3334 | netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping)) || | 3333 | (pkt_dev->skb && |
| 3335 | need_resched()) { | 3334 | netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping))) || |
| 3335 | need_resched()) { | ||
| 3336 | idle_start = getCurUs(); | 3336 | idle_start = getCurUs(); |
| 3337 | 3337 | ||
| 3338 | if (!netif_running(odev)) { | 3338 | if (!netif_running(odev)) { |
| @@ -3462,8 +3462,6 @@ static int pktgen_thread_worker(void *arg) | |||
| 3462 | 3462 | ||
| 3463 | init_waitqueue_head(&t->queue); | 3463 | init_waitqueue_head(&t->queue); |
| 3464 | 3464 | ||
| 3465 | t->pid = current->pid; | ||
| 3466 | |||
| 3467 | pr_debug("pktgen: starting pktgen/%d: pid=%d\n", cpu, current->pid); | 3465 | pr_debug("pktgen: starting pktgen/%d: pid=%d\n", cpu, current->pid); |
| 3468 | 3466 | ||
| 3469 | max_before_softirq = t->max_before_softirq; | 3467 | max_before_softirq = t->max_before_softirq; |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 9785df37a65f..1ee72127462b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -555,6 +555,16 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) | |||
| 555 | tcp_grow_window(sk, skb); | 555 | tcp_grow_window(sk, skb); |
| 556 | } | 556 | } |
| 557 | 557 | ||
| 558 | static u32 tcp_rto_min(struct sock *sk) | ||
| 559 | { | ||
| 560 | struct dst_entry *dst = __sk_dst_get(sk); | ||
| 561 | u32 rto_min = TCP_RTO_MIN; | ||
| 562 | |||
| 563 | if (dst_metric_locked(dst, RTAX_RTO_MIN)) | ||
| 564 | rto_min = dst->metrics[RTAX_RTO_MIN-1]; | ||
| 565 | return rto_min; | ||
| 566 | } | ||
| 567 | |||
| 558 | /* Called to compute a smoothed rtt estimate. The data fed to this | 568 | /* Called to compute a smoothed rtt estimate. The data fed to this |
| 559 | * routine either comes from timestamps, or from segments that were | 569 | * routine either comes from timestamps, or from segments that were |
| 560 | * known _not_ to have been retransmitted [see Karn/Partridge | 570 | * known _not_ to have been retransmitted [see Karn/Partridge |
| @@ -616,13 +626,13 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt) | |||
| 616 | if (tp->mdev_max < tp->rttvar) | 626 | if (tp->mdev_max < tp->rttvar) |
| 617 | tp->rttvar -= (tp->rttvar-tp->mdev_max)>>2; | 627 | tp->rttvar -= (tp->rttvar-tp->mdev_max)>>2; |
| 618 | tp->rtt_seq = tp->snd_nxt; | 628 | tp->rtt_seq = tp->snd_nxt; |
| 619 | tp->mdev_max = TCP_RTO_MIN; | 629 | tp->mdev_max = tcp_rto_min(sk); |
| 620 | } | 630 | } |
| 621 | } else { | 631 | } else { |
| 622 | /* no previous measure. */ | 632 | /* no previous measure. */ |
| 623 | tp->srtt = m<<3; /* take the measured time to be rtt */ | 633 | tp->srtt = m<<3; /* take the measured time to be rtt */ |
| 624 | tp->mdev = m<<1; /* make sure rto = 3*rtt */ | 634 | tp->mdev = m<<1; /* make sure rto = 3*rtt */ |
| 625 | tp->mdev_max = tp->rttvar = max(tp->mdev, TCP_RTO_MIN); | 635 | tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk)); |
| 626 | tp->rtt_seq = tp->snd_nxt; | 636 | tp->rtt_seq = tp->snd_nxt; |
| 627 | } | 637 | } |
| 628 | } | 638 | } |
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c index ab7d845224fc..223f9bded672 100644 --- a/net/netfilter/xt_tcpudp.c +++ b/net/netfilter/xt_tcpudp.c | |||
| @@ -188,7 +188,7 @@ udp_checkentry(const char *tablename, | |||
| 188 | void *matchinfo, | 188 | void *matchinfo, |
| 189 | unsigned int hook_mask) | 189 | unsigned int hook_mask) |
| 190 | { | 190 | { |
| 191 | const struct xt_tcp *udpinfo = matchinfo; | 191 | const struct xt_udp *udpinfo = matchinfo; |
| 192 | 192 | ||
| 193 | /* Must specify no unknown invflags */ | 193 | /* Must specify no unknown invflags */ |
| 194 | return !(udpinfo->invflags & ~XT_UDP_INV_MASK); | 194 | return !(udpinfo->invflags & ~XT_UDP_INV_MASK); |
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 4a49db65772e..abd82fc3ec60 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
| @@ -44,7 +44,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) | |||
| 44 | if (TC_H_MAJ(skb->priority) != sch->handle) { | 44 | if (TC_H_MAJ(skb->priority) != sch->handle) { |
| 45 | err = tc_classify(skb, q->filter_list, &res); | 45 | err = tc_classify(skb, q->filter_list, &res); |
| 46 | #ifdef CONFIG_NET_CLS_ACT | 46 | #ifdef CONFIG_NET_CLS_ACT |
| 47 | switch (tc_classify(skb, q->filter_list, &res)) { | 47 | switch (err) { |
| 48 | case TC_ACT_STOLEN: | 48 | case TC_ACT_STOLEN: |
| 49 | case TC_ACT_QUEUED: | 49 | case TC_ACT_QUEUED: |
| 50 | *qerr = NET_XMIT_SUCCESS; | 50 | *qerr = NET_XMIT_SUCCESS; |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 498edb0cd4e5..2ad1caf1ea42 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -727,7 +727,12 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, | |||
| 727 | break; | 727 | break; |
| 728 | 728 | ||
| 729 | case SCTP_TRANSPORT_DOWN: | 729 | case SCTP_TRANSPORT_DOWN: |
| 730 | transport->state = SCTP_INACTIVE; | 730 | /* if the transort was never confirmed, do not transition it |
| 731 | * to inactive state. | ||
| 732 | */ | ||
| 733 | if (transport->state != SCTP_UNCONFIRMED) | ||
| 734 | transport->state = SCTP_INACTIVE; | ||
| 735 | |||
| 731 | spc_state = SCTP_ADDR_UNREACHABLE; | 736 | spc_state = SCTP_ADDR_UNREACHABLE; |
| 732 | break; | 737 | break; |
| 733 | 738 | ||
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 992f361084b7..28f4fe77ceee 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
| @@ -421,6 +421,13 @@ void sctp_retransmit_mark(struct sctp_outq *q, | |||
| 421 | */ | 421 | */ |
| 422 | if ((fast_retransmit && (chunk->fast_retransmit > 0)) || | 422 | if ((fast_retransmit && (chunk->fast_retransmit > 0)) || |
| 423 | (!fast_retransmit && !chunk->tsn_gap_acked)) { | 423 | (!fast_retransmit && !chunk->tsn_gap_acked)) { |
| 424 | /* If this chunk was sent less then 1 rto ago, do not | ||
| 425 | * retransmit this chunk, but give the peer time | ||
| 426 | * to acknowlege it. | ||
| 427 | */ | ||
| 428 | if ((jiffies - chunk->sent_at) < transport->rto) | ||
| 429 | continue; | ||
| 430 | |||
| 424 | /* RFC 2960 6.2.1 Processing a Received SACK | 431 | /* RFC 2960 6.2.1 Processing a Received SACK |
| 425 | * | 432 | * |
| 426 | * C) Any time a DATA chunk is marked for | 433 | * C) Any time a DATA chunk is marked for |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 51c4d7fef1d2..79856c924525 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
| @@ -110,7 +110,7 @@ static const struct sctp_paramhdr prsctp_param = { | |||
| 110 | * abort chunk. | 110 | * abort chunk. |
| 111 | */ | 111 | */ |
| 112 | void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, | 112 | void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, |
| 113 | const void *payload, size_t paylen) | 113 | size_t paylen) |
| 114 | { | 114 | { |
| 115 | sctp_errhdr_t err; | 115 | sctp_errhdr_t err; |
| 116 | __u16 len; | 116 | __u16 len; |
| @@ -120,7 +120,6 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, | |||
| 120 | len = sizeof(sctp_errhdr_t) + paylen; | 120 | len = sizeof(sctp_errhdr_t) + paylen; |
| 121 | err.length = htons(len); | 121 | err.length = htons(len); |
| 122 | chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); | 122 | chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); |
| 123 | sctp_addto_chunk(chunk, paylen, payload); | ||
| 124 | } | 123 | } |
| 125 | 124 | ||
| 126 | /* 3.3.2 Initiation (INIT) (1) | 125 | /* 3.3.2 Initiation (INIT) (1) |
| @@ -780,8 +779,8 @@ struct sctp_chunk *sctp_make_abort_no_data( | |||
| 780 | 779 | ||
| 781 | /* Put the tsn back into network byte order. */ | 780 | /* Put the tsn back into network byte order. */ |
| 782 | payload = htonl(tsn); | 781 | payload = htonl(tsn); |
| 783 | sctp_init_cause(retval, SCTP_ERROR_NO_DATA, (const void *)&payload, | 782 | sctp_init_cause(retval, SCTP_ERROR_NO_DATA, sizeof(payload)); |
| 784 | sizeof(payload)); | 783 | sctp_addto_chunk(retval, sizeof(payload), (const void *)&payload); |
| 785 | 784 | ||
| 786 | /* RFC 2960 6.4 Multi-homed SCTP Endpoints | 785 | /* RFC 2960 6.4 Multi-homed SCTP Endpoints |
| 787 | * | 786 | * |
| @@ -823,7 +822,8 @@ struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc, | |||
| 823 | goto err_copy; | 822 | goto err_copy; |
| 824 | } | 823 | } |
| 825 | 824 | ||
| 826 | sctp_init_cause(retval, SCTP_ERROR_USER_ABORT, payload, paylen); | 825 | sctp_init_cause(retval, SCTP_ERROR_USER_ABORT, paylen); |
| 826 | sctp_addto_chunk(retval, paylen, payload); | ||
| 827 | 827 | ||
| 828 | if (paylen) | 828 | if (paylen) |
| 829 | kfree(payload); | 829 | kfree(payload); |
| @@ -850,15 +850,17 @@ struct sctp_chunk *sctp_make_abort_violation( | |||
| 850 | struct sctp_paramhdr phdr; | 850 | struct sctp_paramhdr phdr; |
| 851 | 851 | ||
| 852 | retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t) + paylen | 852 | retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t) + paylen |
| 853 | + sizeof(sctp_chunkhdr_t)); | 853 | + sizeof(sctp_paramhdr_t)); |
| 854 | if (!retval) | 854 | if (!retval) |
| 855 | goto end; | 855 | goto end; |
| 856 | 856 | ||
| 857 | sctp_init_cause(retval, SCTP_ERROR_PROTO_VIOLATION, payload, paylen); | 857 | sctp_init_cause(retval, SCTP_ERROR_PROTO_VIOLATION, paylen |
| 858 | + sizeof(sctp_paramhdr_t)); | ||
| 858 | 859 | ||
| 859 | phdr.type = htons(chunk->chunk_hdr->type); | 860 | phdr.type = htons(chunk->chunk_hdr->type); |
| 860 | phdr.length = chunk->chunk_hdr->length; | 861 | phdr.length = chunk->chunk_hdr->length; |
| 861 | sctp_addto_chunk(retval, sizeof(sctp_paramhdr_t), &phdr); | 862 | sctp_addto_chunk(retval, paylen, payload); |
| 863 | sctp_addto_param(retval, sizeof(sctp_paramhdr_t), &phdr); | ||
| 862 | 864 | ||
| 863 | end: | 865 | end: |
| 864 | return retval; | 866 | return retval; |
| @@ -955,7 +957,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *asoc, | |||
| 955 | if (!retval) | 957 | if (!retval) |
| 956 | goto nodata; | 958 | goto nodata; |
| 957 | 959 | ||
| 958 | sctp_init_cause(retval, cause_code, payload, paylen); | 960 | sctp_init_cause(retval, cause_code, paylen); |
| 961 | sctp_addto_chunk(retval, paylen, payload); | ||
| 959 | 962 | ||
| 960 | nodata: | 963 | nodata: |
| 961 | return retval; | 964 | return retval; |
| @@ -1128,7 +1131,7 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data) | |||
| 1128 | void *target; | 1131 | void *target; |
| 1129 | void *padding; | 1132 | void *padding; |
| 1130 | int chunklen = ntohs(chunk->chunk_hdr->length); | 1133 | int chunklen = ntohs(chunk->chunk_hdr->length); |
| 1131 | int padlen = chunklen % 4; | 1134 | int padlen = WORD_ROUND(chunklen) - chunklen; |
| 1132 | 1135 | ||
| 1133 | padding = skb_put(chunk->skb, padlen); | 1136 | padding = skb_put(chunk->skb, padlen); |
| 1134 | target = skb_put(chunk->skb, len); | 1137 | target = skb_put(chunk->skb, len); |
| @@ -1143,6 +1146,25 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data) | |||
| 1143 | return target; | 1146 | return target; |
| 1144 | } | 1147 | } |
| 1145 | 1148 | ||
| 1149 | /* Append bytes to the end of a parameter. Will panic if chunk is not big | ||
| 1150 | * enough. | ||
| 1151 | */ | ||
| 1152 | void *sctp_addto_param(struct sctp_chunk *chunk, int len, const void *data) | ||
| 1153 | { | ||
| 1154 | void *target; | ||
| 1155 | int chunklen = ntohs(chunk->chunk_hdr->length); | ||
| 1156 | |||
| 1157 | target = skb_put(chunk->skb, len); | ||
| 1158 | |||
| 1159 | memcpy(target, data, len); | ||
| 1160 | |||
| 1161 | /* Adjust the chunk length field. */ | ||
| 1162 | chunk->chunk_hdr->length = htons(chunklen + len); | ||
| 1163 | chunk->chunk_end = skb_tail_pointer(chunk->skb); | ||
| 1164 | |||
| 1165 | return target; | ||
| 1166 | } | ||
| 1167 | |||
| 1146 | /* Append bytes from user space to the end of a chunk. Will panic if | 1168 | /* Append bytes from user space to the end of a chunk. Will panic if |
| 1147 | * chunk is not big enough. | 1169 | * chunk is not big enough. |
| 1148 | * Returns a kernel err value. | 1170 | * Returns a kernel err value. |
| @@ -1174,25 +1196,36 @@ out: | |||
| 1174 | */ | 1196 | */ |
| 1175 | void sctp_chunk_assign_ssn(struct sctp_chunk *chunk) | 1197 | void sctp_chunk_assign_ssn(struct sctp_chunk *chunk) |
| 1176 | { | 1198 | { |
| 1199 | struct sctp_datamsg *msg; | ||
| 1200 | struct sctp_chunk *lchunk; | ||
| 1201 | struct sctp_stream *stream; | ||
| 1177 | __u16 ssn; | 1202 | __u16 ssn; |
| 1178 | __u16 sid; | 1203 | __u16 sid; |
| 1179 | 1204 | ||
| 1180 | if (chunk->has_ssn) | 1205 | if (chunk->has_ssn) |
| 1181 | return; | 1206 | return; |
| 1182 | 1207 | ||
| 1183 | /* This is the last possible instant to assign a SSN. */ | 1208 | /* All fragments will be on the same stream */ |
| 1184 | if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) { | 1209 | sid = ntohs(chunk->subh.data_hdr->stream); |
| 1185 | ssn = 0; | 1210 | stream = &chunk->asoc->ssnmap->out; |
| 1186 | } else { | ||
| 1187 | sid = ntohs(chunk->subh.data_hdr->stream); | ||
| 1188 | if (chunk->chunk_hdr->flags & SCTP_DATA_LAST_FRAG) | ||
| 1189 | ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid); | ||
| 1190 | else | ||
| 1191 | ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid); | ||
| 1192 | } | ||
| 1193 | 1211 | ||
| 1194 | chunk->subh.data_hdr->ssn = htons(ssn); | 1212 | /* Now assign the sequence number to the entire message. |
| 1195 | chunk->has_ssn = 1; | 1213 | * All fragments must have the same stream sequence number. |
| 1214 | */ | ||
| 1215 | msg = chunk->msg; | ||
| 1216 | list_for_each_entry(lchunk, &msg->chunks, frag_list) { | ||
| 1217 | if (lchunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) { | ||
| 1218 | ssn = 0; | ||
| 1219 | } else { | ||
| 1220 | if (lchunk->chunk_hdr->flags & SCTP_DATA_LAST_FRAG) | ||
| 1221 | ssn = sctp_ssn_next(stream, sid); | ||
| 1222 | else | ||
| 1223 | ssn = sctp_ssn_peek(stream, sid); | ||
| 1224 | } | ||
| 1225 | |||
| 1226 | lchunk->subh.data_hdr->ssn = htons(ssn); | ||
| 1227 | lchunk->has_ssn = 1; | ||
| 1228 | } | ||
| 1196 | } | 1229 | } |
| 1197 | 1230 | ||
| 1198 | /* Helper function to assign a TSN if needed. This assumes that both | 1231 | /* Helper function to assign a TSN if needed. This assumes that both |
| @@ -1466,7 +1499,8 @@ no_hmac: | |||
| 1466 | __be32 n = htonl(usecs); | 1499 | __be32 n = htonl(usecs); |
| 1467 | 1500 | ||
| 1468 | sctp_init_cause(*errp, SCTP_ERROR_STALE_COOKIE, | 1501 | sctp_init_cause(*errp, SCTP_ERROR_STALE_COOKIE, |
| 1469 | &n, sizeof(n)); | 1502 | sizeof(n)); |
| 1503 | sctp_addto_chunk(*errp, sizeof(n), &n); | ||
| 1470 | *error = -SCTP_IERROR_STALE_COOKIE; | 1504 | *error = -SCTP_IERROR_STALE_COOKIE; |
| 1471 | } else | 1505 | } else |
| 1472 | *error = -SCTP_IERROR_NOMEM; | 1506 | *error = -SCTP_IERROR_NOMEM; |
| @@ -1556,7 +1590,8 @@ static int sctp_process_missing_param(const struct sctp_association *asoc, | |||
| 1556 | report.num_missing = htonl(1); | 1590 | report.num_missing = htonl(1); |
| 1557 | report.type = paramtype; | 1591 | report.type = paramtype; |
| 1558 | sctp_init_cause(*errp, SCTP_ERROR_MISS_PARAM, | 1592 | sctp_init_cause(*errp, SCTP_ERROR_MISS_PARAM, |
| 1559 | &report, sizeof(report)); | 1593 | sizeof(report)); |
| 1594 | sctp_addto_chunk(*errp, sizeof(report), &report); | ||
| 1560 | } | 1595 | } |
| 1561 | 1596 | ||
| 1562 | /* Stop processing this chunk. */ | 1597 | /* Stop processing this chunk. */ |
| @@ -1574,7 +1609,7 @@ static int sctp_process_inv_mandatory(const struct sctp_association *asoc, | |||
| 1574 | *errp = sctp_make_op_error_space(asoc, chunk, 0); | 1609 | *errp = sctp_make_op_error_space(asoc, chunk, 0); |
| 1575 | 1610 | ||
| 1576 | if (*errp) | 1611 | if (*errp) |
| 1577 | sctp_init_cause(*errp, SCTP_ERROR_INV_PARAM, NULL, 0); | 1612 | sctp_init_cause(*errp, SCTP_ERROR_INV_PARAM, 0); |
| 1578 | 1613 | ||
| 1579 | /* Stop processing this chunk. */ | 1614 | /* Stop processing this chunk. */ |
| 1580 | return 0; | 1615 | return 0; |
| @@ -1595,9 +1630,10 @@ static int sctp_process_inv_paramlength(const struct sctp_association *asoc, | |||
| 1595 | *errp = sctp_make_op_error_space(asoc, chunk, payload_len); | 1630 | *errp = sctp_make_op_error_space(asoc, chunk, payload_len); |
| 1596 | 1631 | ||
| 1597 | if (*errp) { | 1632 | if (*errp) { |
| 1598 | sctp_init_cause(*errp, SCTP_ERROR_PROTO_VIOLATION, error, | 1633 | sctp_init_cause(*errp, SCTP_ERROR_PROTO_VIOLATION, |
| 1599 | sizeof(error)); | 1634 | sizeof(error) + sizeof(sctp_paramhdr_t)); |
| 1600 | sctp_addto_chunk(*errp, sizeof(sctp_paramhdr_t), param); | 1635 | sctp_addto_chunk(*errp, sizeof(error), error); |
| 1636 | sctp_addto_param(*errp, sizeof(sctp_paramhdr_t), param); | ||
| 1601 | } | 1637 | } |
| 1602 | 1638 | ||
| 1603 | return 0; | 1639 | return 0; |
| @@ -1618,9 +1654,10 @@ static int sctp_process_hn_param(const struct sctp_association *asoc, | |||
| 1618 | if (!*errp) | 1654 | if (!*errp) |
| 1619 | *errp = sctp_make_op_error_space(asoc, chunk, len); | 1655 | *errp = sctp_make_op_error_space(asoc, chunk, len); |
| 1620 | 1656 | ||
| 1621 | if (*errp) | 1657 | if (*errp) { |
| 1622 | sctp_init_cause(*errp, SCTP_ERROR_DNS_FAILED, | 1658 | sctp_init_cause(*errp, SCTP_ERROR_DNS_FAILED, len); |
| 1623 | param.v, len); | 1659 | sctp_addto_chunk(*errp, len, param.v); |
| 1660 | } | ||
| 1624 | 1661 | ||
| 1625 | /* Stop processing this chunk. */ | 1662 | /* Stop processing this chunk. */ |
| 1626 | return 0; | 1663 | return 0; |
| @@ -1672,10 +1709,13 @@ static int sctp_process_unk_param(const struct sctp_association *asoc, | |||
| 1672 | *errp = sctp_make_op_error_space(asoc, chunk, | 1709 | *errp = sctp_make_op_error_space(asoc, chunk, |
| 1673 | ntohs(chunk->chunk_hdr->length)); | 1710 | ntohs(chunk->chunk_hdr->length)); |
| 1674 | 1711 | ||
| 1675 | if (*errp) | 1712 | if (*errp) { |
| 1676 | sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, | 1713 | sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, |
| 1677 | param.v, | ||
| 1678 | WORD_ROUND(ntohs(param.p->length))); | 1714 | WORD_ROUND(ntohs(param.p->length))); |
| 1715 | sctp_addto_chunk(*errp, | ||
| 1716 | WORD_ROUND(ntohs(param.p->length)), | ||
| 1717 | param.v); | ||
| 1718 | } | ||
| 1679 | 1719 | ||
| 1680 | break; | 1720 | break; |
| 1681 | case SCTP_PARAM_ACTION_SKIP: | 1721 | case SCTP_PARAM_ACTION_SKIP: |
| @@ -1690,8 +1730,10 @@ static int sctp_process_unk_param(const struct sctp_association *asoc, | |||
| 1690 | 1730 | ||
| 1691 | if (*errp) { | 1731 | if (*errp) { |
| 1692 | sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, | 1732 | sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, |
| 1693 | param.v, | ||
| 1694 | WORD_ROUND(ntohs(param.p->length))); | 1733 | WORD_ROUND(ntohs(param.p->length))); |
| 1734 | sctp_addto_chunk(*errp, | ||
| 1735 | WORD_ROUND(ntohs(param.p->length)), | ||
| 1736 | param.v); | ||
| 1695 | } else { | 1737 | } else { |
| 1696 | /* If there is no memory for generating the ERROR | 1738 | /* If there is no memory for generating the ERROR |
| 1697 | * report as specified, an ABORT will be triggered | 1739 | * report as specified, an ABORT will be triggered |
| @@ -1791,7 +1833,7 @@ int sctp_verify_init(const struct sctp_association *asoc, | |||
| 1791 | * VIOLATION error. We build the ERROR chunk here and let the normal | 1833 | * VIOLATION error. We build the ERROR chunk here and let the normal |
| 1792 | * error handling code build and send the packet. | 1834 | * error handling code build and send the packet. |
| 1793 | */ | 1835 | */ |
| 1794 | if (param.v < (void*)chunk->chunk_end - sizeof(sctp_paramhdr_t)) { | 1836 | if (param.v != (void*)chunk->chunk_end) { |
| 1795 | sctp_process_inv_paramlength(asoc, param.p, chunk, errp); | 1837 | sctp_process_inv_paramlength(asoc, param.p, chunk, errp); |
| 1796 | return 0; | 1838 | return 0; |
| 1797 | } | 1839 | } |
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index d9fad4f6ffc3..8d7890083493 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
| @@ -1013,8 +1013,9 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype, | |||
| 1013 | break; | 1013 | break; |
| 1014 | 1014 | ||
| 1015 | case SCTP_DISPOSITION_VIOLATION: | 1015 | case SCTP_DISPOSITION_VIOLATION: |
| 1016 | printk(KERN_ERR "sctp protocol violation state %d " | 1016 | if (net_ratelimit()) |
| 1017 | "chunkid %d\n", state, subtype.chunk); | 1017 | printk(KERN_ERR "sctp protocol violation state %d " |
| 1018 | "chunkid %d\n", state, subtype.chunk); | ||
| 1018 | break; | 1019 | break; |
| 1019 | 1020 | ||
| 1020 | case SCTP_DISPOSITION_NOT_IMPL: | 1021 | case SCTP_DISPOSITION_NOT_IMPL: |
| @@ -1130,6 +1131,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
| 1130 | /* Move the Cumulattive TSN Ack ahead. */ | 1131 | /* Move the Cumulattive TSN Ack ahead. */ |
| 1131 | sctp_tsnmap_skip(&asoc->peer.tsn_map, cmd->obj.u32); | 1132 | sctp_tsnmap_skip(&asoc->peer.tsn_map, cmd->obj.u32); |
| 1132 | 1133 | ||
| 1134 | /* purge the fragmentation queue */ | ||
| 1135 | sctp_ulpq_reasm_flushtsn(&asoc->ulpq, cmd->obj.u32); | ||
| 1136 | |||
| 1133 | /* Abort any in progress partial delivery. */ | 1137 | /* Abort any in progress partial delivery. */ |
| 1134 | sctp_ulpq_abort_pd(&asoc->ulpq, GFP_ATOMIC); | 1138 | sctp_ulpq_abort_pd(&asoc->ulpq, GFP_ATOMIC); |
| 1135 | break; | 1139 | break; |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 71cad56dd73f..177528ed3e1b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -264,7 +264,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep, | |||
| 264 | struct sctp_chunk *err_chunk; | 264 | struct sctp_chunk *err_chunk; |
| 265 | struct sctp_packet *packet; | 265 | struct sctp_packet *packet; |
| 266 | sctp_unrecognized_param_t *unk_param; | 266 | sctp_unrecognized_param_t *unk_param; |
| 267 | struct sock *sk; | ||
| 268 | int len; | 267 | int len; |
| 269 | 268 | ||
| 270 | /* 6.10 Bundling | 269 | /* 6.10 Bundling |
| @@ -285,16 +284,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep, | |||
| 285 | if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) | 284 | if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) |
| 286 | return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); | 285 | return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); |
| 287 | 286 | ||
| 288 | sk = ep->base.sk; | ||
| 289 | /* If the endpoint is not listening or if the number of associations | ||
| 290 | * on the TCP-style socket exceed the max backlog, respond with an | ||
| 291 | * ABORT. | ||
| 292 | */ | ||
| 293 | if (!sctp_sstate(sk, LISTENING) || | ||
| 294 | (sctp_style(sk, TCP) && | ||
| 295 | sk_acceptq_is_full(sk))) | ||
| 296 | return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); | ||
| 297 | |||
| 298 | /* 3.1 A packet containing an INIT chunk MUST have a zero Verification | 287 | /* 3.1 A packet containing an INIT chunk MUST have a zero Verification |
| 299 | * Tag. | 288 | * Tag. |
| 300 | */ | 289 | */ |
| @@ -590,6 +579,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep, | |||
| 590 | struct sctp_ulpevent *ev, *ai_ev = NULL; | 579 | struct sctp_ulpevent *ev, *ai_ev = NULL; |
| 591 | int error = 0; | 580 | int error = 0; |
| 592 | struct sctp_chunk *err_chk_p; | 581 | struct sctp_chunk *err_chk_p; |
| 582 | struct sock *sk; | ||
| 593 | 583 | ||
| 594 | /* If the packet is an OOTB packet which is temporarily on the | 584 | /* If the packet is an OOTB packet which is temporarily on the |
| 595 | * control endpoint, respond with an ABORT. | 585 | * control endpoint, respond with an ABORT. |
| @@ -605,6 +595,15 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep, | |||
| 605 | if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t))) | 595 | if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t))) |
| 606 | return sctp_sf_pdiscard(ep, asoc, type, arg, commands); | 596 | return sctp_sf_pdiscard(ep, asoc, type, arg, commands); |
| 607 | 597 | ||
| 598 | /* If the endpoint is not listening or if the number of associations | ||
| 599 | * on the TCP-style socket exceed the max backlog, respond with an | ||
| 600 | * ABORT. | ||
| 601 | */ | ||
| 602 | sk = ep->base.sk; | ||
| 603 | if (!sctp_sstate(sk, LISTENING) || | ||
| 604 | (sctp_style(sk, TCP) && sk_acceptq_is_full(sk))) | ||
| 605 | return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); | ||
| 606 | |||
| 608 | /* "Decode" the chunk. We have no optional parameters so we | 607 | /* "Decode" the chunk. We have no optional parameters so we |
| 609 | * are in good shape. | 608 | * are in good shape. |
| 610 | */ | 609 | */ |
| @@ -1032,19 +1031,21 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep, | |||
| 1032 | /* This should never happen, but lets log it if so. */ | 1031 | /* This should never happen, but lets log it if so. */ |
| 1033 | if (unlikely(!link)) { | 1032 | if (unlikely(!link)) { |
| 1034 | if (from_addr.sa.sa_family == AF_INET6) { | 1033 | if (from_addr.sa.sa_family == AF_INET6) { |
| 1035 | printk(KERN_WARNING | 1034 | if (net_ratelimit()) |
| 1036 | "%s association %p could not find address " | 1035 | printk(KERN_WARNING |
| 1037 | NIP6_FMT "\n", | 1036 | "%s association %p could not find address " |
| 1038 | __FUNCTION__, | 1037 | NIP6_FMT "\n", |
| 1039 | asoc, | 1038 | __FUNCTION__, |
| 1040 | NIP6(from_addr.v6.sin6_addr)); | 1039 | asoc, |
| 1040 | NIP6(from_addr.v6.sin6_addr)); | ||
| 1041 | } else { | 1041 | } else { |
| 1042 | printk(KERN_WARNING | 1042 | if (net_ratelimit()) |
| 1043 | "%s association %p could not find address " | 1043 | printk(KERN_WARNING |
| 1044 | NIPQUAD_FMT "\n", | 1044 | "%s association %p could not find address " |
| 1045 | __FUNCTION__, | 1045 | NIPQUAD_FMT "\n", |
| 1046 | asoc, | 1046 | __FUNCTION__, |
| 1047 | NIPQUAD(from_addr.v4.sin_addr.s_addr)); | 1047 | asoc, |
| 1048 | NIPQUAD(from_addr.v4.sin_addr.s_addr)); | ||
| 1048 | } | 1049 | } |
| 1049 | return SCTP_DISPOSITION_DISCARD; | 1050 | return SCTP_DISPOSITION_DISCARD; |
| 1050 | } | 1051 | } |
| @@ -3362,7 +3363,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep, | |||
| 3362 | abort = sctp_make_abort(asoc, asconf_ack, | 3363 | abort = sctp_make_abort(asoc, asconf_ack, |
| 3363 | sizeof(sctp_errhdr_t)); | 3364 | sizeof(sctp_errhdr_t)); |
| 3364 | if (abort) { | 3365 | if (abort) { |
| 3365 | sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, NULL, 0); | 3366 | sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, 0); |
| 3366 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, | 3367 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, |
| 3367 | SCTP_CHUNK(abort)); | 3368 | SCTP_CHUNK(abort)); |
| 3368 | } | 3369 | } |
| @@ -3392,7 +3393,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep, | |||
| 3392 | abort = sctp_make_abort(asoc, asconf_ack, | 3393 | abort = sctp_make_abort(asoc, asconf_ack, |
| 3393 | sizeof(sctp_errhdr_t)); | 3394 | sizeof(sctp_errhdr_t)); |
| 3394 | if (abort) { | 3395 | if (abort) { |
| 3395 | sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, NULL, 0); | 3396 | sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, 0); |
| 3396 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, | 3397 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, |
| 3397 | SCTP_CHUNK(abort)); | 3398 | SCTP_CHUNK(abort)); |
| 3398 | } | 3399 | } |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 01c6364245b7..33354602ae86 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -353,6 +353,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) | |||
| 353 | * The function sctp_get_port_local() does duplicate address | 353 | * The function sctp_get_port_local() does duplicate address |
| 354 | * detection. | 354 | * detection. |
| 355 | */ | 355 | */ |
| 356 | addr->v4.sin_port = htons(snum); | ||
| 356 | if ((ret = sctp_get_port_local(sk, addr))) { | 357 | if ((ret = sctp_get_port_local(sk, addr))) { |
| 357 | if (ret == (long) sk) { | 358 | if (ret == (long) sk) { |
| 358 | /* This endpoint has a conflicting address. */ | 359 | /* This endpoint has a conflicting address. */ |
| @@ -5202,6 +5203,7 @@ SCTP_STATIC int sctp_seqpacket_listen(struct sock *sk, int backlog) | |||
| 5202 | 5203 | ||
| 5203 | sctp_unhash_endpoint(ep); | 5204 | sctp_unhash_endpoint(ep); |
| 5204 | sk->sk_state = SCTP_SS_CLOSED; | 5205 | sk->sk_state = SCTP_SS_CLOSED; |
| 5206 | return 0; | ||
| 5205 | } | 5207 | } |
| 5206 | 5208 | ||
| 5207 | /* Return if we are already listening. */ | 5209 | /* Return if we are already listening. */ |
| @@ -5249,6 +5251,7 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog) | |||
| 5249 | 5251 | ||
| 5250 | sctp_unhash_endpoint(ep); | 5252 | sctp_unhash_endpoint(ep); |
| 5251 | sk->sk_state = SCTP_SS_CLOSED; | 5253 | sk->sk_state = SCTP_SS_CLOSED; |
| 5254 | return 0; | ||
| 5252 | } | 5255 | } |
| 5253 | 5256 | ||
| 5254 | if (sctp_sstate(sk, LISTENING)) | 5257 | if (sctp_sstate(sk, LISTENING)) |
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index 34eb977a204d..fa0ba2a5564e 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c | |||
| @@ -659,6 +659,46 @@ done: | |||
| 659 | return retval; | 659 | return retval; |
| 660 | } | 660 | } |
| 661 | 661 | ||
| 662 | /* | ||
| 663 | * Flush out stale fragments from the reassembly queue when processing | ||
| 664 | * a Forward TSN. | ||
| 665 | * | ||
| 666 | * RFC 3758, Section 3.6 | ||
| 667 | * | ||
| 668 | * After receiving and processing a FORWARD TSN, the data receiver MUST | ||
| 669 | * take cautions in updating its re-assembly queue. The receiver MUST | ||
| 670 | * remove any partially reassembled message, which is still missing one | ||
| 671 | * or more TSNs earlier than or equal to the new cumulative TSN point. | ||
| 672 | * In the event that the receiver has invoked the partial delivery API, | ||
| 673 | * a notification SHOULD also be generated to inform the upper layer API | ||
| 674 | * that the message being partially delivered will NOT be completed. | ||
| 675 | */ | ||
| 676 | void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *ulpq, __u32 fwd_tsn) | ||
| 677 | { | ||
| 678 | struct sk_buff *pos, *tmp; | ||
| 679 | struct sctp_ulpevent *event; | ||
| 680 | __u32 tsn; | ||
| 681 | |||
| 682 | if (skb_queue_empty(&ulpq->reasm)) | ||
| 683 | return; | ||
| 684 | |||
| 685 | skb_queue_walk_safe(&ulpq->reasm, pos, tmp) { | ||
| 686 | event = sctp_skb2event(pos); | ||
| 687 | tsn = event->tsn; | ||
| 688 | |||
| 689 | /* Since the entire message must be abandoned by the | ||
| 690 | * sender (item A3 in Section 3.5, RFC 3758), we can | ||
| 691 | * free all fragments on the list that are less then | ||
| 692 | * or equal to ctsn_point | ||
| 693 | */ | ||
| 694 | if (TSN_lte(tsn, fwd_tsn)) { | ||
| 695 | __skb_unlink(pos, &ulpq->reasm); | ||
| 696 | sctp_ulpevent_free(event); | ||
| 697 | } else | ||
| 698 | break; | ||
| 699 | } | ||
| 700 | } | ||
| 701 | |||
| 662 | /* Helper function to gather skbs that have possibly become | 702 | /* Helper function to gather skbs that have possibly become |
| 663 | * ordered by an an incoming chunk. | 703 | * ordered by an an incoming chunk. |
| 664 | */ | 704 | */ |
| @@ -794,7 +834,7 @@ static struct sctp_ulpevent *sctp_ulpq_order(struct sctp_ulpq *ulpq, | |||
| 794 | /* Helper function to gather skbs that have possibly become | 834 | /* Helper function to gather skbs that have possibly become |
| 795 | * ordered by forward tsn skipping their dependencies. | 835 | * ordered by forward tsn skipping their dependencies. |
| 796 | */ | 836 | */ |
| 797 | static inline void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq) | 837 | static inline void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq, __u16 sid) |
| 798 | { | 838 | { |
| 799 | struct sk_buff *pos, *tmp; | 839 | struct sk_buff *pos, *tmp; |
| 800 | struct sctp_ulpevent *cevent; | 840 | struct sctp_ulpevent *cevent; |
| @@ -813,31 +853,40 @@ static inline void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq) | |||
| 813 | csid = cevent->stream; | 853 | csid = cevent->stream; |
| 814 | cssn = cevent->ssn; | 854 | cssn = cevent->ssn; |
| 815 | 855 | ||
| 816 | if (cssn != sctp_ssn_peek(in, csid)) | 856 | /* Have we gone too far? */ |
| 857 | if (csid > sid) | ||
| 817 | break; | 858 | break; |
| 818 | 859 | ||
| 819 | /* Found it, so mark in the ssnmap. */ | 860 | /* Have we not gone far enough? */ |
| 820 | sctp_ssn_next(in, csid); | 861 | if (csid < sid) |
| 862 | continue; | ||
| 863 | |||
| 864 | /* see if this ssn has been marked by skipping */ | ||
| 865 | if (!SSN_lt(cssn, sctp_ssn_peek(in, csid))) | ||
| 866 | break; | ||
| 821 | 867 | ||
| 822 | __skb_unlink(pos, &ulpq->lobby); | 868 | __skb_unlink(pos, &ulpq->lobby); |
| 823 | if (!event) { | 869 | if (!event) |
| 824 | /* Create a temporary list to collect chunks on. */ | 870 | /* Create a temporary list to collect chunks on. */ |
| 825 | event = sctp_skb2event(pos); | 871 | event = sctp_skb2event(pos); |
| 826 | __skb_queue_tail(&temp, sctp_event2skb(event)); | 872 | |
| 827 | } else { | 873 | /* Attach all gathered skbs to the event. */ |
| 828 | /* Attach all gathered skbs to the event. */ | 874 | __skb_queue_tail(&temp, pos); |
| 829 | __skb_queue_tail(&temp, pos); | ||
| 830 | } | ||
| 831 | } | 875 | } |
| 832 | 876 | ||
| 833 | /* Send event to the ULP. 'event' is the sctp_ulpevent for | 877 | /* Send event to the ULP. 'event' is the sctp_ulpevent for |
| 834 | * very first SKB on the 'temp' list. | 878 | * very first SKB on the 'temp' list. |
| 835 | */ | 879 | */ |
| 836 | if (event) | 880 | if (event) { |
| 881 | /* see if we have more ordered that we can deliver */ | ||
| 882 | sctp_ulpq_retrieve_ordered(ulpq, event); | ||
| 837 | sctp_ulpq_tail_event(ulpq, event); | 883 | sctp_ulpq_tail_event(ulpq, event); |
| 884 | } | ||
| 838 | } | 885 | } |
| 839 | 886 | ||
| 840 | /* Skip over an SSN. */ | 887 | /* Skip over an SSN. This is used during the processing of |
| 888 | * Forwared TSN chunk to skip over the abandoned ordered data | ||
| 889 | */ | ||
| 841 | void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn) | 890 | void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn) |
| 842 | { | 891 | { |
| 843 | struct sctp_stream *in; | 892 | struct sctp_stream *in; |
| @@ -855,7 +904,7 @@ void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn) | |||
| 855 | /* Go find any other chunks that were waiting for | 904 | /* Go find any other chunks that were waiting for |
| 856 | * ordering and deliver them if needed. | 905 | * ordering and deliver them if needed. |
| 857 | */ | 906 | */ |
| 858 | sctp_ulpq_reap_ordered(ulpq); | 907 | sctp_ulpq_reap_ordered(ulpq, sid); |
| 859 | return; | 908 | return; |
| 860 | } | 909 | } |
| 861 | 910 | ||
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 8be6a4269e63..a38787a881ea 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
| @@ -72,7 +72,7 @@ static void check_stdin(void) | |||
| 72 | } | 72 | } |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | static void conf_askvalue(struct symbol *sym, const char *def) | 75 | static int conf_askvalue(struct symbol *sym, const char *def) |
| 76 | { | 76 | { |
| 77 | enum symbol_type type = sym_get_type(sym); | 77 | enum symbol_type type = sym_get_type(sym); |
| 78 | tristate val; | 78 | tristate val; |
| @@ -87,7 +87,7 @@ static void conf_askvalue(struct symbol *sym, const char *def) | |||
| 87 | printf("%s\n", def); | 87 | printf("%s\n", def); |
| 88 | line[0] = '\n'; | 88 | line[0] = '\n'; |
| 89 | line[1] = 0; | 89 | line[1] = 0; |
| 90 | return; | 90 | return 0; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | switch (input_mode) { | 93 | switch (input_mode) { |
| @@ -97,23 +97,23 @@ static void conf_askvalue(struct symbol *sym, const char *def) | |||
| 97 | case set_random: | 97 | case set_random: |
| 98 | if (sym_has_value(sym)) { | 98 | if (sym_has_value(sym)) { |
| 99 | printf("%s\n", def); | 99 | printf("%s\n", def); |
| 100 | return; | 100 | return 0; |
| 101 | } | 101 | } |
| 102 | break; | 102 | break; |
| 103 | case ask_new: | 103 | case ask_new: |
| 104 | case ask_silent: | 104 | case ask_silent: |
| 105 | if (sym_has_value(sym)) { | 105 | if (sym_has_value(sym)) { |
| 106 | printf("%s\n", def); | 106 | printf("%s\n", def); |
| 107 | return; | 107 | return 0; |
| 108 | } | 108 | } |
| 109 | check_stdin(); | 109 | check_stdin(); |
| 110 | case ask_all: | 110 | case ask_all: |
| 111 | fflush(stdout); | 111 | fflush(stdout); |
| 112 | fgets(line, 128, stdin); | 112 | fgets(line, 128, stdin); |
| 113 | return; | 113 | return 1; |
| 114 | case set_default: | 114 | case set_default: |
| 115 | printf("%s\n", def); | 115 | printf("%s\n", def); |
| 116 | return; | 116 | return 1; |
| 117 | default: | 117 | default: |
| 118 | break; | 118 | break; |
| 119 | } | 119 | } |
| @@ -123,7 +123,7 @@ static void conf_askvalue(struct symbol *sym, const char *def) | |||
| 123 | case S_HEX: | 123 | case S_HEX: |
| 124 | case S_STRING: | 124 | case S_STRING: |
| 125 | printf("%s\n", def); | 125 | printf("%s\n", def); |
| 126 | return; | 126 | return 1; |
| 127 | default: | 127 | default: |
| 128 | ; | 128 | ; |
| 129 | } | 129 | } |
| @@ -174,6 +174,7 @@ static void conf_askvalue(struct symbol *sym, const char *def) | |||
| 174 | break; | 174 | break; |
| 175 | } | 175 | } |
| 176 | printf("%s", line); | 176 | printf("%s", line); |
| 177 | return 1; | ||
| 177 | } | 178 | } |
| 178 | 179 | ||
| 179 | int conf_string(struct menu *menu) | 180 | int conf_string(struct menu *menu) |
| @@ -187,7 +188,8 @@ int conf_string(struct menu *menu) | |||
| 187 | def = sym_get_string_value(sym); | 188 | def = sym_get_string_value(sym); |
| 188 | if (sym_get_string_value(sym)) | 189 | if (sym_get_string_value(sym)) |
| 189 | printf("[%s] ", def); | 190 | printf("[%s] ", def); |
| 190 | conf_askvalue(sym, def); | 191 | if (!conf_askvalue(sym, def)) |
| 192 | return 0; | ||
| 191 | switch (line[0]) { | 193 | switch (line[0]) { |
| 192 | case '\n': | 194 | case '\n': |
| 193 | break; | 195 | break; |
| @@ -240,7 +242,8 @@ static int conf_sym(struct menu *menu) | |||
| 240 | if (menu_has_help(menu)) | 242 | if (menu_has_help(menu)) |
| 241 | printf("/?"); | 243 | printf("/?"); |
| 242 | printf("] "); | 244 | printf("] "); |
| 243 | conf_askvalue(sym, sym_get_string_value(sym)); | 245 | if (!conf_askvalue(sym, sym_get_string_value(sym))) |
| 246 | return 0; | ||
| 244 | strip(line); | 247 | strip(line); |
| 245 | 248 | ||
| 246 | switch (line[0]) { | 249 | switch (line[0]) { |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d8bc4172819c..36946629b6ca 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -1907,6 +1907,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm) | |||
| 1907 | spin_unlock_irq(¤t->sighand->siglock); | 1907 | spin_unlock_irq(¤t->sighand->siglock); |
| 1908 | } | 1908 | } |
| 1909 | 1909 | ||
| 1910 | /* Always clear parent death signal on SID transitions. */ | ||
| 1911 | current->pdeath_signal = 0; | ||
| 1912 | |||
| 1910 | /* Check whether the new SID can inherit resource limits | 1913 | /* Check whether the new SID can inherit resource limits |
| 1911 | from the old SID. If not, reset all soft limits to | 1914 | from the old SID. If not, reset all soft limits to |
| 1912 | the lower of the current task's hard limit and the init | 1915 | the lower of the current task's hard limit and the init |