aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/common/locomo.c66
-rw-r--r--arch/arm/kernel/armksyms.c2
-rw-r--r--arch/arm/kernel/arthur.c2
-rw-r--r--arch/arm/mach-omap1/board-palmte.c2
-rw-r--r--arch/arm/mach-omap1/board-palmz71.c2
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c1
-rw-r--r--arch/arm/mach-omap2/board-apollon.c1
-rw-r--r--arch/arm/mach-omap2/board-generic.c1
-rw-r--r--arch/arm/mach-omap2/board-h4.c1
-rw-r--r--arch/arm/mach-omap2/clock.c4
-rw-r--r--arch/arm/mach-omap2/clock34xx.h21
-rw-r--r--arch/arm/mach-omap2/cm-regbits-34xx.h1
-rw-r--r--arch/arm/mach-omap2/mailbox.c25
-rw-r--r--arch/arm/mach-omap2/prm.h2
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c2
-rw-r--r--arch/arm/mach-orion5x/kurobox_pro-setup.c2
-rw-r--r--arch/arm/mach-pxa/colibri.c3
-rw-r--r--arch/arm/mach-pxa/spitz.c1
-rw-r--r--arch/arm/mm/proc-arm925.S2
-rw-r--r--arch/arm/mm/proc-arm926.S2
-rw-r--r--arch/arm/mm/proc-arm940.S2
-rw-r--r--arch/arm/mm/proc-arm946.S2
-rw-r--r--arch/arm/plat-omap/clock.c10
-rw-r--r--arch/arm/plat-omap/dma.c2
-rw-r--r--arch/arm/plat-omap/mailbox.c1
-rw-r--r--arch/m68k/Kconfig9
-rw-r--r--arch/m68k/configs/amiga_defconfig159
-rw-r--r--arch/m68k/configs/apollo_defconfig140
-rw-r--r--arch/m68k/configs/atari_defconfig143
-rw-r--r--arch/m68k/configs/bvme6000_defconfig138
-rw-r--r--arch/m68k/configs/hp300_defconfig142
-rw-r--r--arch/m68k/configs/mac_defconfig144
-rw-r--r--arch/m68k/configs/multi_defconfig1269
-rw-r--r--arch/m68k/configs/mvme147_defconfig138
-rw-r--r--arch/m68k/configs/mvme16x_defconfig138
-rw-r--r--arch/m68k/configs/q40_defconfig159
-rw-r--r--arch/m68k/configs/sun3_defconfig140
-rw-r--r--arch/m68k/configs/sun3x_defconfig140
-rw-r--r--arch/m68k/kernel/head.S2
-rw-r--r--arch/m68k/kernel/setup.c15
-rw-r--r--arch/sparc64/defconfig40
-rw-r--r--arch/sparc64/mm/init.c2
-rw-r--r--arch/x86/kernel/process.c36
-rw-r--r--arch/x86/mm/pat.c2
-rw-r--r--drivers/block/amiflop.c6
-rw-r--r--drivers/block/z2ram.c2
-rw-r--r--drivers/char/snsc_event.c2
-rw-r--r--drivers/char/vme_scc.c4
-rw-r--r--drivers/ide/legacy/macide.c3
-rw-r--r--drivers/input/keyboard/hilkbd.c4
-rw-r--r--drivers/input/misc/hp_sdc_rtc.c5
-rw-r--r--drivers/input/serio/hp_sdc_mlc.c5
-rw-r--r--drivers/input/serio/q40kbd.c2
-rw-r--r--drivers/media/video/et61x251/et61x251_core.c2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c2
-rw-r--r--drivers/media/video/zc0301/zc0301_core.c2
-rw-r--r--drivers/media/video/zoran_device.c2
-rw-r--r--drivers/media/video/zoran_driver.c2
-rw-r--r--drivers/net/82596.c7
-rw-r--r--drivers/net/apne.c3
-rw-r--r--drivers/net/mac89x0.c3
-rw-r--r--drivers/net/macmace.c3
-rw-r--r--drivers/net/sun3lance.c3
-rw-r--r--drivers/net/wireless/atmel.c2
-rw-r--r--drivers/video/Kconfig4
-rw-r--r--drivers/video/amifb.c4
-rw-r--r--drivers/video/dnfb.c3
-rw-r--r--drivers/video/hpfb.c2
-rw-r--r--drivers/video/pxafb.c5
-rw-r--r--fs/befs/endian.h2
-rw-r--r--include/asm-arm/arch-omap/common.h4
-rw-r--r--include/asm-arm/arch-omap/control.h2
-rw-r--r--include/asm-arm/arch-omap/mmc.h24
-rw-r--r--include/asm-arm/arch-sa1100/irqs.h2
-rw-r--r--include/asm-arm/hardware/locomo.h19
-rw-r--r--include/asm-m68k/bug.h4
-rw-r--r--include/asm-m68k/io.h44
-rw-r--r--include/asm-m68k/setup.h2
-rw-r--r--include/asm-m68k/uaccess.h6
79 files changed, 2562 insertions, 745 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index ae21755872ed..d973c986f721 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -321,11 +321,42 @@ static void locomo_gpio_unmask_irq(unsigned int irq)
321 locomo_writel(r, mapbase + LOCOMO_GIE); 321 locomo_writel(r, mapbase + LOCOMO_GIE);
322} 322}
323 323
324static int GPIO_IRQ_rising_edge;
325static int GPIO_IRQ_falling_edge;
326
327static int locomo_gpio_type(unsigned int irq, unsigned int type)
328{
329 unsigned int mask;
330 void __iomem *mapbase = get_irq_chip_data(irq);
331
332 mask = 1 << (irq - LOCOMO_IRQ_GPIO_START);
333
334 if (type == IRQT_PROBE) {
335 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
336 return 0;
337 type = __IRQT_RISEDGE | __IRQT_FALEDGE;
338 }
339
340 if (type & __IRQT_RISEDGE)
341 GPIO_IRQ_rising_edge |= mask;
342 else
343 GPIO_IRQ_rising_edge &= ~mask;
344 if (type & __IRQT_FALEDGE)
345 GPIO_IRQ_falling_edge |= mask;
346 else
347 GPIO_IRQ_falling_edge &= ~mask;
348 locomo_writel(GPIO_IRQ_rising_edge, mapbase + LOCOMO_GRIE);
349 locomo_writel(GPIO_IRQ_falling_edge, mapbase + LOCOMO_GFIE);
350
351 return 0;
352}
353
324static struct irq_chip locomo_gpio_chip = { 354static struct irq_chip locomo_gpio_chip = {
325 .name = "LOCOMO-gpio", 355 .name = "LOCOMO-gpio",
326 .ack = locomo_gpio_ack_irq, 356 .ack = locomo_gpio_ack_irq,
327 .mask = locomo_gpio_mask_irq, 357 .mask = locomo_gpio_mask_irq,
328 .unmask = locomo_gpio_unmask_irq, 358 .unmask = locomo_gpio_unmask_irq,
359 .set_type = locomo_gpio_type,
329}; 360};
330 361
331static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc) 362static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)
@@ -450,22 +481,18 @@ static void locomo_setup_irq(struct locomo *lchip)
450 set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip); 481 set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip);
451 set_irq_chip_data(IRQ_LOCOMO_KEY_BASE, irqbase); 482 set_irq_chip_data(IRQ_LOCOMO_KEY_BASE, irqbase);
452 set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler); 483 set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler);
453 set_irq_flags(IRQ_LOCOMO_KEY_BASE, IRQF_VALID | IRQF_PROBE);
454 484
455 set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip); 485 set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip);
456 set_irq_chip_data(IRQ_LOCOMO_GPIO_BASE, irqbase); 486 set_irq_chip_data(IRQ_LOCOMO_GPIO_BASE, irqbase);
457 set_irq_chained_handler(IRQ_LOCOMO_GPIO_BASE, locomo_gpio_handler); 487 set_irq_chained_handler(IRQ_LOCOMO_GPIO_BASE, locomo_gpio_handler);
458 set_irq_flags(IRQ_LOCOMO_GPIO_BASE, IRQF_VALID | IRQF_PROBE);
459 488
460 set_irq_chip(IRQ_LOCOMO_LT_BASE, &locomo_chip); 489 set_irq_chip(IRQ_LOCOMO_LT_BASE, &locomo_chip);
461 set_irq_chip_data(IRQ_LOCOMO_LT_BASE, irqbase); 490 set_irq_chip_data(IRQ_LOCOMO_LT_BASE, irqbase);
462 set_irq_chained_handler(IRQ_LOCOMO_LT_BASE, locomo_lt_handler); 491 set_irq_chained_handler(IRQ_LOCOMO_LT_BASE, locomo_lt_handler);
463 set_irq_flags(IRQ_LOCOMO_LT_BASE, IRQF_VALID | IRQF_PROBE);
464 492
465 set_irq_chip(IRQ_LOCOMO_SPI_BASE, &locomo_chip); 493 set_irq_chip(IRQ_LOCOMO_SPI_BASE, &locomo_chip);
466 set_irq_chip_data(IRQ_LOCOMO_SPI_BASE, irqbase); 494 set_irq_chip_data(IRQ_LOCOMO_SPI_BASE, irqbase);
467 set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler); 495 set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler);
468 set_irq_flags(IRQ_LOCOMO_SPI_BASE, IRQF_VALID | IRQF_PROBE);
469 496
470 /* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */ 497 /* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */
471 set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip); 498 set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip);
@@ -488,7 +515,7 @@ static void locomo_setup_irq(struct locomo *lchip)
488 set_irq_flags(LOCOMO_IRQ_LT_START, IRQF_VALID | IRQF_PROBE); 515 set_irq_flags(LOCOMO_IRQ_LT_START, IRQF_VALID | IRQF_PROBE);
489 516
490 /* install handlers for IRQ_LOCOMO_SPI_BASE generated interrupts */ 517 /* install handlers for IRQ_LOCOMO_SPI_BASE generated interrupts */
491 for (irq = LOCOMO_IRQ_SPI_START; irq < LOCOMO_IRQ_SPI_START + 3; irq++) { 518 for (irq = LOCOMO_IRQ_SPI_START; irq < LOCOMO_IRQ_SPI_START + 4; irq++) {
492 set_irq_chip(irq, &locomo_spi_chip); 519 set_irq_chip(irq, &locomo_spi_chip);
493 set_irq_chip_data(irq, irqbase); 520 set_irq_chip_data(irq, irqbase);
494 set_irq_handler(irq, handle_edge_irq); 521 set_irq_handler(irq, handle_edge_irq);
@@ -574,20 +601,20 @@ static int locomo_suspend(struct platform_device *dev, pm_message_t state)
574 601
575 save->LCM_GPO = locomo_readl(lchip->base + LOCOMO_GPO); /* GPIO */ 602 save->LCM_GPO = locomo_readl(lchip->base + LOCOMO_GPO); /* GPIO */
576 locomo_writel(0x00, lchip->base + LOCOMO_GPO); 603 locomo_writel(0x00, lchip->base + LOCOMO_GPO);
577 save->LCM_SPICT = locomo_readl(lchip->base + LOCOMO_SPICT); /* SPI */ 604 save->LCM_SPICT = locomo_readl(lchip->base + LOCOMO_SPI + LOCOMO_SPICT); /* SPI */
578 locomo_writel(0x40, lchip->base + LOCOMO_SPICT); 605 locomo_writel(0x40, lchip->base + LOCOMO_SPICT);
579 save->LCM_GPE = locomo_readl(lchip->base + LOCOMO_GPE); /* GPIO */ 606 save->LCM_GPE = locomo_readl(lchip->base + LOCOMO_GPE); /* GPIO */
580 locomo_writel(0x00, lchip->base + LOCOMO_GPE); 607 locomo_writel(0x00, lchip->base + LOCOMO_GPE);
581 save->LCM_ASD = locomo_readl(lchip->base + LOCOMO_ASD); /* ADSTART */ 608 save->LCM_ASD = locomo_readl(lchip->base + LOCOMO_ASD); /* ADSTART */
582 locomo_writel(0x00, lchip->base + LOCOMO_ASD); 609 locomo_writel(0x00, lchip->base + LOCOMO_ASD);
583 save->LCM_SPIMD = locomo_readl(lchip->base + LOCOMO_SPIMD); /* SPI */ 610 save->LCM_SPIMD = locomo_readl(lchip->base + LOCOMO_SPI + LOCOMO_SPIMD); /* SPI */
584 locomo_writel(0x3C14, lchip->base + LOCOMO_SPIMD); 611 locomo_writel(0x3C14, lchip->base + LOCOMO_SPI + LOCOMO_SPIMD);
585 612
586 locomo_writel(0x00, lchip->base + LOCOMO_PAIF); 613 locomo_writel(0x00, lchip->base + LOCOMO_PAIF);
587 locomo_writel(0x00, lchip->base + LOCOMO_DAC); 614 locomo_writel(0x00, lchip->base + LOCOMO_DAC);
588 locomo_writel(0x00, lchip->base + LOCOMO_BACKLIGHT + LOCOMO_TC); 615 locomo_writel(0x00, lchip->base + LOCOMO_BACKLIGHT + LOCOMO_TC);
589 616
590 if ( (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT0) & 0x88) && (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT1) & 0x88) ) 617 if ((locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT0) & 0x88) && (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT1) & 0x88))
591 locomo_writel(0x00, lchip->base + LOCOMO_C32K); /* CLK32 off */ 618 locomo_writel(0x00, lchip->base + LOCOMO_C32K); /* CLK32 off */
592 else 619 else
593 /* 18MHz already enabled, so no wait */ 620 /* 18MHz already enabled, so no wait */
@@ -616,10 +643,10 @@ static int locomo_resume(struct platform_device *dev)
616 spin_lock_irqsave(&lchip->lock, flags); 643 spin_lock_irqsave(&lchip->lock, flags);
617 644
618 locomo_writel(save->LCM_GPO, lchip->base + LOCOMO_GPO); 645 locomo_writel(save->LCM_GPO, lchip->base + LOCOMO_GPO);
619 locomo_writel(save->LCM_SPICT, lchip->base + LOCOMO_SPICT); 646 locomo_writel(save->LCM_SPICT, lchip->base + LOCOMO_SPI + LOCOMO_SPICT);
620 locomo_writel(save->LCM_GPE, lchip->base + LOCOMO_GPE); 647 locomo_writel(save->LCM_GPE, lchip->base + LOCOMO_GPE);
621 locomo_writel(save->LCM_ASD, lchip->base + LOCOMO_ASD); 648 locomo_writel(save->LCM_ASD, lchip->base + LOCOMO_ASD);
622 locomo_writel(save->LCM_SPIMD, lchip->base + LOCOMO_SPIMD); 649 locomo_writel(save->LCM_SPIMD, lchip->base + LOCOMO_SPI + LOCOMO_SPIMD);
623 650
624 locomo_writel(0x00, lchip->base + LOCOMO_C32K); 651 locomo_writel(0x00, lchip->base + LOCOMO_C32K);
625 locomo_writel(0x90, lchip->base + LOCOMO_TADC); 652 locomo_writel(0x90, lchip->base + LOCOMO_TADC);
@@ -688,9 +715,9 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)
688 715
689 /* GPIO */ 716 /* GPIO */
690 locomo_writel(0, lchip->base + LOCOMO_GPO); 717 locomo_writel(0, lchip->base + LOCOMO_GPO);
691 locomo_writel( (LOCOMO_GPIO(2) | LOCOMO_GPIO(3) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14)) 718 locomo_writel((LOCOMO_GPIO(1) | LOCOMO_GPIO(2) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14))
692 , lchip->base + LOCOMO_GPE); 719 , lchip->base + LOCOMO_GPE);
693 locomo_writel( (LOCOMO_GPIO(2) | LOCOMO_GPIO(3) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14)) 720 locomo_writel((LOCOMO_GPIO(1) | LOCOMO_GPIO(2) | LOCOMO_GPIO(13) | LOCOMO_GPIO(14))
694 , lchip->base + LOCOMO_GPD); 721 , lchip->base + LOCOMO_GPD);
695 locomo_writel(0, lchip->base + LOCOMO_GIE); 722 locomo_writel(0, lchip->base + LOCOMO_GIE);
696 723
@@ -833,7 +860,10 @@ void locomo_gpio_set_dir(struct device *dev, unsigned int bits, unsigned int dir
833 spin_lock_irqsave(&lchip->lock, flags); 860 spin_lock_irqsave(&lchip->lock, flags);
834 861
835 r = locomo_readl(lchip->base + LOCOMO_GPD); 862 r = locomo_readl(lchip->base + LOCOMO_GPD);
836 r &= ~bits; 863 if (dir)
864 r |= bits;
865 else
866 r &= ~bits;
837 locomo_writel(r, lchip->base + LOCOMO_GPD); 867 locomo_writel(r, lchip->base + LOCOMO_GPD);
838 868
839 r = locomo_readl(lchip->base + LOCOMO_GPE); 869 r = locomo_readl(lchip->base + LOCOMO_GPE);
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index f73d62e8ab60..688b7b1ee416 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -179,3 +179,5 @@ EXPORT_SYMBOL(_find_next_zero_bit_be);
179EXPORT_SYMBOL(_find_first_bit_be); 179EXPORT_SYMBOL(_find_first_bit_be);
180EXPORT_SYMBOL(_find_next_bit_be); 180EXPORT_SYMBOL(_find_next_bit_be);
181#endif 181#endif
182
183EXPORT_SYMBOL(copy_page);
diff --git a/arch/arm/kernel/arthur.c b/arch/arm/kernel/arthur.c
index 0ee2e9819631..321c5291d05f 100644
--- a/arch/arm/kernel/arthur.c
+++ b/arch/arm/kernel/arthur.c
@@ -90,3 +90,5 @@ static void __exit arthur_exit(void)
90 90
91module_init(arthur_init); 91module_init(arthur_init);
92module_exit(arthur_exit); 92module_exit(arthur_exit);
93
94MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index ca1a4bf78a10..a0b16a7e8a04 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -63,7 +63,7 @@ static const int palmte_keymap[] = {
63 KEY(1, 1, KEY_DOWN), 63 KEY(1, 1, KEY_DOWN),
64 KEY(1, 2, KEY_UP), 64 KEY(1, 2, KEY_UP),
65 KEY(1, 3, KEY_RIGHT), 65 KEY(1, 3, KEY_RIGHT),
66 KEY(1, 4, KEY_CENTER), 66 KEY(1, 4, KEY_ENTER),
67 0, 67 0,
68}; 68};
69 69
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 156510777ffe..e020c2774606 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -65,7 +65,7 @@ static int palmz71_keymap[] = {
65 KEY(1, 1, KEY_DOWN), 65 KEY(1, 1, KEY_DOWN),
66 KEY(1, 2, KEY_UP), 66 KEY(1, 2, KEY_UP),
67 KEY(1, 3, KEY_RIGHT), 67 KEY(1, 3, KEY_RIGHT),
68 KEY(1, 4, KEY_CENTER), 68 KEY(1, 4, KEY_ENTER),
69 KEY(2, 0, KEY_CAMERA), 69 KEY(2, 0, KEY_CAMERA),
70 0, 70 0,
71}; 71};
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 1c12d7c6c7fc..1682eb77c46d 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -208,6 +208,7 @@ static void __init omap_2430sdp_init(void)
208 208
209static void __init omap_2430sdp_map_io(void) 209static void __init omap_2430sdp_map_io(void)
210{ 210{
211 omap2_set_globals_243x();
211 omap2_map_common_io(); 212 omap2_map_common_io();
212} 213}
213 214
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index a1e1e6765b5b..620fa0f120ee 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -394,6 +394,7 @@ static void __init omap_apollon_init(void)
394 394
395static void __init omap_apollon_map_io(void) 395static void __init omap_apollon_map_io(void)
396{ 396{
397 omap2_set_globals_242x();
397 omap2_map_common_io(); 398 omap2_map_common_io();
398} 399}
399 400
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 90938151bcf1..df8be081e159 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -65,6 +65,7 @@ static void __init omap_generic_init(void)
65 65
66static void __init omap_generic_map_io(void) 66static void __init omap_generic_map_io(void)
67{ 67{
68 omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */
68 omap2_map_common_io(); 69 omap2_map_common_io();
69} 70}
70 71
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index d1915f99a5fa..0d28f6897c8e 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -420,6 +420,7 @@ static void __init omap_h4_init(void)
420 420
421static void __init omap_h4_map_io(void) 421static void __init omap_h4_map_io(void)
422{ 422{
423 omap2_set_globals_242x();
423 omap2_map_common_io(); 424 omap2_map_common_io();
424} 425}
425 426
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index b57ffb5a22a5..ab9fc57d25f1 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -205,7 +205,9 @@ static void omap2_clk_wait_ready(struct clk *clk)
205 /* REVISIT: What are the appropriate exclusions for 34XX? */ 205 /* REVISIT: What are the appropriate exclusions for 34XX? */
206 /* OMAP3: ignore DSS-mod clocks */ 206 /* OMAP3: ignore DSS-mod clocks */
207 if (cpu_is_omap34xx() && 207 if (cpu_is_omap34xx() &&
208 (((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(OMAP3430_DSS_MOD, 0))) 208 (((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
209 ((((u32)reg & ~0xff) == (u32)OMAP_CM_REGADDR(CORE_MOD, 0)) &&
210 clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
209 return; 211 return;
210 212
211 /* Check if both functional and interface clocks 213 /* Check if both functional and interface clocks
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index cf4644a94b9b..c9c5972a2e25 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -836,7 +836,8 @@ static struct clk dpll5_m2_ck = {
836 .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKSEL5), 836 .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKSEL5),
837 .clksel_mask = OMAP3430ES2_DIV_120M_MASK, 837 .clksel_mask = OMAP3430ES2_DIV_120M_MASK,
838 .clksel = div16_dpll5_clksel, 838 .clksel = div16_dpll5_clksel,
839 .flags = CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES, 839 .flags = CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES |
840 PARENT_CONTROLS_CLOCK,
840 .recalc = &omap2_clksel_recalc, 841 .recalc = &omap2_clksel_recalc,
841}; 842};
842 843
@@ -1046,12 +1047,13 @@ static struct clk iva2_ck = {
1046 .name = "iva2_ck", 1047 .name = "iva2_ck",
1047 .parent = &dpll2_m2_ck, 1048 .parent = &dpll2_m2_ck,
1048 .init = &omap2_init_clksel_parent, 1049 .init = &omap2_init_clksel_parent,
1050 .enable_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, CM_FCLKEN),
1051 .enable_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,
1049 .clksel_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, 1052 .clksel_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD,
1050 OMAP3430_CM_IDLEST_PLL), 1053 OMAP3430_CM_IDLEST_PLL),
1051 .clksel_mask = OMAP3430_ST_IVA2_CLK_MASK, 1054 .clksel_mask = OMAP3430_ST_IVA2_CLK_MASK,
1052 .clksel = iva2_clksel, 1055 .clksel = iva2_clksel,
1053 .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | 1056 .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES,
1054 PARENT_CONTROLS_CLOCK,
1055 .recalc = &omap2_clksel_recalc, 1057 .recalc = &omap2_clksel_recalc,
1056}; 1058};
1057 1059
@@ -1836,7 +1838,8 @@ static struct clk omapctrl_ick = {
1836static struct clk ssi_l4_ick = { 1838static struct clk ssi_l4_ick = {
1837 .name = "ssi_l4_ick", 1839 .name = "ssi_l4_ick",
1838 .parent = &l4_ick, 1840 .parent = &l4_ick,
1839 .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES, 1841 .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES |
1842 PARENT_CONTROLS_CLOCK,
1840 .recalc = &followparent_recalc, 1843 .recalc = &followparent_recalc,
1841}; 1844};
1842 1845
@@ -2344,7 +2347,7 @@ static struct clk gpio6_fck = {
2344 .name = "gpio6_fck", 2347 .name = "gpio6_fck",
2345 .parent = &per_32k_alwon_fck, 2348 .parent = &per_32k_alwon_fck,
2346 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), 2349 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
2347 .enable_bit = OMAP3430_EN_GPT6_SHIFT, 2350 .enable_bit = OMAP3430_EN_GPIO6_SHIFT,
2348 .flags = CLOCK_IN_OMAP343X, 2351 .flags = CLOCK_IN_OMAP343X,
2349 .recalc = &followparent_recalc, 2352 .recalc = &followparent_recalc,
2350}; 2353};
@@ -2353,7 +2356,7 @@ static struct clk gpio5_fck = {
2353 .name = "gpio5_fck", 2356 .name = "gpio5_fck",
2354 .parent = &per_32k_alwon_fck, 2357 .parent = &per_32k_alwon_fck,
2355 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), 2358 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
2356 .enable_bit = OMAP3430_EN_GPT5_SHIFT, 2359 .enable_bit = OMAP3430_EN_GPIO5_SHIFT,
2357 .flags = CLOCK_IN_OMAP343X, 2360 .flags = CLOCK_IN_OMAP343X,
2358 .recalc = &followparent_recalc, 2361 .recalc = &followparent_recalc,
2359}; 2362};
@@ -2362,7 +2365,7 @@ static struct clk gpio4_fck = {
2362 .name = "gpio4_fck", 2365 .name = "gpio4_fck",
2363 .parent = &per_32k_alwon_fck, 2366 .parent = &per_32k_alwon_fck,
2364 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), 2367 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
2365 .enable_bit = OMAP3430_EN_GPT4_SHIFT, 2368 .enable_bit = OMAP3430_EN_GPIO4_SHIFT,
2366 .flags = CLOCK_IN_OMAP343X, 2369 .flags = CLOCK_IN_OMAP343X,
2367 .recalc = &followparent_recalc, 2370 .recalc = &followparent_recalc,
2368}; 2371};
@@ -2371,7 +2374,7 @@ static struct clk gpio3_fck = {
2371 .name = "gpio3_fck", 2374 .name = "gpio3_fck",
2372 .parent = &per_32k_alwon_fck, 2375 .parent = &per_32k_alwon_fck,
2373 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), 2376 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
2374 .enable_bit = OMAP3430_EN_GPT3_SHIFT, 2377 .enable_bit = OMAP3430_EN_GPIO3_SHIFT,
2375 .flags = CLOCK_IN_OMAP343X, 2378 .flags = CLOCK_IN_OMAP343X,
2376 .recalc = &followparent_recalc, 2379 .recalc = &followparent_recalc,
2377}; 2380};
@@ -2380,7 +2383,7 @@ static struct clk gpio2_fck = {
2380 .name = "gpio2_fck", 2383 .name = "gpio2_fck",
2381 .parent = &per_32k_alwon_fck, 2384 .parent = &per_32k_alwon_fck,
2382 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), 2385 .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
2383 .enable_bit = OMAP3430_EN_GPT2_SHIFT, 2386 .enable_bit = OMAP3430_EN_GPIO2_SHIFT,
2384 .flags = CLOCK_IN_OMAP343X, 2387 .flags = CLOCK_IN_OMAP343X,
2385 .recalc = &followparent_recalc, 2388 .recalc = &followparent_recalc,
2386}; 2389};
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h
index 9249129a5f46..3c38395f6442 100644
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
@@ -56,6 +56,7 @@
56 56
57/* CM_FCLKEN_IVA2 */ 57/* CM_FCLKEN_IVA2 */
58#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2 (1 << 0) 58#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2 (1 << 0)
59#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT 0
59 60
60/* CM_CLKEN_PLL_IVA2 */ 61/* CM_CLKEN_PLL_IVA2 */
61#define OMAP3430_IVA2_DPLL_RAMPTIME_SHIFT 8 62#define OMAP3430_IVA2_DPLL_RAMPTIME_SHIFT 8
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index b03cd06e055b..4799561c5a9e 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -70,6 +70,9 @@ struct omap_mbox2_priv {
70 70
71static struct clk *mbox_ick_handle; 71static struct clk *mbox_ick_handle;
72 72
73static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
74 omap_mbox_type_t irq);
75
73static inline unsigned int mbox_read_reg(unsigned int reg) 76static inline unsigned int mbox_read_reg(unsigned int reg)
74{ 77{
75 return __raw_readl(mbox_base + reg); 78 return __raw_readl(mbox_base + reg);
@@ -81,7 +84,7 @@ static inline void mbox_write_reg(unsigned int val, unsigned int reg)
81} 84}
82 85
83/* Mailbox H/W preparations */ 86/* Mailbox H/W preparations */
84static inline int omap2_mbox_startup(struct omap_mbox *mbox) 87static int omap2_mbox_startup(struct omap_mbox *mbox)
85{ 88{
86 unsigned int l; 89 unsigned int l;
87 90
@@ -97,38 +100,40 @@ static inline int omap2_mbox_startup(struct omap_mbox *mbox)
97 l |= 0x00000011; 100 l |= 0x00000011;
98 mbox_write_reg(l, MAILBOX_SYSCONFIG); 101 mbox_write_reg(l, MAILBOX_SYSCONFIG);
99 102
103 omap2_mbox_enable_irq(mbox, IRQ_RX);
104
100 return 0; 105 return 0;
101} 106}
102 107
103static inline void omap2_mbox_shutdown(struct omap_mbox *mbox) 108static void omap2_mbox_shutdown(struct omap_mbox *mbox)
104{ 109{
105 clk_disable(mbox_ick_handle); 110 clk_disable(mbox_ick_handle);
106 clk_put(mbox_ick_handle); 111 clk_put(mbox_ick_handle);
107} 112}
108 113
109/* Mailbox FIFO handle functions */ 114/* Mailbox FIFO handle functions */
110static inline mbox_msg_t omap2_mbox_fifo_read(struct omap_mbox *mbox) 115static mbox_msg_t omap2_mbox_fifo_read(struct omap_mbox *mbox)
111{ 116{
112 struct omap_mbox2_fifo *fifo = 117 struct omap_mbox2_fifo *fifo =
113 &((struct omap_mbox2_priv *)mbox->priv)->rx_fifo; 118 &((struct omap_mbox2_priv *)mbox->priv)->rx_fifo;
114 return (mbox_msg_t) mbox_read_reg(fifo->msg); 119 return (mbox_msg_t) mbox_read_reg(fifo->msg);
115} 120}
116 121
117static inline void omap2_mbox_fifo_write(struct omap_mbox *mbox, mbox_msg_t msg) 122static void omap2_mbox_fifo_write(struct omap_mbox *mbox, mbox_msg_t msg)
118{ 123{
119 struct omap_mbox2_fifo *fifo = 124 struct omap_mbox2_fifo *fifo =
120 &((struct omap_mbox2_priv *)mbox->priv)->tx_fifo; 125 &((struct omap_mbox2_priv *)mbox->priv)->tx_fifo;
121 mbox_write_reg(msg, fifo->msg); 126 mbox_write_reg(msg, fifo->msg);
122} 127}
123 128
124static inline int omap2_mbox_fifo_empty(struct omap_mbox *mbox) 129static int omap2_mbox_fifo_empty(struct omap_mbox *mbox)
125{ 130{
126 struct omap_mbox2_fifo *fifo = 131 struct omap_mbox2_fifo *fifo =
127 &((struct omap_mbox2_priv *)mbox->priv)->rx_fifo; 132 &((struct omap_mbox2_priv *)mbox->priv)->rx_fifo;
128 return (mbox_read_reg(fifo->msg_stat) == 0); 133 return (mbox_read_reg(fifo->msg_stat) == 0);
129} 134}
130 135
131static inline int omap2_mbox_fifo_full(struct omap_mbox *mbox) 136static int omap2_mbox_fifo_full(struct omap_mbox *mbox)
132{ 137{
133 struct omap_mbox2_fifo *fifo = 138 struct omap_mbox2_fifo *fifo =
134 &((struct omap_mbox2_priv *)mbox->priv)->tx_fifo; 139 &((struct omap_mbox2_priv *)mbox->priv)->tx_fifo;
@@ -136,7 +141,7 @@ static inline int omap2_mbox_fifo_full(struct omap_mbox *mbox)
136} 141}
137 142
138/* Mailbox IRQ handle functions */ 143/* Mailbox IRQ handle functions */
139static inline void omap2_mbox_enable_irq(struct omap_mbox *mbox, 144static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
140 omap_mbox_type_t irq) 145 omap_mbox_type_t irq)
141{ 146{
142 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv; 147 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
@@ -147,7 +152,7 @@ static inline void omap2_mbox_enable_irq(struct omap_mbox *mbox,
147 mbox_write_reg(l, p->irqenable); 152 mbox_write_reg(l, p->irqenable);
148} 153}
149 154
150static inline void omap2_mbox_disable_irq(struct omap_mbox *mbox, 155static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
151 omap_mbox_type_t irq) 156 omap_mbox_type_t irq)
152{ 157{
153 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv; 158 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
@@ -158,7 +163,7 @@ static inline void omap2_mbox_disable_irq(struct omap_mbox *mbox,
158 mbox_write_reg(l, p->irqenable); 163 mbox_write_reg(l, p->irqenable);
159} 164}
160 165
161static inline void omap2_mbox_ack_irq(struct omap_mbox *mbox, 166static void omap2_mbox_ack_irq(struct omap_mbox *mbox,
162 omap_mbox_type_t irq) 167 omap_mbox_type_t irq)
163{ 168{
164 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv; 169 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
@@ -167,7 +172,7 @@ static inline void omap2_mbox_ack_irq(struct omap_mbox *mbox,
167 mbox_write_reg(bit, p->irqstatus); 172 mbox_write_reg(bit, p->irqstatus);
168} 173}
169 174
170static inline int omap2_mbox_is_irq(struct omap_mbox *mbox, 175static int omap2_mbox_is_irq(struct omap_mbox *mbox,
171 omap_mbox_type_t irq) 176 omap_mbox_type_t irq)
172{ 177{
173 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv; 178 struct omap_mbox2_priv *p = (struct omap_mbox2_priv *)mbox->priv;
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index ab7649afd891..618f8111658a 100644
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -30,7 +30,7 @@
30 30
31/* 31/*
32 * Architecture-specific global PRM registers 32 * Architecture-specific global PRM registers
33 * Use prm_{read,write}_reg() with these registers. 33 * Use __raw_{read,write}l() with these registers.
34 * 34 *
35 * With a few exceptions, these are the register names beginning with 35 * With a few exceptions, these are the register names beginning with
36 * PRCM_* on 24xx, and PRM_* on 34xx. (The exceptions are the 36 * PRCM_* on 24xx, and PRM_* on 34xx. (The exceptions are the
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index f9430f5ca9a8..27ce967ab9e5 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -58,7 +58,7 @@ static int __init dns323_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
58} 58}
59 59
60static struct hw_pci dns323_pci __initdata = { 60static struct hw_pci dns323_pci __initdata = {
61 .nr_controllers = 1, 61 .nr_controllers = 2,
62 .swizzle = pci_std_swizzle, 62 .swizzle = pci_std_swizzle,
63 .setup = orion5x_pci_sys_setup, 63 .setup = orion5x_pci_sys_setup,
64 .scan = orion5x_pci_sys_scan_bus, 64 .scan = orion5x_pci_sys_scan_bus,
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 88410862feef..f5074b877b7f 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -138,7 +138,7 @@ static int __init kurobox_pro_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
138} 138}
139 139
140static struct hw_pci kurobox_pro_pci __initdata = { 140static struct hw_pci kurobox_pro_pci __initdata = {
141 .nr_controllers = 1, 141 .nr_controllers = 2,
142 .swizzle = pci_std_swizzle, 142 .swizzle = pci_std_swizzle,
143 .setup = orion5x_pci_sys_setup, 143 .setup = orion5x_pci_sys_setup,
144 .scan = orion5x_pci_sys_scan_bus, 144 .scan = orion5x_pci_sys_scan_bus,
diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c
index 43bf5a183e90..574839d7c132 100644
--- a/arch/arm/mach-pxa/colibri.c
+++ b/arch/arm/mach-pxa/colibri.c
@@ -98,7 +98,7 @@ static struct resource dm9000_resources[] = {
98 [2] = { 98 [2] = {
99 .start = COLIBRI_ETH_IRQ, 99 .start = COLIBRI_ETH_IRQ,
100 .end = COLIBRI_ETH_IRQ, 100 .end = COLIBRI_ETH_IRQ,
101 .flags = IORESOURCE_IRQ, 101 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_RISING,
102 }, 102 },
103}; 103};
104 104
@@ -119,7 +119,6 @@ static void __init colibri_init(void)
119 /* DM9000 LAN */ 119 /* DM9000 LAN */
120 pxa_gpio_mode(GPIO78_nCS_2_MD); 120 pxa_gpio_mode(GPIO78_nCS_2_MD);
121 pxa_gpio_mode(GPIO_DM9000 | GPIO_IN); 121 pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);
122 set_irq_type(COLIBRI_ETH_IRQ, IRQT_FALLING);
123 122
124 platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices)); 123 platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));
125} 124}
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index e7d0fcd9b43f..dace3820f1ee 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -38,6 +38,7 @@
38#include <asm/arch/pxa-regs.h> 38#include <asm/arch/pxa-regs.h>
39#include <asm/arch/pxa2xx-regs.h> 39#include <asm/arch/pxa2xx-regs.h>
40#include <asm/arch/pxa2xx-gpio.h> 40#include <asm/arch/pxa2xx-gpio.h>
41#include <asm/arch/pxa27x-udc.h>
41#include <asm/arch/irda.h> 42#include <asm/arch/irda.h>
42#include <asm/arch/mmc.h> 43#include <asm/arch/mmc.h>
43#include <asm/arch/ohci.h> 44#include <asm/arch/ohci.h>
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 065087afb772..d045812f3399 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -332,7 +332,7 @@ ENTRY(arm925_dma_flush_range)
332#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH 332#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
333 mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry 333 mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
334#else 334#else
335 mcr p15, 0, r0, c7, c10, 1 @ clean D entry 335 mcr p15, 0, r0, c7, c6, 1 @ invalidate D entry
336#endif 336#endif
337 add r0, r0, #CACHE_DLINESIZE 337 add r0, r0, #CACHE_DLINESIZE
338 cmp r0, r1 338 cmp r0, r1
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 997db8472b5c..4cd33169a7c9 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -295,7 +295,7 @@ ENTRY(arm926_dma_flush_range)
295#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH 295#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
296 mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry 296 mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
297#else 297#else
298 mcr p15, 0, r0, c7, c10, 1 @ clean D entry 298 mcr p15, 0, r0, c7, c6, 1 @ invalidate D entry
299#endif 299#endif
300 add r0, r0, #CACHE_DLINESIZE 300 add r0, r0, #CACHE_DLINESIZE
301 cmp r0, r1 301 cmp r0, r1
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index 44ead902bd54..1a3d63df8e90 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -222,7 +222,7 @@ ENTRY(arm940_dma_flush_range)
222#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH 222#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
223 mcr p15, 0, r3, c7, c14, 2 @ clean/flush D entry 223 mcr p15, 0, r3, c7, c14, 2 @ clean/flush D entry
224#else 224#else
225 mcr p15, 0, r3, c7, c10, 2 @ clean D entry 225 mcr p15, 0, r3, c7, c6, 2 @ invalidate D entry
226#endif 226#endif
227 subs r3, r3, #1 << 26 227 subs r3, r3, #1 << 26
228 bcs 2b @ entries 63 to 0 228 bcs 2b @ entries 63 to 0
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index 2218b0c01330..82d579ac9b98 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -265,7 +265,7 @@ ENTRY(arm946_dma_flush_range)
265#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH 265#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
266 mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry 266 mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
267#else 267#else
268 mcr p15, 0, r0, c7, c10, 1 @ clean D entry 268 mcr p15, 0, r0, c7, c6, 1 @ invalidate D entry
269#endif 269#endif
270 add r0, r0, #CACHE_DLINESIZE 270 add r0, r0, #CACHE_DLINESIZE
271 cmp r0, r1 271 cmp r0, r1
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 72d34a23a2ec..2946c193a7d6 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -134,9 +134,17 @@ void clk_disable(struct clk *clk)
134 return; 134 return;
135 135
136 spin_lock_irqsave(&clockfw_lock, flags); 136 spin_lock_irqsave(&clockfw_lock, flags);
137 BUG_ON(clk->usecount == 0); 137 if (clk->usecount == 0) {
138 printk(KERN_ERR "Trying disable clock %s with 0 usecount\n",
139 clk->name);
140 WARN_ON(1);
141 goto out;
142 }
143
138 if (arch_clock->clk_disable) 144 if (arch_clock->clk_disable)
139 arch_clock->clk_disable(clk); 145 arch_clock->clk_disable(clk);
146
147out:
140 spin_unlock_irqrestore(&clockfw_lock, flags); 148 spin_unlock_irqrestore(&clockfw_lock, flags);
141} 149}
142EXPORT_SYMBOL(clk_disable); 150EXPORT_SYMBOL(clk_disable);
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 793740686be2..c00eda588cd8 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -604,6 +604,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
604 chan->data = data; 604 chan->data = data;
605#ifndef CONFIG_ARCH_OMAP1 605#ifndef CONFIG_ARCH_OMAP1
606 chan->chain_id = -1; 606 chan->chain_id = -1;
607 chan->next_linked_ch = -1;
607#endif 608#endif
608 chan->enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ; 609 chan->enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ;
609 610
@@ -1087,7 +1088,6 @@ int omap_request_dma_chain(int dev_id, const char *dev_name,
1087 printk(KERN_ERR "omap_dma: Request failed %d\n", err); 1088 printk(KERN_ERR "omap_dma: Request failed %d\n", err);
1088 return err; 1089 return err;
1089 } 1090 }
1090 dma_chan[channels[i]].next_linked_ch = -1;
1091 dma_chan[channels[i]].prev_linked_ch = -1; 1091 dma_chan[channels[i]].prev_linked_ch = -1;
1092 dma_chan[channels[i]].state = DMA_CH_NOTSTARTED; 1092 dma_chan[channels[i]].state = DMA_CH_NOTSTARTED;
1093 1093
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 1945ddfec18d..6f33f58bca45 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -355,7 +355,6 @@ static int omap_mbox_init(struct omap_mbox *mbox)
355 "failed to register mailbox interrupt:%d\n", ret); 355 "failed to register mailbox interrupt:%d\n", ret);
356 goto fail_request_irq; 356 goto fail_request_irq;
357 } 357 }
358 enable_mbox_irq(mbox, IRQ_RX);
359 358
360 mq = mbox_queue_alloc(mbox, mbox_txq_fn, mbox_tx_work); 359 mq = mbox_queue_alloc(mbox, mbox_txq_fn, mbox_tx_work);
361 if (!mq) { 360 if (!mq) {
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 65db2261b9ea..55ea52fe6aca 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -44,7 +44,7 @@ config GENERIC_IOMAP
44 44
45config ARCH_MAY_HAVE_PC_FDC 45config ARCH_MAY_HAVE_PC_FDC
46 bool 46 bool
47 depends on Q40 || (BROKEN && SUN3X) 47 depends on BROKEN && (Q40 || SUN3X)
48 default y 48 default y
49 49
50config NO_IOPORT 50config NO_IOPORT
@@ -539,13 +539,6 @@ config AMIGA_BUILTIN_SERIAL
539 539
540 To compile this driver as a module, choose M here. 540 To compile this driver as a module, choose M here.
541 541
542config WHIPPET_SERIAL
543 tristate "Hisoft Whippet PCMCIA serial support"
544 depends on AMIGA_PCMCIA
545 help
546 HiSoft has a web page at <http://www.hisoft.co.uk/>, but there
547 is no listing for the Whippet in their Amiga section.
548
549config MULTIFACE_III_TTY 542config MULTIFACE_III_TTY
550 tristate "Multiface Card III serial support" 543 tristate "Multiface Card III serial support"
551 depends on AMIGA 544 depends on AMIGA
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index e41958371367..dca50da9ffd0 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:06 2008 4# Sun May 18 14:44:41 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -141,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141CONFIG_NEED_MULTIPLE_NODES=y 144CONFIG_NEED_MULTIPLE_NODES=y
142# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
143# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
147CONFIG_PAGEFLAGS_EXTENDED=y
144CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1 150CONFIG_ZONE_DMA_FLAG=1
@@ -222,8 +226,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
222CONFIG_INET6_XFRM_MODE_BEET=m 226CONFIG_INET6_XFRM_MODE_BEET=m
223CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 227CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
224CONFIG_IPV6_SIT=m 228CONFIG_IPV6_SIT=m
229CONFIG_IPV6_NDISC_NODETYPE=y
225CONFIG_IPV6_TUNNEL=m 230CONFIG_IPV6_TUNNEL=m
226# CONFIG_IPV6_MULTIPLE_TABLES is not set 231# CONFIG_IPV6_MULTIPLE_TABLES is not set
232# CONFIG_IPV6_MROUTE is not set
227# CONFIG_NETWORK_SECMARK is not set 233# CONFIG_NETWORK_SECMARK is not set
228CONFIG_NETFILTER=y 234CONFIG_NETFILTER=y
229# CONFIG_NETFILTER_DEBUG is not set 235# CONFIG_NETFILTER_DEBUG is not set
@@ -239,6 +245,7 @@ CONFIG_NF_CONNTRACK=m
239CONFIG_NF_CT_ACCT=y 245CONFIG_NF_CT_ACCT=y
240CONFIG_NF_CONNTRACK_MARK=y 246CONFIG_NF_CONNTRACK_MARK=y
241# CONFIG_NF_CONNTRACK_EVENTS is not set 247# CONFIG_NF_CONNTRACK_EVENTS is not set
248# CONFIG_NF_CT_PROTO_DCCP is not set
242CONFIG_NF_CT_PROTO_GRE=m 249CONFIG_NF_CT_PROTO_GRE=m
243CONFIG_NF_CT_PROTO_SCTP=m 250CONFIG_NF_CT_PROTO_SCTP=m
244CONFIG_NF_CT_PROTO_UDPLITE=m 251CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -317,6 +324,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
317CONFIG_IP_NF_TARGET_NETMAP=m 324CONFIG_IP_NF_TARGET_NETMAP=m
318CONFIG_NF_NAT_SNMP_BASIC=m 325CONFIG_NF_NAT_SNMP_BASIC=m
319CONFIG_NF_NAT_PROTO_GRE=m 326CONFIG_NF_NAT_PROTO_GRE=m
327CONFIG_NF_NAT_PROTO_UDPLITE=m
328CONFIG_NF_NAT_PROTO_SCTP=m
320CONFIG_NF_NAT_FTP=m 329CONFIG_NF_NAT_FTP=m
321CONFIG_NF_NAT_IRC=m 330CONFIG_NF_NAT_IRC=m
322CONFIG_NF_NAT_TFTP=m 331CONFIG_NF_NAT_TFTP=m
@@ -410,8 +419,6 @@ CONFIG_IEEE80211=m
410CONFIG_IEEE80211_CRYPT_WEP=m 419CONFIG_IEEE80211_CRYPT_WEP=m
411CONFIG_IEEE80211_CRYPT_CCMP=m 420CONFIG_IEEE80211_CRYPT_CCMP=m
412CONFIG_IEEE80211_CRYPT_TKIP=m 421CONFIG_IEEE80211_CRYPT_TKIP=m
413CONFIG_IEEE80211_SOFTMAC=m
414# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
415# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
417 424
@@ -477,27 +484,12 @@ CONFIG_IDE_PROC_FS=y
477# 484#
478# IDE chipset support/bugfixes 485# IDE chipset support/bugfixes
479# 486#
480# CONFIG_IDE_GENERIC is not set
481# CONFIG_BLK_DEV_PLATFORM is not set 487# CONFIG_BLK_DEV_PLATFORM is not set
482CONFIG_BLK_DEV_GAYLE=y 488CONFIG_BLK_DEV_GAYLE=y
483CONFIG_BLK_DEV_IDEDOUBLER=y 489CONFIG_BLK_DEV_IDEDOUBLER=y
484CONFIG_BLK_DEV_BUDDHA=y 490CONFIG_BLK_DEV_BUDDHA=y
485
486#
487# Other IDE chipsets support
488#
489
490#
491# Note: most of these also require special kernel boot parameters
492#
493# CONFIG_BLK_DEV_4DRIVES is not set
494# CONFIG_BLK_DEV_ALI14XX is not set
495# CONFIG_BLK_DEV_DTC2278 is not set
496# CONFIG_BLK_DEV_HT6560B is not set
497# CONFIG_BLK_DEV_QD65XX is not set
498# CONFIG_BLK_DEV_UMC8672 is not set
499# CONFIG_BLK_DEV_IDEDMA is not set 491# CONFIG_BLK_DEV_IDEDMA is not set
500# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set 492# CONFIG_BLK_DEV_HD_ONLY is not set
501# CONFIG_BLK_DEV_HD is not set 493# CONFIG_BLK_DEV_HD is not set
502 494
503# 495#
@@ -626,6 +618,7 @@ CONFIG_APNE=m
626# 618#
627# CONFIG_WLAN_PRE80211 is not set 619# CONFIG_WLAN_PRE80211 is not set
628# CONFIG_WLAN_80211 is not set 620# CONFIG_WLAN_80211 is not set
621# CONFIG_IWLWIFI_LEDS is not set
629# CONFIG_WAN is not set 622# CONFIG_WAN is not set
630# CONFIG_PLIP is not set 623# CONFIG_PLIP is not set
631CONFIG_PPP=m 624CONFIG_PPP=m
@@ -707,6 +700,7 @@ CONFIG_INPUT_JOYSTICK=y
707# CONFIG_JOYSTICK_SPACEBALL is not set 700# CONFIG_JOYSTICK_SPACEBALL is not set
708# CONFIG_JOYSTICK_STINGER is not set 701# CONFIG_JOYSTICK_STINGER is not set
709# CONFIG_JOYSTICK_TWIDJOY is not set 702# CONFIG_JOYSTICK_TWIDJOY is not set
703# CONFIG_JOYSTICK_ZHENHUA is not set
710# CONFIG_JOYSTICK_DB9 is not set 704# CONFIG_JOYSTICK_DB9 is not set
711# CONFIG_JOYSTICK_GAMECON is not set 705# CONFIG_JOYSTICK_GAMECON is not set
712# CONFIG_JOYSTICK_TURBOGRAFX is not set 706# CONFIG_JOYSTICK_TURBOGRAFX is not set
@@ -731,6 +725,7 @@ CONFIG_VT=y
731CONFIG_VT_CONSOLE=y 725CONFIG_VT_CONSOLE=y
732CONFIG_HW_CONSOLE=y 726CONFIG_HW_CONSOLE=y
733CONFIG_VT_HW_CONSOLE_BINDING=y 727CONFIG_VT_HW_CONSOLE_BINDING=y
728# CONFIG_DEVKMEM is not set
734# CONFIG_SERIAL_NONSTANDARD is not set 729# CONFIG_SERIAL_NONSTANDARD is not set
735CONFIG_A2232=m 730CONFIG_A2232=m
736 731
@@ -757,12 +752,7 @@ CONFIG_GEN_RTC_X=y
757# CONFIG_RAW_DRIVER is not set 752# CONFIG_RAW_DRIVER is not set
758# CONFIG_TCG_TPM is not set 753# CONFIG_TCG_TPM is not set
759# CONFIG_I2C is not set 754# CONFIG_I2C is not set
760
761#
762# SPI support
763#
764# CONFIG_SPI is not set 755# CONFIG_SPI is not set
765# CONFIG_SPI_MASTER is not set
766# CONFIG_W1 is not set 756# CONFIG_W1 is not set
767# CONFIG_POWER_SUPPLY is not set 757# CONFIG_POWER_SUPPLY is not set
768# CONFIG_HWMON is not set 758# CONFIG_HWMON is not set
@@ -779,12 +769,22 @@ CONFIG_SSB_POSSIBLE=y
779# Multifunction device drivers 769# Multifunction device drivers
780# 770#
781# CONFIG_MFD_SM501 is not set 771# CONFIG_MFD_SM501 is not set
772# CONFIG_HTC_PASIC3 is not set
782 773
783# 774#
784# Multimedia devices 775# Multimedia devices
785# 776#
777
778#
779# Multimedia core support
780#
786# CONFIG_VIDEO_DEV is not set 781# CONFIG_VIDEO_DEV is not set
787# CONFIG_DVB_CORE is not set 782# CONFIG_DVB_CORE is not set
783# CONFIG_VIDEO_MEDIA is not set
784
785#
786# Multimedia drivers
787#
788# CONFIG_DAB is not set 788# CONFIG_DAB is not set
789 789
790# 790#
@@ -802,8 +802,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
802# CONFIG_FB_SYS_FILLRECT is not set 802# CONFIG_FB_SYS_FILLRECT is not set
803# CONFIG_FB_SYS_COPYAREA is not set 803# CONFIG_FB_SYS_COPYAREA is not set
804# CONFIG_FB_SYS_IMAGEBLIT is not set 804# CONFIG_FB_SYS_IMAGEBLIT is not set
805# CONFIG_FB_FOREIGN_ENDIAN is not set
805# CONFIG_FB_SYS_FOPS is not set 806# CONFIG_FB_SYS_FOPS is not set
806CONFIG_FB_DEFERRED_IO=y
807# CONFIG_FB_SVGALIB is not set 807# CONFIG_FB_SVGALIB is not set
808# CONFIG_FB_MACMODES is not set 808# CONFIG_FB_MACMODES is not set
809# CONFIG_FB_BACKLIGHT is not set 809# CONFIG_FB_BACKLIGHT is not set
@@ -859,19 +859,15 @@ CONFIG_HIDRAW=y
859# CONFIG_MMC is not set 859# CONFIG_MMC is not set
860# CONFIG_MEMSTICK is not set 860# CONFIG_MEMSTICK is not set
861# CONFIG_NEW_LEDS is not set 861# CONFIG_NEW_LEDS is not set
862# CONFIG_ACCESSIBILITY is not set
862# CONFIG_RTC_CLASS is not set 863# CONFIG_RTC_CLASS is not set
863# CONFIG_AUXDISPLAY is not set 864# CONFIG_AUXDISPLAY is not set
864
865#
866# Userspace I/O
867#
868# CONFIG_UIO is not set 865# CONFIG_UIO is not set
869 866
870# 867#
871# Character devices 868# Character devices
872# 869#
873CONFIG_AMIGA_BUILTIN_SERIAL=y 870CONFIG_AMIGA_BUILTIN_SERIAL=y
874# CONFIG_WHIPPET_SERIAL is not set
875CONFIG_MULTIFACE_III_TTY=m 871CONFIG_MULTIFACE_III_TTY=m
876# CONFIG_SERIAL_CONSOLE is not set 872# CONFIG_SERIAL_CONSOLE is not set
877 873
@@ -894,16 +890,15 @@ CONFIG_JFS_FS=m
894# CONFIG_JFS_SECURITY is not set 890# CONFIG_JFS_SECURITY is not set
895# CONFIG_JFS_DEBUG is not set 891# CONFIG_JFS_DEBUG is not set
896# CONFIG_JFS_STATISTICS is not set 892# CONFIG_JFS_STATISTICS is not set
897CONFIG_FS_POSIX_ACL=y 893# CONFIG_FS_POSIX_ACL is not set
898CONFIG_XFS_FS=m 894CONFIG_XFS_FS=m
899# CONFIG_XFS_QUOTA is not set 895# CONFIG_XFS_QUOTA is not set
900# CONFIG_XFS_SECURITY is not set
901# CONFIG_XFS_POSIX_ACL is not set 896# CONFIG_XFS_POSIX_ACL is not set
902# CONFIG_XFS_RT is not set 897# CONFIG_XFS_RT is not set
903CONFIG_GFS2_FS=m 898# CONFIG_XFS_DEBUG is not set
904CONFIG_GFS2_FS_LOCKING_NOLOCK=m
905CONFIG_GFS2_FS_LOCKING_DLM=m
906CONFIG_OCFS2_FS=m 899CONFIG_OCFS2_FS=m
900CONFIG_OCFS2_FS_O2CB=m
901CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
907# CONFIG_OCFS2_DEBUG_MASKLOG is not set 902# CONFIG_OCFS2_DEBUG_MASKLOG is not set
908# CONFIG_OCFS2_DEBUG_FS is not set 903# CONFIG_OCFS2_DEBUG_FS is not set
909CONFIG_DNOTIFY=y 904CONFIG_DNOTIFY=y
@@ -975,12 +970,10 @@ CONFIG_NFS_FS=m
975CONFIG_NFS_V3=y 970CONFIG_NFS_V3=y
976# CONFIG_NFS_V3_ACL is not set 971# CONFIG_NFS_V3_ACL is not set
977CONFIG_NFS_V4=y 972CONFIG_NFS_V4=y
978# CONFIG_NFS_DIRECTIO is not set
979CONFIG_NFSD=m 973CONFIG_NFSD=m
980CONFIG_NFSD_V3=y 974CONFIG_NFSD_V3=y
981# CONFIG_NFSD_V3_ACL is not set 975# CONFIG_NFSD_V3_ACL is not set
982# CONFIG_NFSD_V4 is not set 976# CONFIG_NFSD_V4 is not set
983CONFIG_NFSD_TCP=y
984CONFIG_LOCKD=m 977CONFIG_LOCKD=m
985CONFIG_LOCKD_V4=y 978CONFIG_LOCKD_V4=y
986CONFIG_EXPORTFS=m 979CONFIG_EXPORTFS=m
@@ -1054,6 +1047,7 @@ CONFIG_DLM=m
1054# CONFIG_PRINTK_TIME is not set 1047# CONFIG_PRINTK_TIME is not set
1055CONFIG_ENABLE_WARN_DEPRECATED=y 1048CONFIG_ENABLE_WARN_DEPRECATED=y
1056CONFIG_ENABLE_MUST_CHECK=y 1049CONFIG_ENABLE_MUST_CHECK=y
1050CONFIG_FRAME_WARN=1024
1057CONFIG_MAGIC_SYSRQ=y 1051CONFIG_MAGIC_SYSRQ=y
1058# CONFIG_UNUSED_SYMBOLS is not set 1052# CONFIG_UNUSED_SYMBOLS is not set
1059# CONFIG_DEBUG_FS is not set 1053# CONFIG_DEBUG_FS is not set
@@ -1073,53 +1067,82 @@ CONFIG_ASYNC_CORE=m
1073CONFIG_ASYNC_MEMCPY=m 1067CONFIG_ASYNC_MEMCPY=m
1074CONFIG_ASYNC_XOR=m 1068CONFIG_ASYNC_XOR=m
1075CONFIG_CRYPTO=y 1069CONFIG_CRYPTO=y
1070
1071#
1072# Crypto core or helper
1073#
1076CONFIG_CRYPTO_ALGAPI=y 1074CONFIG_CRYPTO_ALGAPI=y
1077CONFIG_CRYPTO_AEAD=m 1075CONFIG_CRYPTO_AEAD=m
1078CONFIG_CRYPTO_BLKCIPHER=m 1076CONFIG_CRYPTO_BLKCIPHER=m
1079CONFIG_CRYPTO_SEQIV=m
1080CONFIG_CRYPTO_HASH=y 1077CONFIG_CRYPTO_HASH=y
1081CONFIG_CRYPTO_MANAGER=y 1078CONFIG_CRYPTO_MANAGER=y
1079CONFIG_CRYPTO_GF128MUL=m
1080CONFIG_CRYPTO_NULL=m
1081CONFIG_CRYPTO_CRYPTD=m
1082CONFIG_CRYPTO_AUTHENC=m
1083CONFIG_CRYPTO_TEST=m
1084
1085#
1086# Authenticated Encryption with Associated Data
1087#
1088CONFIG_CRYPTO_CCM=m
1089CONFIG_CRYPTO_GCM=m
1090CONFIG_CRYPTO_SEQIV=m
1091
1092#
1093# Block modes
1094#
1095CONFIG_CRYPTO_CBC=m
1096CONFIG_CRYPTO_CTR=m
1097CONFIG_CRYPTO_CTS=m
1098CONFIG_CRYPTO_ECB=m
1099CONFIG_CRYPTO_LRW=m
1100CONFIG_CRYPTO_PCBC=m
1101CONFIG_CRYPTO_XTS=m
1102
1103#
1104# Hash modes
1105#
1082CONFIG_CRYPTO_HMAC=y 1106CONFIG_CRYPTO_HMAC=y
1083CONFIG_CRYPTO_XCBC=m 1107CONFIG_CRYPTO_XCBC=m
1084CONFIG_CRYPTO_NULL=m 1108
1109#
1110# Digest
1111#
1112CONFIG_CRYPTO_CRC32C=m
1085CONFIG_CRYPTO_MD4=m 1113CONFIG_CRYPTO_MD4=m
1086CONFIG_CRYPTO_MD5=m 1114CONFIG_CRYPTO_MD5=m
1115CONFIG_CRYPTO_MICHAEL_MIC=m
1087CONFIG_CRYPTO_SHA1=m 1116CONFIG_CRYPTO_SHA1=m
1088CONFIG_CRYPTO_SHA256=m 1117CONFIG_CRYPTO_SHA256=m
1089CONFIG_CRYPTO_SHA512=m 1118CONFIG_CRYPTO_SHA512=m
1090CONFIG_CRYPTO_WP512=m
1091CONFIG_CRYPTO_TGR192=m 1119CONFIG_CRYPTO_TGR192=m
1092CONFIG_CRYPTO_GF128MUL=m 1120CONFIG_CRYPTO_WP512=m
1093CONFIG_CRYPTO_ECB=m 1121
1094CONFIG_CRYPTO_CBC=m 1122#
1095CONFIG_CRYPTO_PCBC=m 1123# Ciphers
1096CONFIG_CRYPTO_LRW=m 1124#
1097CONFIG_CRYPTO_XTS=m
1098CONFIG_CRYPTO_CTR=m
1099CONFIG_CRYPTO_GCM=m
1100CONFIG_CRYPTO_CCM=m
1101CONFIG_CRYPTO_CRYPTD=m
1102CONFIG_CRYPTO_DES=m
1103CONFIG_CRYPTO_FCRYPT=m
1104CONFIG_CRYPTO_BLOWFISH=m
1105CONFIG_CRYPTO_TWOFISH=m
1106CONFIG_CRYPTO_TWOFISH_COMMON=m
1107CONFIG_CRYPTO_SERPENT=m
1108CONFIG_CRYPTO_AES=m 1125CONFIG_CRYPTO_AES=m
1126CONFIG_CRYPTO_ANUBIS=m
1127CONFIG_CRYPTO_ARC4=m
1128CONFIG_CRYPTO_BLOWFISH=m
1129CONFIG_CRYPTO_CAMELLIA=m
1109CONFIG_CRYPTO_CAST5=m 1130CONFIG_CRYPTO_CAST5=m
1110CONFIG_CRYPTO_CAST6=m 1131CONFIG_CRYPTO_CAST6=m
1111CONFIG_CRYPTO_TEA=m 1132CONFIG_CRYPTO_DES=m
1112CONFIG_CRYPTO_ARC4=m 1133CONFIG_CRYPTO_FCRYPT=m
1113CONFIG_CRYPTO_KHAZAD=m 1134CONFIG_CRYPTO_KHAZAD=m
1114CONFIG_CRYPTO_ANUBIS=m
1115CONFIG_CRYPTO_SEED=m
1116CONFIG_CRYPTO_SALSA20=m 1135CONFIG_CRYPTO_SALSA20=m
1136CONFIG_CRYPTO_SEED=m
1137CONFIG_CRYPTO_SERPENT=m
1138CONFIG_CRYPTO_TEA=m
1139CONFIG_CRYPTO_TWOFISH=m
1140CONFIG_CRYPTO_TWOFISH_COMMON=m
1141
1142#
1143# Compression
1144#
1117CONFIG_CRYPTO_DEFLATE=m 1145CONFIG_CRYPTO_DEFLATE=m
1118CONFIG_CRYPTO_MICHAEL_MIC=m
1119CONFIG_CRYPTO_CRC32C=m
1120CONFIG_CRYPTO_CAMELLIA=m
1121CONFIG_CRYPTO_TEST=m
1122CONFIG_CRYPTO_AUTHENC=m
1123CONFIG_CRYPTO_LZO=m 1146CONFIG_CRYPTO_LZO=m
1124# CONFIG_CRYPTO_HW is not set 1147# CONFIG_CRYPTO_HW is not set
1125 1148
@@ -1127,9 +1150,11 @@ CONFIG_CRYPTO_LZO=m
1127# Library routines 1150# Library routines
1128# 1151#
1129CONFIG_BITREVERSE=y 1152CONFIG_BITREVERSE=y
1153# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1154# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1130CONFIG_CRC_CCITT=m 1155CONFIG_CRC_CCITT=m
1131CONFIG_CRC16=m 1156CONFIG_CRC16=m
1132# CONFIG_CRC_ITU_T is not set 1157CONFIG_CRC_ITU_T=m
1133CONFIG_CRC32=y 1158CONFIG_CRC32=y
1134# CONFIG_CRC7 is not set 1159# CONFIG_CRC7 is not set
1135CONFIG_LIBCRC32C=m 1160CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index e61196cd7fa5..c3cd5b749d2c 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:07 2008 4# Sun May 18 14:44:42 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -141,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141CONFIG_NEED_MULTIPLE_NODES=y 144CONFIG_NEED_MULTIPLE_NODES=y
142# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
143# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
147CONFIG_PAGEFLAGS_EXTENDED=y
144CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1 150CONFIG_ZONE_DMA_FLAG=1
@@ -220,8 +224,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
220CONFIG_INET6_XFRM_MODE_BEET=m 224CONFIG_INET6_XFRM_MODE_BEET=m
221CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 225CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
222CONFIG_IPV6_SIT=m 226CONFIG_IPV6_SIT=m
227CONFIG_IPV6_NDISC_NODETYPE=y
223CONFIG_IPV6_TUNNEL=m 228CONFIG_IPV6_TUNNEL=m
224# CONFIG_IPV6_MULTIPLE_TABLES is not set 229# CONFIG_IPV6_MULTIPLE_TABLES is not set
230# CONFIG_IPV6_MROUTE is not set
225# CONFIG_NETWORK_SECMARK is not set 231# CONFIG_NETWORK_SECMARK is not set
226CONFIG_NETFILTER=y 232CONFIG_NETFILTER=y
227# CONFIG_NETFILTER_DEBUG is not set 233# CONFIG_NETFILTER_DEBUG is not set
@@ -237,6 +243,7 @@ CONFIG_NF_CONNTRACK=m
237CONFIG_NF_CT_ACCT=y 243CONFIG_NF_CT_ACCT=y
238CONFIG_NF_CONNTRACK_MARK=y 244CONFIG_NF_CONNTRACK_MARK=y
239# CONFIG_NF_CONNTRACK_EVENTS is not set 245# CONFIG_NF_CONNTRACK_EVENTS is not set
246# CONFIG_NF_CT_PROTO_DCCP is not set
240CONFIG_NF_CT_PROTO_GRE=m 247CONFIG_NF_CT_PROTO_GRE=m
241CONFIG_NF_CT_PROTO_SCTP=m 248CONFIG_NF_CT_PROTO_SCTP=m
242CONFIG_NF_CT_PROTO_UDPLITE=m 249CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -315,6 +322,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
315CONFIG_IP_NF_TARGET_NETMAP=m 322CONFIG_IP_NF_TARGET_NETMAP=m
316CONFIG_NF_NAT_SNMP_BASIC=m 323CONFIG_NF_NAT_SNMP_BASIC=m
317CONFIG_NF_NAT_PROTO_GRE=m 324CONFIG_NF_NAT_PROTO_GRE=m
325CONFIG_NF_NAT_PROTO_UDPLITE=m
326CONFIG_NF_NAT_PROTO_SCTP=m
318CONFIG_NF_NAT_FTP=m 327CONFIG_NF_NAT_FTP=m
319CONFIG_NF_NAT_IRC=m 328CONFIG_NF_NAT_IRC=m
320CONFIG_NF_NAT_TFTP=m 329CONFIG_NF_NAT_TFTP=m
@@ -408,8 +417,6 @@ CONFIG_IEEE80211=m
408CONFIG_IEEE80211_CRYPT_WEP=m 417CONFIG_IEEE80211_CRYPT_WEP=m
409CONFIG_IEEE80211_CRYPT_CCMP=m 418CONFIG_IEEE80211_CRYPT_CCMP=m
410CONFIG_IEEE80211_CRYPT_TKIP=m 419CONFIG_IEEE80211_CRYPT_TKIP=m
411CONFIG_IEEE80211_SOFTMAC=m
412# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
413# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
414# CONFIG_NET_9P is not set 421# CONFIG_NET_9P is not set
415 422
@@ -539,6 +546,7 @@ CONFIG_APOLLO_ELPLUS=y
539# 546#
540# CONFIG_WLAN_PRE80211 is not set 547# CONFIG_WLAN_PRE80211 is not set
541# CONFIG_WLAN_80211 is not set 548# CONFIG_WLAN_80211 is not set
549# CONFIG_IWLWIFI_LEDS is not set
542# CONFIG_WAN is not set 550# CONFIG_WAN is not set
543CONFIG_PPP=m 551CONFIG_PPP=m
544# CONFIG_PPP_MULTILINK is not set 552# CONFIG_PPP_MULTILINK is not set
@@ -622,6 +630,7 @@ CONFIG_VT=y
622CONFIG_VT_CONSOLE=y 630CONFIG_VT_CONSOLE=y
623CONFIG_HW_CONSOLE=y 631CONFIG_HW_CONSOLE=y
624CONFIG_VT_HW_CONSOLE_BINDING=y 632CONFIG_VT_HW_CONSOLE_BINDING=y
633# CONFIG_DEVKMEM is not set
625# CONFIG_SERIAL_NONSTANDARD is not set 634# CONFIG_SERIAL_NONSTANDARD is not set
626 635
627# 636#
@@ -643,12 +652,7 @@ CONFIG_GEN_RTC_X=y
643# CONFIG_RAW_DRIVER is not set 652# CONFIG_RAW_DRIVER is not set
644# CONFIG_TCG_TPM is not set 653# CONFIG_TCG_TPM is not set
645# CONFIG_I2C is not set 654# CONFIG_I2C is not set
646
647#
648# SPI support
649#
650# CONFIG_SPI is not set 655# CONFIG_SPI is not set
651# CONFIG_SPI_MASTER is not set
652# CONFIG_W1 is not set 656# CONFIG_W1 is not set
653# CONFIG_POWER_SUPPLY is not set 657# CONFIG_POWER_SUPPLY is not set
654# CONFIG_HWMON is not set 658# CONFIG_HWMON is not set
@@ -665,12 +669,22 @@ CONFIG_SSB_POSSIBLE=y
665# Multifunction device drivers 669# Multifunction device drivers
666# 670#
667# CONFIG_MFD_SM501 is not set 671# CONFIG_MFD_SM501 is not set
672# CONFIG_HTC_PASIC3 is not set
668 673
669# 674#
670# Multimedia devices 675# Multimedia devices
671# 676#
677
678#
679# Multimedia core support
680#
672# CONFIG_VIDEO_DEV is not set 681# CONFIG_VIDEO_DEV is not set
673# CONFIG_DVB_CORE is not set 682# CONFIG_DVB_CORE is not set
683# CONFIG_VIDEO_MEDIA is not set
684
685#
686# Multimedia drivers
687#
674# CONFIG_DAB is not set 688# CONFIG_DAB is not set
675 689
676# 690#
@@ -688,8 +702,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
688# CONFIG_FB_SYS_FILLRECT is not set 702# CONFIG_FB_SYS_FILLRECT is not set
689# CONFIG_FB_SYS_COPYAREA is not set 703# CONFIG_FB_SYS_COPYAREA is not set
690# CONFIG_FB_SYS_IMAGEBLIT is not set 704# CONFIG_FB_SYS_IMAGEBLIT is not set
705# CONFIG_FB_FOREIGN_ENDIAN is not set
691# CONFIG_FB_SYS_FOPS is not set 706# CONFIG_FB_SYS_FOPS is not set
692CONFIG_FB_DEFERRED_IO=y
693# CONFIG_FB_SVGALIB is not set 707# CONFIG_FB_SVGALIB is not set
694# CONFIG_FB_MACMODES is not set 708# CONFIG_FB_MACMODES is not set
695# CONFIG_FB_BACKLIGHT is not set 709# CONFIG_FB_BACKLIGHT is not set
@@ -737,11 +751,8 @@ CONFIG_HIDRAW=y
737# CONFIG_MMC is not set 751# CONFIG_MMC is not set
738# CONFIG_MEMSTICK is not set 752# CONFIG_MEMSTICK is not set
739# CONFIG_NEW_LEDS is not set 753# CONFIG_NEW_LEDS is not set
754# CONFIG_ACCESSIBILITY is not set
740# CONFIG_RTC_CLASS is not set 755# CONFIG_RTC_CLASS is not set
741
742#
743# Userspace I/O
744#
745# CONFIG_UIO is not set 756# CONFIG_UIO is not set
746 757
747# 758#
@@ -769,16 +780,15 @@ CONFIG_JFS_FS=m
769# CONFIG_JFS_SECURITY is not set 780# CONFIG_JFS_SECURITY is not set
770# CONFIG_JFS_DEBUG is not set 781# CONFIG_JFS_DEBUG is not set
771# CONFIG_JFS_STATISTICS is not set 782# CONFIG_JFS_STATISTICS is not set
772CONFIG_FS_POSIX_ACL=y 783# CONFIG_FS_POSIX_ACL is not set
773CONFIG_XFS_FS=m 784CONFIG_XFS_FS=m
774# CONFIG_XFS_QUOTA is not set 785# CONFIG_XFS_QUOTA is not set
775# CONFIG_XFS_SECURITY is not set
776# CONFIG_XFS_POSIX_ACL is not set 786# CONFIG_XFS_POSIX_ACL is not set
777# CONFIG_XFS_RT is not set 787# CONFIG_XFS_RT is not set
778CONFIG_GFS2_FS=m 788# CONFIG_XFS_DEBUG is not set
779CONFIG_GFS2_FS_LOCKING_NOLOCK=m
780CONFIG_GFS2_FS_LOCKING_DLM=m
781CONFIG_OCFS2_FS=m 789CONFIG_OCFS2_FS=m
790CONFIG_OCFS2_FS_O2CB=m
791CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
782# CONFIG_OCFS2_DEBUG_MASKLOG is not set 792# CONFIG_OCFS2_DEBUG_MASKLOG is not set
783# CONFIG_OCFS2_DEBUG_FS is not set 793# CONFIG_OCFS2_DEBUG_FS is not set
784CONFIG_DNOTIFY=y 794CONFIG_DNOTIFY=y
@@ -850,12 +860,10 @@ CONFIG_NFS_FS=y
850CONFIG_NFS_V3=y 860CONFIG_NFS_V3=y
851# CONFIG_NFS_V3_ACL is not set 861# CONFIG_NFS_V3_ACL is not set
852CONFIG_NFS_V4=y 862CONFIG_NFS_V4=y
853# CONFIG_NFS_DIRECTIO is not set
854CONFIG_NFSD=m 863CONFIG_NFSD=m
855CONFIG_NFSD_V3=y 864CONFIG_NFSD_V3=y
856# CONFIG_NFSD_V3_ACL is not set 865# CONFIG_NFSD_V3_ACL is not set
857# CONFIG_NFSD_V4 is not set 866# CONFIG_NFSD_V4 is not set
858CONFIG_NFSD_TCP=y
859CONFIG_ROOT_NFS=y 867CONFIG_ROOT_NFS=y
860CONFIG_LOCKD=y 868CONFIG_LOCKD=y
861CONFIG_LOCKD_V4=y 869CONFIG_LOCKD_V4=y
@@ -929,6 +937,7 @@ CONFIG_DLM=m
929# CONFIG_PRINTK_TIME is not set 937# CONFIG_PRINTK_TIME is not set
930CONFIG_ENABLE_WARN_DEPRECATED=y 938CONFIG_ENABLE_WARN_DEPRECATED=y
931CONFIG_ENABLE_MUST_CHECK=y 939CONFIG_ENABLE_MUST_CHECK=y
940CONFIG_FRAME_WARN=1024
932CONFIG_MAGIC_SYSRQ=y 941CONFIG_MAGIC_SYSRQ=y
933# CONFIG_UNUSED_SYMBOLS is not set 942# CONFIG_UNUSED_SYMBOLS is not set
934# CONFIG_DEBUG_FS is not set 943# CONFIG_DEBUG_FS is not set
@@ -948,53 +957,82 @@ CONFIG_ASYNC_CORE=m
948CONFIG_ASYNC_MEMCPY=m 957CONFIG_ASYNC_MEMCPY=m
949CONFIG_ASYNC_XOR=m 958CONFIG_ASYNC_XOR=m
950CONFIG_CRYPTO=y 959CONFIG_CRYPTO=y
960
961#
962# Crypto core or helper
963#
951CONFIG_CRYPTO_ALGAPI=y 964CONFIG_CRYPTO_ALGAPI=y
952CONFIG_CRYPTO_AEAD=m 965CONFIG_CRYPTO_AEAD=m
953CONFIG_CRYPTO_BLKCIPHER=y 966CONFIG_CRYPTO_BLKCIPHER=y
954CONFIG_CRYPTO_SEQIV=m
955CONFIG_CRYPTO_HASH=y 967CONFIG_CRYPTO_HASH=y
956CONFIG_CRYPTO_MANAGER=y 968CONFIG_CRYPTO_MANAGER=y
969CONFIG_CRYPTO_GF128MUL=m
970CONFIG_CRYPTO_NULL=m
971CONFIG_CRYPTO_CRYPTD=m
972CONFIG_CRYPTO_AUTHENC=m
973CONFIG_CRYPTO_TEST=m
974
975#
976# Authenticated Encryption with Associated Data
977#
978CONFIG_CRYPTO_CCM=m
979CONFIG_CRYPTO_GCM=m
980CONFIG_CRYPTO_SEQIV=m
981
982#
983# Block modes
984#
985CONFIG_CRYPTO_CBC=y
986CONFIG_CRYPTO_CTR=m
987CONFIG_CRYPTO_CTS=m
988CONFIG_CRYPTO_ECB=m
989CONFIG_CRYPTO_LRW=m
990CONFIG_CRYPTO_PCBC=m
991CONFIG_CRYPTO_XTS=m
992
993#
994# Hash modes
995#
957CONFIG_CRYPTO_HMAC=y 996CONFIG_CRYPTO_HMAC=y
958CONFIG_CRYPTO_XCBC=m 997CONFIG_CRYPTO_XCBC=m
959CONFIG_CRYPTO_NULL=m 998
999#
1000# Digest
1001#
1002CONFIG_CRYPTO_CRC32C=m
960CONFIG_CRYPTO_MD4=m 1003CONFIG_CRYPTO_MD4=m
961CONFIG_CRYPTO_MD5=y 1004CONFIG_CRYPTO_MD5=y
1005CONFIG_CRYPTO_MICHAEL_MIC=m
962CONFIG_CRYPTO_SHA1=m 1006CONFIG_CRYPTO_SHA1=m
963CONFIG_CRYPTO_SHA256=m 1007CONFIG_CRYPTO_SHA256=m
964CONFIG_CRYPTO_SHA512=m 1008CONFIG_CRYPTO_SHA512=m
965CONFIG_CRYPTO_WP512=m
966CONFIG_CRYPTO_TGR192=m 1009CONFIG_CRYPTO_TGR192=m
967CONFIG_CRYPTO_GF128MUL=m 1010CONFIG_CRYPTO_WP512=m
968CONFIG_CRYPTO_ECB=m 1011
969CONFIG_CRYPTO_CBC=y 1012#
970CONFIG_CRYPTO_PCBC=m 1013# Ciphers
971CONFIG_CRYPTO_LRW=m 1014#
972CONFIG_CRYPTO_XTS=m
973CONFIG_CRYPTO_CTR=m
974CONFIG_CRYPTO_GCM=m
975CONFIG_CRYPTO_CCM=m
976CONFIG_CRYPTO_CRYPTD=m
977CONFIG_CRYPTO_DES=y
978CONFIG_CRYPTO_FCRYPT=m
979CONFIG_CRYPTO_BLOWFISH=m
980CONFIG_CRYPTO_TWOFISH=m
981CONFIG_CRYPTO_TWOFISH_COMMON=m
982CONFIG_CRYPTO_SERPENT=m
983CONFIG_CRYPTO_AES=m 1015CONFIG_CRYPTO_AES=m
1016CONFIG_CRYPTO_ANUBIS=m
1017CONFIG_CRYPTO_ARC4=m
1018CONFIG_CRYPTO_BLOWFISH=m
1019CONFIG_CRYPTO_CAMELLIA=m
984CONFIG_CRYPTO_CAST5=m 1020CONFIG_CRYPTO_CAST5=m
985CONFIG_CRYPTO_CAST6=m 1021CONFIG_CRYPTO_CAST6=m
986CONFIG_CRYPTO_TEA=m 1022CONFIG_CRYPTO_DES=y
987CONFIG_CRYPTO_ARC4=m 1023CONFIG_CRYPTO_FCRYPT=m
988CONFIG_CRYPTO_KHAZAD=m 1024CONFIG_CRYPTO_KHAZAD=m
989CONFIG_CRYPTO_ANUBIS=m
990CONFIG_CRYPTO_SEED=m
991CONFIG_CRYPTO_SALSA20=m 1025CONFIG_CRYPTO_SALSA20=m
1026CONFIG_CRYPTO_SEED=m
1027CONFIG_CRYPTO_SERPENT=m
1028CONFIG_CRYPTO_TEA=m
1029CONFIG_CRYPTO_TWOFISH=m
1030CONFIG_CRYPTO_TWOFISH_COMMON=m
1031
1032#
1033# Compression
1034#
992CONFIG_CRYPTO_DEFLATE=m 1035CONFIG_CRYPTO_DEFLATE=m
993CONFIG_CRYPTO_MICHAEL_MIC=m
994CONFIG_CRYPTO_CRC32C=m
995CONFIG_CRYPTO_CAMELLIA=m
996CONFIG_CRYPTO_TEST=m
997CONFIG_CRYPTO_AUTHENC=m
998CONFIG_CRYPTO_LZO=m 1036CONFIG_CRYPTO_LZO=m
999# CONFIG_CRYPTO_HW is not set 1037# CONFIG_CRYPTO_HW is not set
1000 1038
@@ -1002,9 +1040,11 @@ CONFIG_CRYPTO_LZO=m
1002# Library routines 1040# Library routines
1003# 1041#
1004CONFIG_BITREVERSE=y 1042CONFIG_BITREVERSE=y
1043# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1044# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1005CONFIG_CRC_CCITT=m 1045CONFIG_CRC_CCITT=m
1006CONFIG_CRC16=m 1046CONFIG_CRC16=m
1007# CONFIG_CRC_ITU_T is not set 1047CONFIG_CRC_ITU_T=m
1008CONFIG_CRC32=y 1048CONFIG_CRC32=y
1009# CONFIG_CRC7 is not set 1049# CONFIG_CRC7 is not set
1010CONFIG_LIBCRC32C=m 1050CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index ba7f971bb026..073ae4bbe264 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:09 2008 4# Sun May 18 14:44:43 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -141,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141CONFIG_NEED_MULTIPLE_NODES=y 144CONFIG_NEED_MULTIPLE_NODES=y
142# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
143# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
147CONFIG_PAGEFLAGS_EXTENDED=y
144CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1 150CONFIG_ZONE_DMA_FLAG=1
@@ -218,8 +222,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
218CONFIG_INET6_XFRM_MODE_BEET=m 222CONFIG_INET6_XFRM_MODE_BEET=m
219CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 223CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
220CONFIG_IPV6_SIT=m 224CONFIG_IPV6_SIT=m
225CONFIG_IPV6_NDISC_NODETYPE=y
221CONFIG_IPV6_TUNNEL=m 226CONFIG_IPV6_TUNNEL=m
222# CONFIG_IPV6_MULTIPLE_TABLES is not set 227# CONFIG_IPV6_MULTIPLE_TABLES is not set
228# CONFIG_IPV6_MROUTE is not set
223# CONFIG_NETWORK_SECMARK is not set 229# CONFIG_NETWORK_SECMARK is not set
224CONFIG_NETFILTER=y 230CONFIG_NETFILTER=y
225# CONFIG_NETFILTER_DEBUG is not set 231# CONFIG_NETFILTER_DEBUG is not set
@@ -235,6 +241,7 @@ CONFIG_NF_CONNTRACK=m
235CONFIG_NF_CT_ACCT=y 241CONFIG_NF_CT_ACCT=y
236CONFIG_NF_CONNTRACK_MARK=y 242CONFIG_NF_CONNTRACK_MARK=y
237# CONFIG_NF_CONNTRACK_EVENTS is not set 243# CONFIG_NF_CONNTRACK_EVENTS is not set
244# CONFIG_NF_CT_PROTO_DCCP is not set
238CONFIG_NF_CT_PROTO_GRE=m 245CONFIG_NF_CT_PROTO_GRE=m
239CONFIG_NF_CT_PROTO_SCTP=m 246CONFIG_NF_CT_PROTO_SCTP=m
240CONFIG_NF_CT_PROTO_UDPLITE=m 247CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -313,6 +320,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
313CONFIG_IP_NF_TARGET_NETMAP=m 320CONFIG_IP_NF_TARGET_NETMAP=m
314CONFIG_NF_NAT_SNMP_BASIC=m 321CONFIG_NF_NAT_SNMP_BASIC=m
315CONFIG_NF_NAT_PROTO_GRE=m 322CONFIG_NF_NAT_PROTO_GRE=m
323CONFIG_NF_NAT_PROTO_UDPLITE=m
324CONFIG_NF_NAT_PROTO_SCTP=m
316CONFIG_NF_NAT_FTP=m 325CONFIG_NF_NAT_FTP=m
317CONFIG_NF_NAT_IRC=m 326CONFIG_NF_NAT_IRC=m
318CONFIG_NF_NAT_TFTP=m 327CONFIG_NF_NAT_TFTP=m
@@ -406,8 +415,6 @@ CONFIG_IEEE80211=m
406CONFIG_IEEE80211_CRYPT_WEP=m 415CONFIG_IEEE80211_CRYPT_WEP=m
407CONFIG_IEEE80211_CRYPT_CCMP=m 416CONFIG_IEEE80211_CRYPT_CCMP=m
408CONFIG_IEEE80211_CRYPT_TKIP=m 417CONFIG_IEEE80211_CRYPT_TKIP=m
409CONFIG_IEEE80211_SOFTMAC=m
410# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
411# CONFIG_RFKILL is not set 418# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 419# CONFIG_NET_9P is not set
413 420
@@ -469,11 +476,10 @@ CONFIG_IDE_PROC_FS=y
469# 476#
470# IDE chipset support/bugfixes 477# IDE chipset support/bugfixes
471# 478#
472# CONFIG_IDE_GENERIC is not set
473# CONFIG_BLK_DEV_PLATFORM is not set 479# CONFIG_BLK_DEV_PLATFORM is not set
474CONFIG_BLK_DEV_FALCON_IDE=y 480CONFIG_BLK_DEV_FALCON_IDE=y
475# CONFIG_BLK_DEV_IDEDMA is not set 481# CONFIG_BLK_DEV_IDEDMA is not set
476# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set 482# CONFIG_BLK_DEV_HD_ONLY is not set
477# CONFIG_BLK_DEV_HD is not set 483# CONFIG_BLK_DEV_HD is not set
478 484
479# 485#
@@ -572,6 +578,7 @@ CONFIG_ATARILANCE=m
572# 578#
573# CONFIG_WLAN_PRE80211 is not set 579# CONFIG_WLAN_PRE80211 is not set
574# CONFIG_WLAN_80211 is not set 580# CONFIG_WLAN_80211 is not set
581# CONFIG_IWLWIFI_LEDS is not set
575# CONFIG_WAN is not set 582# CONFIG_WAN is not set
576# CONFIG_PLIP is not set 583# CONFIG_PLIP is not set
577CONFIG_PPP=m 584CONFIG_PPP=m
@@ -662,6 +669,7 @@ CONFIG_VT=y
662CONFIG_VT_CONSOLE=y 669CONFIG_VT_CONSOLE=y
663CONFIG_HW_CONSOLE=y 670CONFIG_HW_CONSOLE=y
664CONFIG_VT_HW_CONSOLE_BINDING=y 671CONFIG_VT_HW_CONSOLE_BINDING=y
672# CONFIG_DEVKMEM is not set
665# CONFIG_SERIAL_NONSTANDARD is not set 673# CONFIG_SERIAL_NONSTANDARD is not set
666 674
667# 675#
@@ -687,12 +695,7 @@ CONFIG_GEN_RTC_X=y
687# CONFIG_RAW_DRIVER is not set 695# CONFIG_RAW_DRIVER is not set
688# CONFIG_TCG_TPM is not set 696# CONFIG_TCG_TPM is not set
689# CONFIG_I2C is not set 697# CONFIG_I2C is not set
690
691#
692# SPI support
693#
694# CONFIG_SPI is not set 698# CONFIG_SPI is not set
695# CONFIG_SPI_MASTER is not set
696# CONFIG_W1 is not set 699# CONFIG_W1 is not set
697# CONFIG_POWER_SUPPLY is not set 700# CONFIG_POWER_SUPPLY is not set
698# CONFIG_HWMON is not set 701# CONFIG_HWMON is not set
@@ -709,12 +712,22 @@ CONFIG_SSB_POSSIBLE=y
709# Multifunction device drivers 712# Multifunction device drivers
710# 713#
711# CONFIG_MFD_SM501 is not set 714# CONFIG_MFD_SM501 is not set
715# CONFIG_HTC_PASIC3 is not set
712 716
713# 717#
714# Multimedia devices 718# Multimedia devices
715# 719#
720
721#
722# Multimedia core support
723#
716# CONFIG_VIDEO_DEV is not set 724# CONFIG_VIDEO_DEV is not set
717# CONFIG_DVB_CORE is not set 725# CONFIG_DVB_CORE is not set
726# CONFIG_VIDEO_MEDIA is not set
727
728#
729# Multimedia drivers
730#
718# CONFIG_DAB is not set 731# CONFIG_DAB is not set
719 732
720# 733#
@@ -732,8 +745,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
732# CONFIG_FB_SYS_FILLRECT is not set 745# CONFIG_FB_SYS_FILLRECT is not set
733# CONFIG_FB_SYS_COPYAREA is not set 746# CONFIG_FB_SYS_COPYAREA is not set
734# CONFIG_FB_SYS_IMAGEBLIT is not set 747# CONFIG_FB_SYS_IMAGEBLIT is not set
748# CONFIG_FB_FOREIGN_ENDIAN is not set
735# CONFIG_FB_SYS_FOPS is not set 749# CONFIG_FB_SYS_FOPS is not set
736CONFIG_FB_DEFERRED_IO=y
737# CONFIG_FB_SVGALIB is not set 750# CONFIG_FB_SVGALIB is not set
738# CONFIG_FB_MACMODES is not set 751# CONFIG_FB_MACMODES is not set
739# CONFIG_FB_BACKLIGHT is not set 752# CONFIG_FB_BACKLIGHT is not set
@@ -784,12 +797,9 @@ CONFIG_HIDRAW=y
784# CONFIG_MMC is not set 797# CONFIG_MMC is not set
785# CONFIG_MEMSTICK is not set 798# CONFIG_MEMSTICK is not set
786# CONFIG_NEW_LEDS is not set 799# CONFIG_NEW_LEDS is not set
800# CONFIG_ACCESSIBILITY is not set
787# CONFIG_RTC_CLASS is not set 801# CONFIG_RTC_CLASS is not set
788# CONFIG_AUXDISPLAY is not set 802# CONFIG_AUXDISPLAY is not set
789
790#
791# Userspace I/O
792#
793# CONFIG_UIO is not set 803# CONFIG_UIO is not set
794 804
795# 805#
@@ -821,16 +831,15 @@ CONFIG_JFS_FS=m
821# CONFIG_JFS_SECURITY is not set 831# CONFIG_JFS_SECURITY is not set
822# CONFIG_JFS_DEBUG is not set 832# CONFIG_JFS_DEBUG is not set
823# CONFIG_JFS_STATISTICS is not set 833# CONFIG_JFS_STATISTICS is not set
824CONFIG_FS_POSIX_ACL=y 834# CONFIG_FS_POSIX_ACL is not set
825CONFIG_XFS_FS=m 835CONFIG_XFS_FS=m
826# CONFIG_XFS_QUOTA is not set 836# CONFIG_XFS_QUOTA is not set
827# CONFIG_XFS_SECURITY is not set
828# CONFIG_XFS_POSIX_ACL is not set 837# CONFIG_XFS_POSIX_ACL is not set
829# CONFIG_XFS_RT is not set 838# CONFIG_XFS_RT is not set
830CONFIG_GFS2_FS=m 839# CONFIG_XFS_DEBUG is not set
831CONFIG_GFS2_FS_LOCKING_NOLOCK=m
832CONFIG_GFS2_FS_LOCKING_DLM=m
833CONFIG_OCFS2_FS=m 840CONFIG_OCFS2_FS=m
841CONFIG_OCFS2_FS_O2CB=m
842CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
834# CONFIG_OCFS2_DEBUG_MASKLOG is not set 843# CONFIG_OCFS2_DEBUG_MASKLOG is not set
835# CONFIG_OCFS2_DEBUG_FS is not set 844# CONFIG_OCFS2_DEBUG_FS is not set
836CONFIG_DNOTIFY=y 845CONFIG_DNOTIFY=y
@@ -902,12 +911,10 @@ CONFIG_NFS_FS=m
902CONFIG_NFS_V3=y 911CONFIG_NFS_V3=y
903# CONFIG_NFS_V3_ACL is not set 912# CONFIG_NFS_V3_ACL is not set
904# CONFIG_NFS_V4 is not set 913# CONFIG_NFS_V4 is not set
905# CONFIG_NFS_DIRECTIO is not set
906CONFIG_NFSD=m 914CONFIG_NFSD=m
907CONFIG_NFSD_V3=y 915CONFIG_NFSD_V3=y
908# CONFIG_NFSD_V3_ACL is not set 916# CONFIG_NFSD_V3_ACL is not set
909# CONFIG_NFSD_V4 is not set 917# CONFIG_NFSD_V4 is not set
910CONFIG_NFSD_TCP=y
911CONFIG_LOCKD=m 918CONFIG_LOCKD=m
912CONFIG_LOCKD_V4=y 919CONFIG_LOCKD_V4=y
913CONFIG_EXPORTFS=m 920CONFIG_EXPORTFS=m
@@ -980,6 +987,7 @@ CONFIG_DLM=m
980# CONFIG_PRINTK_TIME is not set 987# CONFIG_PRINTK_TIME is not set
981CONFIG_ENABLE_WARN_DEPRECATED=y 988CONFIG_ENABLE_WARN_DEPRECATED=y
982CONFIG_ENABLE_MUST_CHECK=y 989CONFIG_ENABLE_MUST_CHECK=y
990CONFIG_FRAME_WARN=1024
983CONFIG_MAGIC_SYSRQ=y 991CONFIG_MAGIC_SYSRQ=y
984# CONFIG_UNUSED_SYMBOLS is not set 992# CONFIG_UNUSED_SYMBOLS is not set
985# CONFIG_DEBUG_FS is not set 993# CONFIG_DEBUG_FS is not set
@@ -999,53 +1007,82 @@ CONFIG_ASYNC_CORE=m
999CONFIG_ASYNC_MEMCPY=m 1007CONFIG_ASYNC_MEMCPY=m
1000CONFIG_ASYNC_XOR=m 1008CONFIG_ASYNC_XOR=m
1001CONFIG_CRYPTO=y 1009CONFIG_CRYPTO=y
1010
1011#
1012# Crypto core or helper
1013#
1002CONFIG_CRYPTO_ALGAPI=y 1014CONFIG_CRYPTO_ALGAPI=y
1003CONFIG_CRYPTO_AEAD=m 1015CONFIG_CRYPTO_AEAD=m
1004CONFIG_CRYPTO_BLKCIPHER=m 1016CONFIG_CRYPTO_BLKCIPHER=m
1005CONFIG_CRYPTO_SEQIV=m
1006CONFIG_CRYPTO_HASH=y 1017CONFIG_CRYPTO_HASH=y
1007CONFIG_CRYPTO_MANAGER=y 1018CONFIG_CRYPTO_MANAGER=y
1019CONFIG_CRYPTO_GF128MUL=m
1020CONFIG_CRYPTO_NULL=m
1021CONFIG_CRYPTO_CRYPTD=m
1022CONFIG_CRYPTO_AUTHENC=m
1023CONFIG_CRYPTO_TEST=m
1024
1025#
1026# Authenticated Encryption with Associated Data
1027#
1028CONFIG_CRYPTO_CCM=m
1029CONFIG_CRYPTO_GCM=m
1030CONFIG_CRYPTO_SEQIV=m
1031
1032#
1033# Block modes
1034#
1035CONFIG_CRYPTO_CBC=m
1036CONFIG_CRYPTO_CTR=m
1037CONFIG_CRYPTO_CTS=m
1038CONFIG_CRYPTO_ECB=m
1039CONFIG_CRYPTO_LRW=m
1040CONFIG_CRYPTO_PCBC=m
1041CONFIG_CRYPTO_XTS=m
1042
1043#
1044# Hash modes
1045#
1008CONFIG_CRYPTO_HMAC=y 1046CONFIG_CRYPTO_HMAC=y
1009CONFIG_CRYPTO_XCBC=m 1047CONFIG_CRYPTO_XCBC=m
1010CONFIG_CRYPTO_NULL=m 1048
1049#
1050# Digest
1051#
1052CONFIG_CRYPTO_CRC32C=m
1011CONFIG_CRYPTO_MD4=m 1053CONFIG_CRYPTO_MD4=m
1012CONFIG_CRYPTO_MD5=m 1054CONFIG_CRYPTO_MD5=m
1055CONFIG_CRYPTO_MICHAEL_MIC=m
1013CONFIG_CRYPTO_SHA1=m 1056CONFIG_CRYPTO_SHA1=m
1014CONFIG_CRYPTO_SHA256=m 1057CONFIG_CRYPTO_SHA256=m
1015CONFIG_CRYPTO_SHA512=m 1058CONFIG_CRYPTO_SHA512=m
1016CONFIG_CRYPTO_WP512=m
1017CONFIG_CRYPTO_TGR192=m 1059CONFIG_CRYPTO_TGR192=m
1018CONFIG_CRYPTO_GF128MUL=m 1060CONFIG_CRYPTO_WP512=m
1019CONFIG_CRYPTO_ECB=m 1061
1020CONFIG_CRYPTO_CBC=m 1062#
1021CONFIG_CRYPTO_PCBC=m 1063# Ciphers
1022CONFIG_CRYPTO_LRW=m 1064#
1023CONFIG_CRYPTO_XTS=m
1024CONFIG_CRYPTO_CTR=m
1025CONFIG_CRYPTO_GCM=m
1026CONFIG_CRYPTO_CCM=m
1027CONFIG_CRYPTO_CRYPTD=m
1028CONFIG_CRYPTO_DES=m
1029CONFIG_CRYPTO_FCRYPT=m
1030CONFIG_CRYPTO_BLOWFISH=m
1031CONFIG_CRYPTO_TWOFISH=m
1032CONFIG_CRYPTO_TWOFISH_COMMON=m
1033CONFIG_CRYPTO_SERPENT=m
1034CONFIG_CRYPTO_AES=m 1065CONFIG_CRYPTO_AES=m
1066CONFIG_CRYPTO_ANUBIS=m
1067CONFIG_CRYPTO_ARC4=m
1068CONFIG_CRYPTO_BLOWFISH=m
1069CONFIG_CRYPTO_CAMELLIA=m
1035CONFIG_CRYPTO_CAST5=m 1070CONFIG_CRYPTO_CAST5=m
1036CONFIG_CRYPTO_CAST6=m 1071CONFIG_CRYPTO_CAST6=m
1037CONFIG_CRYPTO_TEA=m 1072CONFIG_CRYPTO_DES=m
1038CONFIG_CRYPTO_ARC4=m 1073CONFIG_CRYPTO_FCRYPT=m
1039CONFIG_CRYPTO_KHAZAD=m 1074CONFIG_CRYPTO_KHAZAD=m
1040CONFIG_CRYPTO_ANUBIS=m
1041CONFIG_CRYPTO_SEED=m
1042CONFIG_CRYPTO_SALSA20=m 1075CONFIG_CRYPTO_SALSA20=m
1076CONFIG_CRYPTO_SEED=m
1077CONFIG_CRYPTO_SERPENT=m
1078CONFIG_CRYPTO_TEA=m
1079CONFIG_CRYPTO_TWOFISH=m
1080CONFIG_CRYPTO_TWOFISH_COMMON=m
1081
1082#
1083# Compression
1084#
1043CONFIG_CRYPTO_DEFLATE=m 1085CONFIG_CRYPTO_DEFLATE=m
1044CONFIG_CRYPTO_MICHAEL_MIC=m
1045CONFIG_CRYPTO_CRC32C=m
1046CONFIG_CRYPTO_CAMELLIA=m
1047CONFIG_CRYPTO_TEST=m
1048CONFIG_CRYPTO_AUTHENC=m
1049CONFIG_CRYPTO_LZO=m 1086CONFIG_CRYPTO_LZO=m
1050# CONFIG_CRYPTO_HW is not set 1087# CONFIG_CRYPTO_HW is not set
1051 1088
@@ -1053,9 +1090,11 @@ CONFIG_CRYPTO_LZO=m
1053# Library routines 1090# Library routines
1054# 1091#
1055CONFIG_BITREVERSE=y 1092CONFIG_BITREVERSE=y
1093# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1094# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1056CONFIG_CRC_CCITT=m 1095CONFIG_CRC_CCITT=m
1057CONFIG_CRC16=y 1096CONFIG_CRC16=y
1058# CONFIG_CRC_ITU_T is not set 1097CONFIG_CRC_ITU_T=m
1059CONFIG_CRC32=y 1098CONFIG_CRC32=y
1060# CONFIG_CRC7 is not set 1099# CONFIG_CRC7 is not set
1061CONFIG_LIBCRC32C=m 1100CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index ed98eff708c4..0789ede2e9ee 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:10 2008 4# Sun May 18 14:44:45 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -144,6 +147,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
144CONFIG_NEED_MULTIPLE_NODES=y 147CONFIG_NEED_MULTIPLE_NODES=y
145# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 149# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
150CONFIG_PAGEFLAGS_EXTENDED=y
147CONFIG_SPLIT_PTLOCK_CPUS=4 151CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set 152# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1 153CONFIG_ZONE_DMA_FLAG=1
@@ -222,8 +226,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
222CONFIG_INET6_XFRM_MODE_BEET=m 226CONFIG_INET6_XFRM_MODE_BEET=m
223CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 227CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
224CONFIG_IPV6_SIT=m 228CONFIG_IPV6_SIT=m
229CONFIG_IPV6_NDISC_NODETYPE=y
225CONFIG_IPV6_TUNNEL=m 230CONFIG_IPV6_TUNNEL=m
226# CONFIG_IPV6_MULTIPLE_TABLES is not set 231# CONFIG_IPV6_MULTIPLE_TABLES is not set
232# CONFIG_IPV6_MROUTE is not set
227# CONFIG_NETWORK_SECMARK is not set 233# CONFIG_NETWORK_SECMARK is not set
228CONFIG_NETFILTER=y 234CONFIG_NETFILTER=y
229# CONFIG_NETFILTER_DEBUG is not set 235# CONFIG_NETFILTER_DEBUG is not set
@@ -239,6 +245,7 @@ CONFIG_NF_CONNTRACK=m
239CONFIG_NF_CT_ACCT=y 245CONFIG_NF_CT_ACCT=y
240CONFIG_NF_CONNTRACK_MARK=y 246CONFIG_NF_CONNTRACK_MARK=y
241# CONFIG_NF_CONNTRACK_EVENTS is not set 247# CONFIG_NF_CONNTRACK_EVENTS is not set
248# CONFIG_NF_CT_PROTO_DCCP is not set
242CONFIG_NF_CT_PROTO_GRE=m 249CONFIG_NF_CT_PROTO_GRE=m
243CONFIG_NF_CT_PROTO_SCTP=m 250CONFIG_NF_CT_PROTO_SCTP=m
244CONFIG_NF_CT_PROTO_UDPLITE=m 251CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -317,6 +324,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
317CONFIG_IP_NF_TARGET_NETMAP=m 324CONFIG_IP_NF_TARGET_NETMAP=m
318CONFIG_NF_NAT_SNMP_BASIC=m 325CONFIG_NF_NAT_SNMP_BASIC=m
319CONFIG_NF_NAT_PROTO_GRE=m 326CONFIG_NF_NAT_PROTO_GRE=m
327CONFIG_NF_NAT_PROTO_UDPLITE=m
328CONFIG_NF_NAT_PROTO_SCTP=m
320CONFIG_NF_NAT_FTP=m 329CONFIG_NF_NAT_FTP=m
321CONFIG_NF_NAT_IRC=m 330CONFIG_NF_NAT_IRC=m
322CONFIG_NF_NAT_TFTP=m 331CONFIG_NF_NAT_TFTP=m
@@ -410,8 +419,6 @@ CONFIG_IEEE80211=m
410CONFIG_IEEE80211_CRYPT_WEP=m 419CONFIG_IEEE80211_CRYPT_WEP=m
411CONFIG_IEEE80211_CRYPT_CCMP=m 420CONFIG_IEEE80211_CRYPT_CCMP=m
412CONFIG_IEEE80211_CRYPT_TKIP=m 421CONFIG_IEEE80211_CRYPT_TKIP=m
413CONFIG_IEEE80211_SOFTMAC=m
414# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
415# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
417 424
@@ -543,6 +550,7 @@ CONFIG_BVME6000_NET=y
543# 550#
544# CONFIG_WLAN_PRE80211 is not set 551# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set 552# CONFIG_WLAN_80211 is not set
553# CONFIG_IWLWIFI_LEDS is not set
546# CONFIG_WAN is not set 554# CONFIG_WAN is not set
547CONFIG_PPP=m 555CONFIG_PPP=m
548# CONFIG_PPP_MULTILINK is not set 556# CONFIG_PPP_MULTILINK is not set
@@ -626,6 +634,7 @@ CONFIG_VT=y
626CONFIG_VT_CONSOLE=y 634CONFIG_VT_CONSOLE=y
627CONFIG_HW_CONSOLE=y 635CONFIG_HW_CONSOLE=y
628CONFIG_VT_HW_CONSOLE_BINDING=y 636CONFIG_VT_HW_CONSOLE_BINDING=y
637# CONFIG_DEVKMEM is not set
629# CONFIG_SERIAL_NONSTANDARD is not set 638# CONFIG_SERIAL_NONSTANDARD is not set
630 639
631# 640#
@@ -647,12 +656,7 @@ CONFIG_GEN_RTC_X=y
647# CONFIG_RAW_DRIVER is not set 656# CONFIG_RAW_DRIVER is not set
648# CONFIG_TCG_TPM is not set 657# CONFIG_TCG_TPM is not set
649# CONFIG_I2C is not set 658# CONFIG_I2C is not set
650
651#
652# SPI support
653#
654# CONFIG_SPI is not set 659# CONFIG_SPI is not set
655# CONFIG_SPI_MASTER is not set
656# CONFIG_W1 is not set 660# CONFIG_W1 is not set
657# CONFIG_POWER_SUPPLY is not set 661# CONFIG_POWER_SUPPLY is not set
658# CONFIG_HWMON is not set 662# CONFIG_HWMON is not set
@@ -669,12 +673,22 @@ CONFIG_SSB_POSSIBLE=y
669# Multifunction device drivers 673# Multifunction device drivers
670# 674#
671# CONFIG_MFD_SM501 is not set 675# CONFIG_MFD_SM501 is not set
676# CONFIG_HTC_PASIC3 is not set
672 677
673# 678#
674# Multimedia devices 679# Multimedia devices
675# 680#
681
682#
683# Multimedia core support
684#
676# CONFIG_VIDEO_DEV is not set 685# CONFIG_VIDEO_DEV is not set
677# CONFIG_DVB_CORE is not set 686# CONFIG_DVB_CORE is not set
687# CONFIG_VIDEO_MEDIA is not set
688
689#
690# Multimedia drivers
691#
678# CONFIG_DAB is not set 692# CONFIG_DAB is not set
679 693
680# 694#
@@ -707,11 +721,8 @@ CONFIG_HIDRAW=y
707# CONFIG_MMC is not set 721# CONFIG_MMC is not set
708# CONFIG_MEMSTICK is not set 722# CONFIG_MEMSTICK is not set
709# CONFIG_NEW_LEDS is not set 723# CONFIG_NEW_LEDS is not set
724# CONFIG_ACCESSIBILITY is not set
710# CONFIG_RTC_CLASS is not set 725# CONFIG_RTC_CLASS is not set
711
712#
713# Userspace I/O
714#
715# CONFIG_UIO is not set 726# CONFIG_UIO is not set
716 727
717# 728#
@@ -739,16 +750,15 @@ CONFIG_JFS_FS=m
739# CONFIG_JFS_SECURITY is not set 750# CONFIG_JFS_SECURITY is not set
740# CONFIG_JFS_DEBUG is not set 751# CONFIG_JFS_DEBUG is not set
741# CONFIG_JFS_STATISTICS is not set 752# CONFIG_JFS_STATISTICS is not set
742CONFIG_FS_POSIX_ACL=y 753# CONFIG_FS_POSIX_ACL is not set
743CONFIG_XFS_FS=m 754CONFIG_XFS_FS=m
744# CONFIG_XFS_QUOTA is not set 755# CONFIG_XFS_QUOTA is not set
745# CONFIG_XFS_SECURITY is not set
746# CONFIG_XFS_POSIX_ACL is not set 756# CONFIG_XFS_POSIX_ACL is not set
747# CONFIG_XFS_RT is not set 757# CONFIG_XFS_RT is not set
748CONFIG_GFS2_FS=m 758# CONFIG_XFS_DEBUG is not set
749CONFIG_GFS2_FS_LOCKING_NOLOCK=m
750CONFIG_GFS2_FS_LOCKING_DLM=m
751CONFIG_OCFS2_FS=m 759CONFIG_OCFS2_FS=m
760CONFIG_OCFS2_FS_O2CB=m
761CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
752# CONFIG_OCFS2_DEBUG_MASKLOG is not set 762# CONFIG_OCFS2_DEBUG_MASKLOG is not set
753# CONFIG_OCFS2_DEBUG_FS is not set 763# CONFIG_OCFS2_DEBUG_FS is not set
754CONFIG_DNOTIFY=y 764CONFIG_DNOTIFY=y
@@ -820,12 +830,10 @@ CONFIG_NFS_FS=y
820CONFIG_NFS_V3=y 830CONFIG_NFS_V3=y
821# CONFIG_NFS_V3_ACL is not set 831# CONFIG_NFS_V3_ACL is not set
822CONFIG_NFS_V4=y 832CONFIG_NFS_V4=y
823# CONFIG_NFS_DIRECTIO is not set
824CONFIG_NFSD=m 833CONFIG_NFSD=m
825CONFIG_NFSD_V3=y 834CONFIG_NFSD_V3=y
826# CONFIG_NFSD_V3_ACL is not set 835# CONFIG_NFSD_V3_ACL is not set
827# CONFIG_NFSD_V4 is not set 836# CONFIG_NFSD_V4 is not set
828CONFIG_NFSD_TCP=y
829CONFIG_ROOT_NFS=y 837CONFIG_ROOT_NFS=y
830CONFIG_LOCKD=y 838CONFIG_LOCKD=y
831CONFIG_LOCKD_V4=y 839CONFIG_LOCKD_V4=y
@@ -900,6 +908,7 @@ CONFIG_DLM=m
900# CONFIG_PRINTK_TIME is not set 908# CONFIG_PRINTK_TIME is not set
901CONFIG_ENABLE_WARN_DEPRECATED=y 909CONFIG_ENABLE_WARN_DEPRECATED=y
902CONFIG_ENABLE_MUST_CHECK=y 910CONFIG_ENABLE_MUST_CHECK=y
911CONFIG_FRAME_WARN=1024
903CONFIG_MAGIC_SYSRQ=y 912CONFIG_MAGIC_SYSRQ=y
904# CONFIG_UNUSED_SYMBOLS is not set 913# CONFIG_UNUSED_SYMBOLS is not set
905# CONFIG_DEBUG_FS is not set 914# CONFIG_DEBUG_FS is not set
@@ -919,53 +928,82 @@ CONFIG_ASYNC_CORE=m
919CONFIG_ASYNC_MEMCPY=m 928CONFIG_ASYNC_MEMCPY=m
920CONFIG_ASYNC_XOR=m 929CONFIG_ASYNC_XOR=m
921CONFIG_CRYPTO=y 930CONFIG_CRYPTO=y
931
932#
933# Crypto core or helper
934#
922CONFIG_CRYPTO_ALGAPI=y 935CONFIG_CRYPTO_ALGAPI=y
923CONFIG_CRYPTO_AEAD=m 936CONFIG_CRYPTO_AEAD=m
924CONFIG_CRYPTO_BLKCIPHER=y 937CONFIG_CRYPTO_BLKCIPHER=y
925CONFIG_CRYPTO_SEQIV=m
926CONFIG_CRYPTO_HASH=y 938CONFIG_CRYPTO_HASH=y
927CONFIG_CRYPTO_MANAGER=y 939CONFIG_CRYPTO_MANAGER=y
940CONFIG_CRYPTO_GF128MUL=m
941CONFIG_CRYPTO_NULL=m
942CONFIG_CRYPTO_CRYPTD=m
943CONFIG_CRYPTO_AUTHENC=m
944CONFIG_CRYPTO_TEST=m
945
946#
947# Authenticated Encryption with Associated Data
948#
949CONFIG_CRYPTO_CCM=m
950CONFIG_CRYPTO_GCM=m
951CONFIG_CRYPTO_SEQIV=m
952
953#
954# Block modes
955#
956CONFIG_CRYPTO_CBC=y
957CONFIG_CRYPTO_CTR=m
958CONFIG_CRYPTO_CTS=m
959CONFIG_CRYPTO_ECB=m
960CONFIG_CRYPTO_LRW=m
961CONFIG_CRYPTO_PCBC=m
962CONFIG_CRYPTO_XTS=m
963
964#
965# Hash modes
966#
928CONFIG_CRYPTO_HMAC=y 967CONFIG_CRYPTO_HMAC=y
929CONFIG_CRYPTO_XCBC=m 968CONFIG_CRYPTO_XCBC=m
930CONFIG_CRYPTO_NULL=m 969
970#
971# Digest
972#
973CONFIG_CRYPTO_CRC32C=m
931CONFIG_CRYPTO_MD4=m 974CONFIG_CRYPTO_MD4=m
932CONFIG_CRYPTO_MD5=y 975CONFIG_CRYPTO_MD5=y
976CONFIG_CRYPTO_MICHAEL_MIC=m
933CONFIG_CRYPTO_SHA1=m 977CONFIG_CRYPTO_SHA1=m
934CONFIG_CRYPTO_SHA256=m 978CONFIG_CRYPTO_SHA256=m
935CONFIG_CRYPTO_SHA512=m 979CONFIG_CRYPTO_SHA512=m
936CONFIG_CRYPTO_WP512=m
937CONFIG_CRYPTO_TGR192=m 980CONFIG_CRYPTO_TGR192=m
938CONFIG_CRYPTO_GF128MUL=m 981CONFIG_CRYPTO_WP512=m
939CONFIG_CRYPTO_ECB=m 982
940CONFIG_CRYPTO_CBC=y 983#
941CONFIG_CRYPTO_PCBC=m 984# Ciphers
942CONFIG_CRYPTO_LRW=m 985#
943CONFIG_CRYPTO_XTS=m
944CONFIG_CRYPTO_CTR=m
945CONFIG_CRYPTO_GCM=m
946CONFIG_CRYPTO_CCM=m
947CONFIG_CRYPTO_CRYPTD=m
948CONFIG_CRYPTO_DES=y
949CONFIG_CRYPTO_FCRYPT=m
950CONFIG_CRYPTO_BLOWFISH=m
951CONFIG_CRYPTO_TWOFISH=m
952CONFIG_CRYPTO_TWOFISH_COMMON=m
953CONFIG_CRYPTO_SERPENT=m
954CONFIG_CRYPTO_AES=m 986CONFIG_CRYPTO_AES=m
987CONFIG_CRYPTO_ANUBIS=m
988CONFIG_CRYPTO_ARC4=m
989CONFIG_CRYPTO_BLOWFISH=m
990CONFIG_CRYPTO_CAMELLIA=m
955CONFIG_CRYPTO_CAST5=m 991CONFIG_CRYPTO_CAST5=m
956CONFIG_CRYPTO_CAST6=m 992CONFIG_CRYPTO_CAST6=m
957CONFIG_CRYPTO_TEA=m 993CONFIG_CRYPTO_DES=y
958CONFIG_CRYPTO_ARC4=m 994CONFIG_CRYPTO_FCRYPT=m
959CONFIG_CRYPTO_KHAZAD=m 995CONFIG_CRYPTO_KHAZAD=m
960CONFIG_CRYPTO_ANUBIS=m
961CONFIG_CRYPTO_SEED=m
962CONFIG_CRYPTO_SALSA20=m 996CONFIG_CRYPTO_SALSA20=m
997CONFIG_CRYPTO_SEED=m
998CONFIG_CRYPTO_SERPENT=m
999CONFIG_CRYPTO_TEA=m
1000CONFIG_CRYPTO_TWOFISH=m
1001CONFIG_CRYPTO_TWOFISH_COMMON=m
1002
1003#
1004# Compression
1005#
963CONFIG_CRYPTO_DEFLATE=m 1006CONFIG_CRYPTO_DEFLATE=m
964CONFIG_CRYPTO_MICHAEL_MIC=m
965CONFIG_CRYPTO_CRC32C=m
966CONFIG_CRYPTO_CAMELLIA=m
967CONFIG_CRYPTO_TEST=m
968CONFIG_CRYPTO_AUTHENC=m
969CONFIG_CRYPTO_LZO=m 1007CONFIG_CRYPTO_LZO=m
970# CONFIG_CRYPTO_HW is not set 1008# CONFIG_CRYPTO_HW is not set
971 1009
@@ -973,9 +1011,11 @@ CONFIG_CRYPTO_LZO=m
973# Library routines 1011# Library routines
974# 1012#
975CONFIG_BITREVERSE=m 1013CONFIG_BITREVERSE=m
1014# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1015# CONFIG_GENERIC_FIND_NEXT_BIT is not set
976CONFIG_CRC_CCITT=m 1016CONFIG_CRC_CCITT=m
977CONFIG_CRC16=m 1017CONFIG_CRC16=m
978# CONFIG_CRC_ITU_T is not set 1018CONFIG_CRC_ITU_T=m
979CONFIG_CRC32=m 1019CONFIG_CRC32=m
980# CONFIG_CRC7 is not set 1020# CONFIG_CRC7 is not set
981CONFIG_LIBCRC32C=m 1021CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 38b68c70e567..3e140bf49b22 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:12 2008 4# Sun May 18 14:44:46 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -142,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
142CONFIG_NEED_MULTIPLE_NODES=y 145CONFIG_NEED_MULTIPLE_NODES=y
143# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
144# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 147# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
148CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 149CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set 150# CONFIG_RESOURCES_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1 151CONFIG_ZONE_DMA_FLAG=1
@@ -221,8 +225,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
221CONFIG_INET6_XFRM_MODE_BEET=m 225CONFIG_INET6_XFRM_MODE_BEET=m
222CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 226CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
223CONFIG_IPV6_SIT=m 227CONFIG_IPV6_SIT=m
228CONFIG_IPV6_NDISC_NODETYPE=y
224CONFIG_IPV6_TUNNEL=m 229CONFIG_IPV6_TUNNEL=m
225# CONFIG_IPV6_MULTIPLE_TABLES is not set 230# CONFIG_IPV6_MULTIPLE_TABLES is not set
231# CONFIG_IPV6_MROUTE is not set
226# CONFIG_NETWORK_SECMARK is not set 232# CONFIG_NETWORK_SECMARK is not set
227CONFIG_NETFILTER=y 233CONFIG_NETFILTER=y
228# CONFIG_NETFILTER_DEBUG is not set 234# CONFIG_NETFILTER_DEBUG is not set
@@ -238,6 +244,7 @@ CONFIG_NF_CONNTRACK=m
238CONFIG_NF_CT_ACCT=y 244CONFIG_NF_CT_ACCT=y
239CONFIG_NF_CONNTRACK_MARK=y 245CONFIG_NF_CONNTRACK_MARK=y
240# CONFIG_NF_CONNTRACK_EVENTS is not set 246# CONFIG_NF_CONNTRACK_EVENTS is not set
247# CONFIG_NF_CT_PROTO_DCCP is not set
241CONFIG_NF_CT_PROTO_GRE=m 248CONFIG_NF_CT_PROTO_GRE=m
242CONFIG_NF_CT_PROTO_SCTP=m 249CONFIG_NF_CT_PROTO_SCTP=m
243CONFIG_NF_CT_PROTO_UDPLITE=m 250CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -316,6 +323,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
316CONFIG_IP_NF_TARGET_NETMAP=m 323CONFIG_IP_NF_TARGET_NETMAP=m
317CONFIG_NF_NAT_SNMP_BASIC=m 324CONFIG_NF_NAT_SNMP_BASIC=m
318CONFIG_NF_NAT_PROTO_GRE=m 325CONFIG_NF_NAT_PROTO_GRE=m
326CONFIG_NF_NAT_PROTO_UDPLITE=m
327CONFIG_NF_NAT_PROTO_SCTP=m
319CONFIG_NF_NAT_FTP=m 328CONFIG_NF_NAT_FTP=m
320CONFIG_NF_NAT_IRC=m 329CONFIG_NF_NAT_IRC=m
321CONFIG_NF_NAT_TFTP=m 330CONFIG_NF_NAT_TFTP=m
@@ -409,8 +418,6 @@ CONFIG_IEEE80211=m
409CONFIG_IEEE80211_CRYPT_WEP=m 418CONFIG_IEEE80211_CRYPT_WEP=m
410CONFIG_IEEE80211_CRYPT_CCMP=m 419CONFIG_IEEE80211_CRYPT_CCMP=m
411CONFIG_IEEE80211_CRYPT_TKIP=m 420CONFIG_IEEE80211_CRYPT_TKIP=m
412CONFIG_IEEE80211_SOFTMAC=m
413# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
414# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
415# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
416 423
@@ -540,6 +547,7 @@ CONFIG_HPLANCE=y
540# 547#
541# CONFIG_WLAN_PRE80211 is not set 548# CONFIG_WLAN_PRE80211 is not set
542# CONFIG_WLAN_80211 is not set 549# CONFIG_WLAN_80211 is not set
550# CONFIG_IWLWIFI_LEDS is not set
543# CONFIG_WAN is not set 551# CONFIG_WAN is not set
544CONFIG_PPP=m 552CONFIG_PPP=m
545# CONFIG_PPP_MULTILINK is not set 553# CONFIG_PPP_MULTILINK is not set
@@ -631,6 +639,7 @@ CONFIG_VT=y
631CONFIG_VT_CONSOLE=y 639CONFIG_VT_CONSOLE=y
632CONFIG_HW_CONSOLE=y 640CONFIG_HW_CONSOLE=y
633CONFIG_VT_HW_CONSOLE_BINDING=y 641CONFIG_VT_HW_CONSOLE_BINDING=y
642# CONFIG_DEVKMEM is not set
634# CONFIG_SERIAL_NONSTANDARD is not set 643# CONFIG_SERIAL_NONSTANDARD is not set
635 644
636# 645#
@@ -652,12 +661,7 @@ CONFIG_GEN_RTC_X=y
652# CONFIG_RAW_DRIVER is not set 661# CONFIG_RAW_DRIVER is not set
653# CONFIG_TCG_TPM is not set 662# CONFIG_TCG_TPM is not set
654# CONFIG_I2C is not set 663# CONFIG_I2C is not set
655
656#
657# SPI support
658#
659# CONFIG_SPI is not set 664# CONFIG_SPI is not set
660# CONFIG_SPI_MASTER is not set
661# CONFIG_W1 is not set 665# CONFIG_W1 is not set
662# CONFIG_POWER_SUPPLY is not set 666# CONFIG_POWER_SUPPLY is not set
663# CONFIG_HWMON is not set 667# CONFIG_HWMON is not set
@@ -674,12 +678,22 @@ CONFIG_SSB_POSSIBLE=y
674# Multifunction device drivers 678# Multifunction device drivers
675# 679#
676# CONFIG_MFD_SM501 is not set 680# CONFIG_MFD_SM501 is not set
681# CONFIG_HTC_PASIC3 is not set
677 682
678# 683#
679# Multimedia devices 684# Multimedia devices
680# 685#
686
687#
688# Multimedia core support
689#
681# CONFIG_VIDEO_DEV is not set 690# CONFIG_VIDEO_DEV is not set
682# CONFIG_DVB_CORE is not set 691# CONFIG_DVB_CORE is not set
692# CONFIG_VIDEO_MEDIA is not set
693
694#
695# Multimedia drivers
696#
683# CONFIG_DAB is not set 697# CONFIG_DAB is not set
684 698
685# 699#
@@ -690,15 +704,15 @@ CONFIG_SSB_POSSIBLE=y
690CONFIG_FB=y 704CONFIG_FB=y
691# CONFIG_FIRMWARE_EDID is not set 705# CONFIG_FIRMWARE_EDID is not set
692# CONFIG_FB_DDC is not set 706# CONFIG_FB_DDC is not set
693CONFIG_FB_CFB_FILLRECT=y 707# CONFIG_FB_CFB_FILLRECT is not set
694# CONFIG_FB_CFB_COPYAREA is not set 708# CONFIG_FB_CFB_COPYAREA is not set
695CONFIG_FB_CFB_IMAGEBLIT=y 709CONFIG_FB_CFB_IMAGEBLIT=y
696# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set 710# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
697# CONFIG_FB_SYS_FILLRECT is not set 711# CONFIG_FB_SYS_FILLRECT is not set
698# CONFIG_FB_SYS_COPYAREA is not set 712# CONFIG_FB_SYS_COPYAREA is not set
699# CONFIG_FB_SYS_IMAGEBLIT is not set 713# CONFIG_FB_SYS_IMAGEBLIT is not set
714# CONFIG_FB_FOREIGN_ENDIAN is not set
700# CONFIG_FB_SYS_FOPS is not set 715# CONFIG_FB_SYS_FOPS is not set
701CONFIG_FB_DEFERRED_IO=y
702# CONFIG_FB_SVGALIB is not set 716# CONFIG_FB_SVGALIB is not set
703# CONFIG_FB_MACMODES is not set 717# CONFIG_FB_MACMODES is not set
704# CONFIG_FB_BACKLIGHT is not set 718# CONFIG_FB_BACKLIGHT is not set
@@ -746,11 +760,8 @@ CONFIG_HIDRAW=y
746# CONFIG_MMC is not set 760# CONFIG_MMC is not set
747# CONFIG_MEMSTICK is not set 761# CONFIG_MEMSTICK is not set
748# CONFIG_NEW_LEDS is not set 762# CONFIG_NEW_LEDS is not set
763# CONFIG_ACCESSIBILITY is not set
749# CONFIG_RTC_CLASS is not set 764# CONFIG_RTC_CLASS is not set
750
751#
752# Userspace I/O
753#
754# CONFIG_UIO is not set 765# CONFIG_UIO is not set
755 766
756# 767#
@@ -776,16 +787,15 @@ CONFIG_JFS_FS=m
776# CONFIG_JFS_SECURITY is not set 787# CONFIG_JFS_SECURITY is not set
777# CONFIG_JFS_DEBUG is not set 788# CONFIG_JFS_DEBUG is not set
778# CONFIG_JFS_STATISTICS is not set 789# CONFIG_JFS_STATISTICS is not set
779CONFIG_FS_POSIX_ACL=y 790# CONFIG_FS_POSIX_ACL is not set
780CONFIG_XFS_FS=m 791CONFIG_XFS_FS=m
781# CONFIG_XFS_QUOTA is not set 792# CONFIG_XFS_QUOTA is not set
782# CONFIG_XFS_SECURITY is not set
783# CONFIG_XFS_POSIX_ACL is not set 793# CONFIG_XFS_POSIX_ACL is not set
784# CONFIG_XFS_RT is not set 794# CONFIG_XFS_RT is not set
785CONFIG_GFS2_FS=m 795# CONFIG_XFS_DEBUG is not set
786CONFIG_GFS2_FS_LOCKING_NOLOCK=m
787CONFIG_GFS2_FS_LOCKING_DLM=m
788CONFIG_OCFS2_FS=m 796CONFIG_OCFS2_FS=m
797CONFIG_OCFS2_FS_O2CB=m
798CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
789# CONFIG_OCFS2_DEBUG_MASKLOG is not set 799# CONFIG_OCFS2_DEBUG_MASKLOG is not set
790# CONFIG_OCFS2_DEBUG_FS is not set 800# CONFIG_OCFS2_DEBUG_FS is not set
791CONFIG_DNOTIFY=y 801CONFIG_DNOTIFY=y
@@ -857,12 +867,10 @@ CONFIG_NFS_FS=y
857CONFIG_NFS_V3=y 867CONFIG_NFS_V3=y
858# CONFIG_NFS_V3_ACL is not set 868# CONFIG_NFS_V3_ACL is not set
859CONFIG_NFS_V4=y 869CONFIG_NFS_V4=y
860# CONFIG_NFS_DIRECTIO is not set
861CONFIG_NFSD=m 870CONFIG_NFSD=m
862CONFIG_NFSD_V3=y 871CONFIG_NFSD_V3=y
863# CONFIG_NFSD_V3_ACL is not set 872# CONFIG_NFSD_V3_ACL is not set
864# CONFIG_NFSD_V4 is not set 873# CONFIG_NFSD_V4 is not set
865CONFIG_NFSD_TCP=y
866CONFIG_ROOT_NFS=y 874CONFIG_ROOT_NFS=y
867CONFIG_LOCKD=y 875CONFIG_LOCKD=y
868CONFIG_LOCKD_V4=y 876CONFIG_LOCKD_V4=y
@@ -936,6 +944,7 @@ CONFIG_DLM=m
936# CONFIG_PRINTK_TIME is not set 944# CONFIG_PRINTK_TIME is not set
937CONFIG_ENABLE_WARN_DEPRECATED=y 945CONFIG_ENABLE_WARN_DEPRECATED=y
938CONFIG_ENABLE_MUST_CHECK=y 946CONFIG_ENABLE_MUST_CHECK=y
947CONFIG_FRAME_WARN=1024
939CONFIG_MAGIC_SYSRQ=y 948CONFIG_MAGIC_SYSRQ=y
940# CONFIG_UNUSED_SYMBOLS is not set 949# CONFIG_UNUSED_SYMBOLS is not set
941# CONFIG_DEBUG_FS is not set 950# CONFIG_DEBUG_FS is not set
@@ -955,53 +964,82 @@ CONFIG_ASYNC_CORE=m
955CONFIG_ASYNC_MEMCPY=m 964CONFIG_ASYNC_MEMCPY=m
956CONFIG_ASYNC_XOR=m 965CONFIG_ASYNC_XOR=m
957CONFIG_CRYPTO=y 966CONFIG_CRYPTO=y
967
968#
969# Crypto core or helper
970#
958CONFIG_CRYPTO_ALGAPI=y 971CONFIG_CRYPTO_ALGAPI=y
959CONFIG_CRYPTO_AEAD=m 972CONFIG_CRYPTO_AEAD=m
960CONFIG_CRYPTO_BLKCIPHER=y 973CONFIG_CRYPTO_BLKCIPHER=y
961CONFIG_CRYPTO_SEQIV=m
962CONFIG_CRYPTO_HASH=y 974CONFIG_CRYPTO_HASH=y
963CONFIG_CRYPTO_MANAGER=y 975CONFIG_CRYPTO_MANAGER=y
976CONFIG_CRYPTO_GF128MUL=m
977CONFIG_CRYPTO_NULL=m
978CONFIG_CRYPTO_CRYPTD=m
979CONFIG_CRYPTO_AUTHENC=m
980CONFIG_CRYPTO_TEST=m
981
982#
983# Authenticated Encryption with Associated Data
984#
985CONFIG_CRYPTO_CCM=m
986CONFIG_CRYPTO_GCM=m
987CONFIG_CRYPTO_SEQIV=m
988
989#
990# Block modes
991#
992CONFIG_CRYPTO_CBC=y
993CONFIG_CRYPTO_CTR=m
994CONFIG_CRYPTO_CTS=m
995CONFIG_CRYPTO_ECB=m
996CONFIG_CRYPTO_LRW=m
997CONFIG_CRYPTO_PCBC=m
998CONFIG_CRYPTO_XTS=m
999
1000#
1001# Hash modes
1002#
964CONFIG_CRYPTO_HMAC=y 1003CONFIG_CRYPTO_HMAC=y
965CONFIG_CRYPTO_XCBC=m 1004CONFIG_CRYPTO_XCBC=m
966CONFIG_CRYPTO_NULL=m 1005
1006#
1007# Digest
1008#
1009CONFIG_CRYPTO_CRC32C=m
967CONFIG_CRYPTO_MD4=m 1010CONFIG_CRYPTO_MD4=m
968CONFIG_CRYPTO_MD5=y 1011CONFIG_CRYPTO_MD5=y
1012CONFIG_CRYPTO_MICHAEL_MIC=m
969CONFIG_CRYPTO_SHA1=m 1013CONFIG_CRYPTO_SHA1=m
970CONFIG_CRYPTO_SHA256=m 1014CONFIG_CRYPTO_SHA256=m
971CONFIG_CRYPTO_SHA512=m 1015CONFIG_CRYPTO_SHA512=m
972CONFIG_CRYPTO_WP512=m
973CONFIG_CRYPTO_TGR192=m 1016CONFIG_CRYPTO_TGR192=m
974CONFIG_CRYPTO_GF128MUL=m 1017CONFIG_CRYPTO_WP512=m
975CONFIG_CRYPTO_ECB=m 1018
976CONFIG_CRYPTO_CBC=y 1019#
977CONFIG_CRYPTO_PCBC=m 1020# Ciphers
978CONFIG_CRYPTO_LRW=m 1021#
979CONFIG_CRYPTO_XTS=m
980CONFIG_CRYPTO_CTR=m
981CONFIG_CRYPTO_GCM=m
982CONFIG_CRYPTO_CCM=m
983CONFIG_CRYPTO_CRYPTD=m
984CONFIG_CRYPTO_DES=y
985CONFIG_CRYPTO_FCRYPT=m
986CONFIG_CRYPTO_BLOWFISH=m
987CONFIG_CRYPTO_TWOFISH=m
988CONFIG_CRYPTO_TWOFISH_COMMON=m
989CONFIG_CRYPTO_SERPENT=m
990CONFIG_CRYPTO_AES=m 1022CONFIG_CRYPTO_AES=m
1023CONFIG_CRYPTO_ANUBIS=m
1024CONFIG_CRYPTO_ARC4=m
1025CONFIG_CRYPTO_BLOWFISH=m
1026CONFIG_CRYPTO_CAMELLIA=m
991CONFIG_CRYPTO_CAST5=m 1027CONFIG_CRYPTO_CAST5=m
992CONFIG_CRYPTO_CAST6=m 1028CONFIG_CRYPTO_CAST6=m
993CONFIG_CRYPTO_TEA=m 1029CONFIG_CRYPTO_DES=y
994CONFIG_CRYPTO_ARC4=m 1030CONFIG_CRYPTO_FCRYPT=m
995CONFIG_CRYPTO_KHAZAD=m 1031CONFIG_CRYPTO_KHAZAD=m
996CONFIG_CRYPTO_ANUBIS=m
997CONFIG_CRYPTO_SEED=m
998CONFIG_CRYPTO_SALSA20=m 1032CONFIG_CRYPTO_SALSA20=m
1033CONFIG_CRYPTO_SEED=m
1034CONFIG_CRYPTO_SERPENT=m
1035CONFIG_CRYPTO_TEA=m
1036CONFIG_CRYPTO_TWOFISH=m
1037CONFIG_CRYPTO_TWOFISH_COMMON=m
1038
1039#
1040# Compression
1041#
999CONFIG_CRYPTO_DEFLATE=m 1042CONFIG_CRYPTO_DEFLATE=m
1000CONFIG_CRYPTO_MICHAEL_MIC=m
1001CONFIG_CRYPTO_CRC32C=m
1002CONFIG_CRYPTO_CAMELLIA=m
1003CONFIG_CRYPTO_TEST=m
1004CONFIG_CRYPTO_AUTHENC=m
1005CONFIG_CRYPTO_LZO=m 1043CONFIG_CRYPTO_LZO=m
1006# CONFIG_CRYPTO_HW is not set 1044# CONFIG_CRYPTO_HW is not set
1007 1045
@@ -1009,9 +1047,11 @@ CONFIG_CRYPTO_LZO=m
1009# Library routines 1047# Library routines
1010# 1048#
1011CONFIG_BITREVERSE=y 1049CONFIG_BITREVERSE=y
1050# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1051# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1012CONFIG_CRC_CCITT=m 1052CONFIG_CRC_CCITT=m
1013CONFIG_CRC16=m 1053CONFIG_CRC16=m
1014# CONFIG_CRC_ITU_T is not set 1054CONFIG_CRC_ITU_T=m
1015CONFIG_CRC32=y 1055CONFIG_CRC32=y
1016# CONFIG_CRC7 is not set 1056# CONFIG_CRC7 is not set
1017CONFIG_LIBCRC32C=m 1057CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 738bca695a88..ba3a91792cbf 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:14 2008 4# Sun May 18 14:44:47 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -143,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143CONFIG_NEED_MULTIPLE_NODES=y 146CONFIG_NEED_MULTIPLE_NODES=y
144# CONFIG_SPARSEMEM_STATIC is not set 147# CONFIG_SPARSEMEM_STATIC is not set
145# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 148# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
149CONFIG_PAGEFLAGS_EXTENDED=y
146CONFIG_SPLIT_PTLOCK_CPUS=4 150CONFIG_SPLIT_PTLOCK_CPUS=4
147# CONFIG_RESOURCES_64BIT is not set 151# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1 152CONFIG_ZONE_DMA_FLAG=1
@@ -219,8 +223,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
219CONFIG_INET6_XFRM_MODE_BEET=m 223CONFIG_INET6_XFRM_MODE_BEET=m
220CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 224CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
221CONFIG_IPV6_SIT=m 225CONFIG_IPV6_SIT=m
226CONFIG_IPV6_NDISC_NODETYPE=y
222CONFIG_IPV6_TUNNEL=m 227CONFIG_IPV6_TUNNEL=m
223# CONFIG_IPV6_MULTIPLE_TABLES is not set 228# CONFIG_IPV6_MULTIPLE_TABLES is not set
229# CONFIG_IPV6_MROUTE is not set
224# CONFIG_NETWORK_SECMARK is not set 230# CONFIG_NETWORK_SECMARK is not set
225CONFIG_NETFILTER=y 231CONFIG_NETFILTER=y
226# CONFIG_NETFILTER_DEBUG is not set 232# CONFIG_NETFILTER_DEBUG is not set
@@ -236,6 +242,7 @@ CONFIG_NF_CONNTRACK=m
236CONFIG_NF_CT_ACCT=y 242CONFIG_NF_CT_ACCT=y
237CONFIG_NF_CONNTRACK_MARK=y 243CONFIG_NF_CONNTRACK_MARK=y
238# CONFIG_NF_CONNTRACK_EVENTS is not set 244# CONFIG_NF_CONNTRACK_EVENTS is not set
245# CONFIG_NF_CT_PROTO_DCCP is not set
239CONFIG_NF_CT_PROTO_GRE=m 246CONFIG_NF_CT_PROTO_GRE=m
240CONFIG_NF_CT_PROTO_SCTP=m 247CONFIG_NF_CT_PROTO_SCTP=m
241CONFIG_NF_CT_PROTO_UDPLITE=m 248CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -314,6 +321,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
314CONFIG_IP_NF_TARGET_NETMAP=m 321CONFIG_IP_NF_TARGET_NETMAP=m
315CONFIG_NF_NAT_SNMP_BASIC=m 322CONFIG_NF_NAT_SNMP_BASIC=m
316CONFIG_NF_NAT_PROTO_GRE=m 323CONFIG_NF_NAT_PROTO_GRE=m
324CONFIG_NF_NAT_PROTO_UDPLITE=m
325CONFIG_NF_NAT_PROTO_SCTP=m
317CONFIG_NF_NAT_FTP=m 326CONFIG_NF_NAT_FTP=m
318CONFIG_NF_NAT_IRC=m 327CONFIG_NF_NAT_IRC=m
319CONFIG_NF_NAT_TFTP=m 328CONFIG_NF_NAT_TFTP=m
@@ -410,8 +419,6 @@ CONFIG_IEEE80211=m
410CONFIG_IEEE80211_CRYPT_WEP=m 419CONFIG_IEEE80211_CRYPT_WEP=m
411CONFIG_IEEE80211_CRYPT_CCMP=m 420CONFIG_IEEE80211_CRYPT_CCMP=m
412CONFIG_IEEE80211_CRYPT_TKIP=m 421CONFIG_IEEE80211_CRYPT_TKIP=m
413CONFIG_IEEE80211_SOFTMAC=m
414# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
415# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
417 424
@@ -467,11 +474,10 @@ CONFIG_IDE_PROC_FS=y
467# 474#
468# IDE chipset support/bugfixes 475# IDE chipset support/bugfixes
469# 476#
470# CONFIG_IDE_GENERIC is not set
471# CONFIG_BLK_DEV_PLATFORM is not set 477# CONFIG_BLK_DEV_PLATFORM is not set
472CONFIG_BLK_DEV_MAC_IDE=y 478CONFIG_BLK_DEV_MAC_IDE=y
473# CONFIG_BLK_DEV_IDEDMA is not set 479# CONFIG_BLK_DEV_IDEDMA is not set
474# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set 480# CONFIG_BLK_DEV_HD_ONLY is not set
475# CONFIG_BLK_DEV_HD is not set 481# CONFIG_BLK_DEV_HD is not set
476 482
477# 483#
@@ -520,6 +526,7 @@ CONFIG_SCSI_LOWLEVEL=y
520CONFIG_ISCSI_TCP=m 526CONFIG_ISCSI_TCP=m
521# CONFIG_SCSI_DEBUG is not set 527# CONFIG_SCSI_DEBUG is not set
522CONFIG_MAC_SCSI=y 528CONFIG_MAC_SCSI=y
529CONFIG_SCSI_MAC_ESP=y
523CONFIG_MD=y 530CONFIG_MD=y
524CONFIG_BLK_DEV_MD=m 531CONFIG_BLK_DEV_MD=m
525CONFIG_MD_LINEAR=m 532CONFIG_MD_LINEAR=m
@@ -580,6 +587,7 @@ CONFIG_MACMACE=y
580# 587#
581# CONFIG_WLAN_PRE80211 is not set 588# CONFIG_WLAN_PRE80211 is not set
582# CONFIG_WLAN_80211 is not set 589# CONFIG_WLAN_80211 is not set
590# CONFIG_IWLWIFI_LEDS is not set
583# CONFIG_WAN is not set 591# CONFIG_WAN is not set
584CONFIG_PPP=m 592CONFIG_PPP=m
585# CONFIG_PPP_MULTILINK is not set 593# CONFIG_PPP_MULTILINK is not set
@@ -665,6 +673,7 @@ CONFIG_VT=y
665CONFIG_VT_CONSOLE=y 673CONFIG_VT_CONSOLE=y
666CONFIG_HW_CONSOLE=y 674CONFIG_HW_CONSOLE=y
667CONFIG_VT_HW_CONSOLE_BINDING=y 675CONFIG_VT_HW_CONSOLE_BINDING=y
676# CONFIG_DEVKMEM is not set
668# CONFIG_SERIAL_NONSTANDARD is not set 677# CONFIG_SERIAL_NONSTANDARD is not set
669 678
670# 679#
@@ -686,12 +695,7 @@ CONFIG_GEN_RTC_X=y
686# CONFIG_RAW_DRIVER is not set 695# CONFIG_RAW_DRIVER is not set
687# CONFIG_TCG_TPM is not set 696# CONFIG_TCG_TPM is not set
688# CONFIG_I2C is not set 697# CONFIG_I2C is not set
689
690#
691# SPI support
692#
693# CONFIG_SPI is not set 698# CONFIG_SPI is not set
694# CONFIG_SPI_MASTER is not set
695# CONFIG_W1 is not set 699# CONFIG_W1 is not set
696# CONFIG_POWER_SUPPLY is not set 700# CONFIG_POWER_SUPPLY is not set
697# CONFIG_HWMON is not set 701# CONFIG_HWMON is not set
@@ -708,12 +712,22 @@ CONFIG_SSB_POSSIBLE=y
708# Multifunction device drivers 712# Multifunction device drivers
709# 713#
710# CONFIG_MFD_SM501 is not set 714# CONFIG_MFD_SM501 is not set
715# CONFIG_HTC_PASIC3 is not set
711 716
712# 717#
713# Multimedia devices 718# Multimedia devices
714# 719#
720
721#
722# Multimedia core support
723#
715# CONFIG_VIDEO_DEV is not set 724# CONFIG_VIDEO_DEV is not set
716# CONFIG_DVB_CORE is not set 725# CONFIG_DVB_CORE is not set
726# CONFIG_VIDEO_MEDIA is not set
727
728#
729# Multimedia drivers
730#
717# CONFIG_DAB is not set 731# CONFIG_DAB is not set
718 732
719# 733#
@@ -731,8 +745,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
731# CONFIG_FB_SYS_FILLRECT is not set 745# CONFIG_FB_SYS_FILLRECT is not set
732# CONFIG_FB_SYS_COPYAREA is not set 746# CONFIG_FB_SYS_COPYAREA is not set
733# CONFIG_FB_SYS_IMAGEBLIT is not set 747# CONFIG_FB_SYS_IMAGEBLIT is not set
748# CONFIG_FB_FOREIGN_ENDIAN is not set
734# CONFIG_FB_SYS_FOPS is not set 749# CONFIG_FB_SYS_FOPS is not set
735CONFIG_FB_DEFERRED_IO=y
736# CONFIG_FB_SVGALIB is not set 750# CONFIG_FB_SVGALIB is not set
737CONFIG_FB_MACMODES=y 751CONFIG_FB_MACMODES=y
738# CONFIG_FB_BACKLIGHT is not set 752# CONFIG_FB_BACKLIGHT is not set
@@ -783,11 +797,8 @@ CONFIG_HIDRAW=y
783# CONFIG_MMC is not set 797# CONFIG_MMC is not set
784# CONFIG_MEMSTICK is not set 798# CONFIG_MEMSTICK is not set
785# CONFIG_NEW_LEDS is not set 799# CONFIG_NEW_LEDS is not set
800# CONFIG_ACCESSIBILITY is not set
786# CONFIG_RTC_CLASS is not set 801# CONFIG_RTC_CLASS is not set
787
788#
789# Userspace I/O
790#
791# CONFIG_UIO is not set 802# CONFIG_UIO is not set
792 803
793# 804#
@@ -816,16 +827,15 @@ CONFIG_JFS_FS=m
816# CONFIG_JFS_SECURITY is not set 827# CONFIG_JFS_SECURITY is not set
817# CONFIG_JFS_DEBUG is not set 828# CONFIG_JFS_DEBUG is not set
818# CONFIG_JFS_STATISTICS is not set 829# CONFIG_JFS_STATISTICS is not set
819CONFIG_FS_POSIX_ACL=y 830# CONFIG_FS_POSIX_ACL is not set
820CONFIG_XFS_FS=m 831CONFIG_XFS_FS=m
821# CONFIG_XFS_QUOTA is not set 832# CONFIG_XFS_QUOTA is not set
822# CONFIG_XFS_SECURITY is not set
823# CONFIG_XFS_POSIX_ACL is not set 833# CONFIG_XFS_POSIX_ACL is not set
824# CONFIG_XFS_RT is not set 834# CONFIG_XFS_RT is not set
825CONFIG_GFS2_FS=m 835# CONFIG_XFS_DEBUG is not set
826CONFIG_GFS2_FS_LOCKING_NOLOCK=m
827CONFIG_GFS2_FS_LOCKING_DLM=m
828CONFIG_OCFS2_FS=m 836CONFIG_OCFS2_FS=m
837CONFIG_OCFS2_FS_O2CB=m
838CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
829# CONFIG_OCFS2_DEBUG_MASKLOG is not set 839# CONFIG_OCFS2_DEBUG_MASKLOG is not set
830# CONFIG_OCFS2_DEBUG_FS is not set 840# CONFIG_OCFS2_DEBUG_FS is not set
831CONFIG_DNOTIFY=y 841CONFIG_DNOTIFY=y
@@ -897,12 +907,10 @@ CONFIG_NFS_FS=m
897CONFIG_NFS_V3=y 907CONFIG_NFS_V3=y
898# CONFIG_NFS_V3_ACL is not set 908# CONFIG_NFS_V3_ACL is not set
899CONFIG_NFS_V4=y 909CONFIG_NFS_V4=y
900# CONFIG_NFS_DIRECTIO is not set
901CONFIG_NFSD=m 910CONFIG_NFSD=m
902CONFIG_NFSD_V3=y 911CONFIG_NFSD_V3=y
903# CONFIG_NFSD_V3_ACL is not set 912# CONFIG_NFSD_V3_ACL is not set
904# CONFIG_NFSD_V4 is not set 913# CONFIG_NFSD_V4 is not set
905CONFIG_NFSD_TCP=y
906CONFIG_LOCKD=m 914CONFIG_LOCKD=m
907CONFIG_LOCKD_V4=y 915CONFIG_LOCKD_V4=y
908CONFIG_EXPORTFS=m 916CONFIG_EXPORTFS=m
@@ -976,6 +984,7 @@ CONFIG_DLM=m
976# CONFIG_PRINTK_TIME is not set 984# CONFIG_PRINTK_TIME is not set
977CONFIG_ENABLE_WARN_DEPRECATED=y 985CONFIG_ENABLE_WARN_DEPRECATED=y
978CONFIG_ENABLE_MUST_CHECK=y 986CONFIG_ENABLE_MUST_CHECK=y
987CONFIG_FRAME_WARN=1024
979CONFIG_MAGIC_SYSRQ=y 988CONFIG_MAGIC_SYSRQ=y
980# CONFIG_UNUSED_SYMBOLS is not set 989# CONFIG_UNUSED_SYMBOLS is not set
981# CONFIG_DEBUG_FS is not set 990# CONFIG_DEBUG_FS is not set
@@ -995,53 +1004,82 @@ CONFIG_ASYNC_CORE=m
995CONFIG_ASYNC_MEMCPY=m 1004CONFIG_ASYNC_MEMCPY=m
996CONFIG_ASYNC_XOR=m 1005CONFIG_ASYNC_XOR=m
997CONFIG_CRYPTO=y 1006CONFIG_CRYPTO=y
1007
1008#
1009# Crypto core or helper
1010#
998CONFIG_CRYPTO_ALGAPI=y 1011CONFIG_CRYPTO_ALGAPI=y
999CONFIG_CRYPTO_AEAD=m 1012CONFIG_CRYPTO_AEAD=m
1000CONFIG_CRYPTO_BLKCIPHER=m 1013CONFIG_CRYPTO_BLKCIPHER=m
1001CONFIG_CRYPTO_SEQIV=m
1002CONFIG_CRYPTO_HASH=y 1014CONFIG_CRYPTO_HASH=y
1003CONFIG_CRYPTO_MANAGER=y 1015CONFIG_CRYPTO_MANAGER=y
1016CONFIG_CRYPTO_GF128MUL=m
1017CONFIG_CRYPTO_NULL=m
1018CONFIG_CRYPTO_CRYPTD=m
1019CONFIG_CRYPTO_AUTHENC=m
1020CONFIG_CRYPTO_TEST=m
1021
1022#
1023# Authenticated Encryption with Associated Data
1024#
1025CONFIG_CRYPTO_CCM=m
1026CONFIG_CRYPTO_GCM=m
1027CONFIG_CRYPTO_SEQIV=m
1028
1029#
1030# Block modes
1031#
1032CONFIG_CRYPTO_CBC=m
1033CONFIG_CRYPTO_CTR=m
1034CONFIG_CRYPTO_CTS=m
1035CONFIG_CRYPTO_ECB=m
1036CONFIG_CRYPTO_LRW=m
1037CONFIG_CRYPTO_PCBC=m
1038CONFIG_CRYPTO_XTS=m
1039
1040#
1041# Hash modes
1042#
1004CONFIG_CRYPTO_HMAC=y 1043CONFIG_CRYPTO_HMAC=y
1005CONFIG_CRYPTO_XCBC=m 1044CONFIG_CRYPTO_XCBC=m
1006CONFIG_CRYPTO_NULL=m 1045
1046#
1047# Digest
1048#
1049CONFIG_CRYPTO_CRC32C=m
1007CONFIG_CRYPTO_MD4=m 1050CONFIG_CRYPTO_MD4=m
1008CONFIG_CRYPTO_MD5=m 1051CONFIG_CRYPTO_MD5=m
1052CONFIG_CRYPTO_MICHAEL_MIC=m
1009CONFIG_CRYPTO_SHA1=m 1053CONFIG_CRYPTO_SHA1=m
1010CONFIG_CRYPTO_SHA256=m 1054CONFIG_CRYPTO_SHA256=m
1011CONFIG_CRYPTO_SHA512=m 1055CONFIG_CRYPTO_SHA512=m
1012CONFIG_CRYPTO_WP512=m
1013CONFIG_CRYPTO_TGR192=m 1056CONFIG_CRYPTO_TGR192=m
1014CONFIG_CRYPTO_GF128MUL=m 1057CONFIG_CRYPTO_WP512=m
1015CONFIG_CRYPTO_ECB=m 1058
1016CONFIG_CRYPTO_CBC=m 1059#
1017CONFIG_CRYPTO_PCBC=m 1060# Ciphers
1018CONFIG_CRYPTO_LRW=m 1061#
1019CONFIG_CRYPTO_XTS=m
1020CONFIG_CRYPTO_CTR=m
1021CONFIG_CRYPTO_GCM=m
1022CONFIG_CRYPTO_CCM=m
1023CONFIG_CRYPTO_CRYPTD=m
1024CONFIG_CRYPTO_DES=m
1025CONFIG_CRYPTO_FCRYPT=m
1026CONFIG_CRYPTO_BLOWFISH=m
1027CONFIG_CRYPTO_TWOFISH=m
1028CONFIG_CRYPTO_TWOFISH_COMMON=m
1029CONFIG_CRYPTO_SERPENT=m
1030CONFIG_CRYPTO_AES=m 1062CONFIG_CRYPTO_AES=m
1063CONFIG_CRYPTO_ANUBIS=m
1064CONFIG_CRYPTO_ARC4=m
1065CONFIG_CRYPTO_BLOWFISH=m
1066CONFIG_CRYPTO_CAMELLIA=m
1031CONFIG_CRYPTO_CAST5=m 1067CONFIG_CRYPTO_CAST5=m
1032CONFIG_CRYPTO_CAST6=m 1068CONFIG_CRYPTO_CAST6=m
1033CONFIG_CRYPTO_TEA=m 1069CONFIG_CRYPTO_DES=m
1034CONFIG_CRYPTO_ARC4=m 1070CONFIG_CRYPTO_FCRYPT=m
1035CONFIG_CRYPTO_KHAZAD=m 1071CONFIG_CRYPTO_KHAZAD=m
1036CONFIG_CRYPTO_ANUBIS=m
1037CONFIG_CRYPTO_SEED=m
1038CONFIG_CRYPTO_SALSA20=m 1072CONFIG_CRYPTO_SALSA20=m
1073CONFIG_CRYPTO_SEED=m
1074CONFIG_CRYPTO_SERPENT=m
1075CONFIG_CRYPTO_TEA=m
1076CONFIG_CRYPTO_TWOFISH=m
1077CONFIG_CRYPTO_TWOFISH_COMMON=m
1078
1079#
1080# Compression
1081#
1039CONFIG_CRYPTO_DEFLATE=m 1082CONFIG_CRYPTO_DEFLATE=m
1040CONFIG_CRYPTO_MICHAEL_MIC=m
1041CONFIG_CRYPTO_CRC32C=m
1042CONFIG_CRYPTO_CAMELLIA=m
1043CONFIG_CRYPTO_TEST=m
1044CONFIG_CRYPTO_AUTHENC=m
1045CONFIG_CRYPTO_LZO=m 1083CONFIG_CRYPTO_LZO=m
1046# CONFIG_CRYPTO_HW is not set 1084# CONFIG_CRYPTO_HW is not set
1047 1085
@@ -1049,9 +1087,11 @@ CONFIG_CRYPTO_LZO=m
1049# Library routines 1087# Library routines
1050# 1088#
1051CONFIG_BITREVERSE=y 1089CONFIG_BITREVERSE=y
1090# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1091# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1052CONFIG_CRC_CCITT=m 1092CONFIG_CRC_CCITT=m
1053CONFIG_CRC16=m 1093CONFIG_CRC16=m
1054# CONFIG_CRC_ITU_T is not set 1094CONFIG_CRC_ITU_T=m
1055CONFIG_CRC32=y 1095CONFIG_CRC32=y
1056# CONFIG_CRC7 is not set 1096# CONFIG_CRC7 is not set
1057CONFIG_LIBCRC32C=m 1097CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
new file mode 100644
index 000000000000..4d23f99227f9
--- /dev/null
+++ b/arch/m68k/configs/multi_defconfig
@@ -0,0 +1,1269 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.26-rc2
4# Sun May 18 14:42:31 2008
5#
6CONFIG_M68K=y
7CONFIG_MMU=y
8CONFIG_RWSEM_GENERIC_SPINLOCK=y
9# CONFIG_ARCH_HAS_ILOG2_U32 is not set
10# CONFIG_ARCH_HAS_ILOG2_U64 is not set
11CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y
13CONFIG_TIME_LOW_RES=y
14CONFIG_GENERIC_IOMAP=y
15CONFIG_NO_IOPORT=y
16# CONFIG_NO_DMA is not set
17CONFIG_ARCH_SUPPORTS_AOUT=y
18CONFIG_HZ=100
19CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
20
21#
22# General setup
23#
24CONFIG_EXPERIMENTAL=y
25CONFIG_BROKEN_ON_SMP=y
26CONFIG_INIT_ENV_ARG_LIMIT=32
27CONFIG_LOCALVERSION="-multi"
28CONFIG_LOCALVERSION_AUTO=y
29CONFIG_SWAP=y
30CONFIG_SYSVIPC=y
31CONFIG_SYSVIPC_SYSCTL=y
32CONFIG_POSIX_MQUEUE=y
33CONFIG_BSD_PROCESS_ACCT=y
34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
35# CONFIG_TASKSTATS is not set
36# CONFIG_AUDIT is not set
37# CONFIG_IKCONFIG is not set
38CONFIG_LOG_BUF_SHIFT=14
39# CONFIG_CGROUPS is not set
40# CONFIG_GROUP_SCHED is not set
41# CONFIG_SYSFS_DEPRECATED_V2 is not set
42CONFIG_RELAY=y
43CONFIG_NAMESPACES=y
44# CONFIG_UTS_NS is not set
45# CONFIG_IPC_NS is not set
46# CONFIG_USER_NS is not set
47# CONFIG_PID_NS is not set
48CONFIG_BLK_DEV_INITRD=y
49CONFIG_INITRAMFS_SOURCE=""
50# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
51CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
56CONFIG_KALLSYMS=y
57# CONFIG_KALLSYMS_EXTRA_PASS is not set
58CONFIG_HOTPLUG=y
59CONFIG_PRINTK=y
60CONFIG_BUG=y
61CONFIG_ELF_CORE=y
62# CONFIG_COMPAT_BRK is not set
63CONFIG_BASE_FULL=y
64CONFIG_FUTEX=y
65CONFIG_ANON_INODES=y
66CONFIG_EPOLL=y
67CONFIG_SIGNALFD=y
68CONFIG_TIMERFD=y
69CONFIG_EVENTFD=y
70CONFIG_SHMEM=y
71CONFIG_VM_EVENT_COUNTERS=y
72CONFIG_SLAB=y
73# CONFIG_SLUB is not set
74# CONFIG_SLOB is not set
75# CONFIG_PROFILING is not set
76# CONFIG_MARKERS is not set
77# CONFIG_HAVE_OPROFILE is not set
78# CONFIG_HAVE_KPROBES is not set
79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
81CONFIG_PROC_PAGE_MONITOR=y
82CONFIG_SLABINFO=y
83CONFIG_RT_MUTEXES=y
84# CONFIG_TINY_SHMEM is not set
85CONFIG_BASE_SMALL=0
86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
88CONFIG_MODULE_UNLOAD=y
89# CONFIG_MODULE_FORCE_UNLOAD is not set
90# CONFIG_MODVERSIONS is not set
91# CONFIG_MODULE_SRCVERSION_ALL is not set
92CONFIG_KMOD=y
93CONFIG_BLOCK=y
94# CONFIG_LBD is not set
95# CONFIG_BLK_DEV_IO_TRACE is not set
96# CONFIG_LSF is not set
97CONFIG_BLK_DEV_BSG=y
98
99#
100# IO Schedulers
101#
102CONFIG_IOSCHED_NOOP=y
103CONFIG_IOSCHED_AS=y
104CONFIG_IOSCHED_DEADLINE=y
105CONFIG_IOSCHED_CFQ=y
106CONFIG_DEFAULT_AS=y
107# CONFIG_DEFAULT_DEADLINE is not set
108# CONFIG_DEFAULT_CFQ is not set
109# CONFIG_DEFAULT_NOOP is not set
110CONFIG_DEFAULT_IOSCHED="anticipatory"
111CONFIG_CLASSIC_RCU=y
112
113#
114# Platform dependent setup
115#
116# CONFIG_SUN3 is not set
117CONFIG_AMIGA=y
118CONFIG_ATARI=y
119CONFIG_MAC=y
120CONFIG_NUBUS=y
121CONFIG_M68K_L2_CACHE=y
122CONFIG_APOLLO=y
123CONFIG_VME=y
124CONFIG_MVME147=y
125CONFIG_MVME16x=y
126CONFIG_BVME6000=y
127CONFIG_HP300=y
128CONFIG_DIO=y
129CONFIG_SUN3X=y
130CONFIG_Q40=y
131
132#
133# Processor type
134#
135CONFIG_M68020=y
136CONFIG_M68030=y
137CONFIG_M68040=y
138CONFIG_M68060=y
139CONFIG_MMU_MOTOROLA=y
140# CONFIG_M68KFPU_EMU is not set
141# CONFIG_ADVANCED is not set
142CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
143CONFIG_NODES_SHIFT=3
144CONFIG_SELECT_MEMORY_MODEL=y
145# CONFIG_FLATMEM_MANUAL is not set
146CONFIG_DISCONTIGMEM_MANUAL=y
147# CONFIG_SPARSEMEM_MANUAL is not set
148CONFIG_DISCONTIGMEM=y
149CONFIG_FLAT_NODE_MEM_MAP=y
150CONFIG_NEED_MULTIPLE_NODES=y
151# CONFIG_SPARSEMEM_STATIC is not set
152# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
153CONFIG_PAGEFLAGS_EXTENDED=y
154CONFIG_SPLIT_PTLOCK_CPUS=4
155# CONFIG_RESOURCES_64BIT is not set
156CONFIG_ZONE_DMA_FLAG=1
157CONFIG_BOUNCE=y
158CONFIG_VIRT_TO_BUS=y
159
160#
161# General setup
162#
163CONFIG_BINFMT_ELF=y
164CONFIG_BINFMT_AOUT=m
165CONFIG_BINFMT_MISC=m
166CONFIG_ZORRO=y
167CONFIG_AMIGA_PCMCIA=y
168CONFIG_STRAM_PROC=y
169CONFIG_HEARTBEAT=y
170CONFIG_PROC_HARDWARE=y
171CONFIG_ISA=y
172CONFIG_GENERIC_ISA_DMA=y
173CONFIG_ZONE_DMA=y
174# CONFIG_ARCH_SUPPORTS_MSI is not set
175CONFIG_ZORRO_NAMES=y
176
177#
178# Networking
179#
180CONFIG_NET=y
181
182#
183# Networking options
184#
185CONFIG_PACKET=y
186# CONFIG_PACKET_MMAP is not set
187CONFIG_UNIX=y
188CONFIG_XFRM=y
189# CONFIG_XFRM_USER is not set
190# CONFIG_XFRM_SUB_POLICY is not set
191CONFIG_XFRM_MIGRATE=y
192# CONFIG_XFRM_STATISTICS is not set
193CONFIG_NET_KEY=y
194CONFIG_NET_KEY_MIGRATE=y
195CONFIG_INET=y
196# CONFIG_IP_MULTICAST is not set
197# CONFIG_IP_ADVANCED_ROUTER is not set
198CONFIG_IP_FIB_HASH=y
199CONFIG_IP_PNP=y
200CONFIG_IP_PNP_DHCP=y
201CONFIG_IP_PNP_BOOTP=y
202CONFIG_IP_PNP_RARP=y
203CONFIG_NET_IPIP=m
204CONFIG_NET_IPGRE=m
205# CONFIG_ARPD is not set
206CONFIG_SYN_COOKIES=y
207CONFIG_INET_AH=m
208CONFIG_INET_ESP=m
209CONFIG_INET_IPCOMP=m
210CONFIG_INET_XFRM_TUNNEL=m
211CONFIG_INET_TUNNEL=m
212CONFIG_INET_XFRM_MODE_TRANSPORT=m
213CONFIG_INET_XFRM_MODE_TUNNEL=m
214CONFIG_INET_XFRM_MODE_BEET=m
215CONFIG_INET_LRO=m
216CONFIG_INET_DIAG=m
217CONFIG_INET_TCP_DIAG=m
218# CONFIG_TCP_CONG_ADVANCED is not set
219CONFIG_TCP_CONG_CUBIC=y
220CONFIG_DEFAULT_TCP_CONG="cubic"
221# CONFIG_TCP_MD5SIG is not set
222# CONFIG_IP_VS is not set
223CONFIG_IPV6=m
224CONFIG_IPV6_PRIVACY=y
225CONFIG_IPV6_ROUTER_PREF=y
226CONFIG_IPV6_ROUTE_INFO=y
227# CONFIG_IPV6_OPTIMISTIC_DAD is not set
228CONFIG_INET6_AH=m
229CONFIG_INET6_ESP=m
230CONFIG_INET6_IPCOMP=m
231# CONFIG_IPV6_MIP6 is not set
232CONFIG_INET6_XFRM_TUNNEL=m
233CONFIG_INET6_TUNNEL=m
234CONFIG_INET6_XFRM_MODE_TRANSPORT=m
235CONFIG_INET6_XFRM_MODE_TUNNEL=m
236CONFIG_INET6_XFRM_MODE_BEET=m
237CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
238CONFIG_IPV6_SIT=m
239CONFIG_IPV6_NDISC_NODETYPE=y
240CONFIG_IPV6_TUNNEL=m
241# CONFIG_IPV6_MULTIPLE_TABLES is not set
242# CONFIG_IPV6_MROUTE is not set
243# CONFIG_NETWORK_SECMARK is not set
244CONFIG_NETFILTER=y
245# CONFIG_NETFILTER_DEBUG is not set
246CONFIG_NETFILTER_ADVANCED=y
247
248#
249# Core Netfilter Configuration
250#
251CONFIG_NETFILTER_NETLINK=m
252CONFIG_NETFILTER_NETLINK_QUEUE=m
253CONFIG_NETFILTER_NETLINK_LOG=m
254CONFIG_NF_CONNTRACK=m
255CONFIG_NF_CT_ACCT=y
256CONFIG_NF_CONNTRACK_MARK=y
257# CONFIG_NF_CONNTRACK_EVENTS is not set
258# CONFIG_NF_CT_PROTO_DCCP is not set
259CONFIG_NF_CT_PROTO_GRE=m
260CONFIG_NF_CT_PROTO_SCTP=m
261CONFIG_NF_CT_PROTO_UDPLITE=m
262CONFIG_NF_CONNTRACK_AMANDA=m
263CONFIG_NF_CONNTRACK_FTP=m
264CONFIG_NF_CONNTRACK_H323=m
265CONFIG_NF_CONNTRACK_IRC=m
266CONFIG_NF_CONNTRACK_NETBIOS_NS=m
267CONFIG_NF_CONNTRACK_PPTP=m
268CONFIG_NF_CONNTRACK_SANE=m
269CONFIG_NF_CONNTRACK_SIP=m
270CONFIG_NF_CONNTRACK_TFTP=m
271# CONFIG_NF_CT_NETLINK is not set
272CONFIG_NETFILTER_XTABLES=m
273CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
274CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
275CONFIG_NETFILTER_XT_TARGET_DSCP=m
276CONFIG_NETFILTER_XT_TARGET_MARK=m
277CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
278CONFIG_NETFILTER_XT_TARGET_NFLOG=m
279CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
280CONFIG_NETFILTER_XT_TARGET_RATEEST=m
281CONFIG_NETFILTER_XT_TARGET_TRACE=m
282CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
283CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
284CONFIG_NETFILTER_XT_MATCH_COMMENT=m
285CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
286CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
287CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
288CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
289CONFIG_NETFILTER_XT_MATCH_DCCP=m
290CONFIG_NETFILTER_XT_MATCH_DSCP=m
291CONFIG_NETFILTER_XT_MATCH_ESP=m
292CONFIG_NETFILTER_XT_MATCH_HELPER=m
293CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
294CONFIG_NETFILTER_XT_MATCH_LENGTH=m
295CONFIG_NETFILTER_XT_MATCH_LIMIT=m
296CONFIG_NETFILTER_XT_MATCH_MAC=m
297CONFIG_NETFILTER_XT_MATCH_MARK=m
298CONFIG_NETFILTER_XT_MATCH_OWNER=m
299CONFIG_NETFILTER_XT_MATCH_POLICY=m
300CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
301CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
302CONFIG_NETFILTER_XT_MATCH_QUOTA=m
303CONFIG_NETFILTER_XT_MATCH_RATEEST=m
304CONFIG_NETFILTER_XT_MATCH_REALM=m
305CONFIG_NETFILTER_XT_MATCH_SCTP=m
306CONFIG_NETFILTER_XT_MATCH_STATE=m
307CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
308CONFIG_NETFILTER_XT_MATCH_STRING=m
309CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
310CONFIG_NETFILTER_XT_MATCH_TIME=m
311CONFIG_NETFILTER_XT_MATCH_U32=m
312CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
313
314#
315# IP: Netfilter Configuration
316#
317CONFIG_NF_CONNTRACK_IPV4=m
318CONFIG_NF_CONNTRACK_PROC_COMPAT=y
319CONFIG_IP_NF_QUEUE=m
320CONFIG_IP_NF_IPTABLES=m
321CONFIG_IP_NF_MATCH_RECENT=m
322CONFIG_IP_NF_MATCH_ECN=m
323CONFIG_IP_NF_MATCH_AH=m
324CONFIG_IP_NF_MATCH_TTL=m
325CONFIG_IP_NF_MATCH_ADDRTYPE=m
326CONFIG_IP_NF_FILTER=m
327CONFIG_IP_NF_TARGET_REJECT=m
328CONFIG_IP_NF_TARGET_LOG=m
329CONFIG_IP_NF_TARGET_ULOG=m
330CONFIG_NF_NAT=m
331CONFIG_NF_NAT_NEEDED=y
332CONFIG_IP_NF_TARGET_MASQUERADE=m
333CONFIG_IP_NF_TARGET_REDIRECT=m
334CONFIG_IP_NF_TARGET_NETMAP=m
335CONFIG_NF_NAT_SNMP_BASIC=m
336CONFIG_NF_NAT_PROTO_GRE=m
337CONFIG_NF_NAT_PROTO_UDPLITE=m
338CONFIG_NF_NAT_PROTO_SCTP=m
339CONFIG_NF_NAT_FTP=m
340CONFIG_NF_NAT_IRC=m
341CONFIG_NF_NAT_TFTP=m
342CONFIG_NF_NAT_AMANDA=m
343CONFIG_NF_NAT_PPTP=m
344CONFIG_NF_NAT_H323=m
345CONFIG_NF_NAT_SIP=m
346CONFIG_IP_NF_MANGLE=m
347CONFIG_IP_NF_TARGET_ECN=m
348CONFIG_IP_NF_TARGET_TTL=m
349CONFIG_IP_NF_TARGET_CLUSTERIP=m
350CONFIG_IP_NF_RAW=m
351CONFIG_IP_NF_ARPTABLES=m
352CONFIG_IP_NF_ARPFILTER=m
353CONFIG_IP_NF_ARP_MANGLE=m
354
355#
356# IPv6: Netfilter Configuration
357#
358CONFIG_NF_CONNTRACK_IPV6=m
359CONFIG_IP6_NF_QUEUE=m
360CONFIG_IP6_NF_IPTABLES=m
361CONFIG_IP6_NF_MATCH_RT=m
362CONFIG_IP6_NF_MATCH_OPTS=m
363CONFIG_IP6_NF_MATCH_FRAG=m
364CONFIG_IP6_NF_MATCH_HL=m
365CONFIG_IP6_NF_MATCH_IPV6HEADER=m
366CONFIG_IP6_NF_MATCH_AH=m
367CONFIG_IP6_NF_MATCH_MH=m
368CONFIG_IP6_NF_MATCH_EUI64=m
369CONFIG_IP6_NF_FILTER=m
370CONFIG_IP6_NF_TARGET_LOG=m
371CONFIG_IP6_NF_TARGET_REJECT=m
372CONFIG_IP6_NF_MANGLE=m
373CONFIG_IP6_NF_TARGET_HL=m
374CONFIG_IP6_NF_RAW=m
375CONFIG_IP_DCCP=m
376CONFIG_INET_DCCP_DIAG=m
377CONFIG_IP_DCCP_ACKVEC=y
378
379#
380# DCCP CCIDs Configuration (EXPERIMENTAL)
381#
382CONFIG_IP_DCCP_CCID2=m
383# CONFIG_IP_DCCP_CCID2_DEBUG is not set
384CONFIG_IP_DCCP_CCID3=m
385# CONFIG_IP_DCCP_CCID3_DEBUG is not set
386CONFIG_IP_DCCP_CCID3_RTO=100
387CONFIG_IP_DCCP_TFRC_LIB=m
388CONFIG_IP_SCTP=m
389# CONFIG_SCTP_DBG_MSG is not set
390# CONFIG_SCTP_DBG_OBJCNT is not set
391# CONFIG_SCTP_HMAC_NONE is not set
392# CONFIG_SCTP_HMAC_SHA1 is not set
393CONFIG_SCTP_HMAC_MD5=y
394# CONFIG_TIPC is not set
395# CONFIG_ATM is not set
396# CONFIG_BRIDGE is not set
397# CONFIG_VLAN_8021Q is not set
398# CONFIG_DECNET is not set
399CONFIG_LLC=m
400# CONFIG_LLC2 is not set
401# CONFIG_IPX is not set
402CONFIG_ATALK=m
403CONFIG_DEV_APPLETALK=m
404# CONFIG_COPS is not set
405CONFIG_IPDDP=m
406CONFIG_IPDDP_ENCAP=y
407CONFIG_IPDDP_DECAP=y
408# CONFIG_X25 is not set
409# CONFIG_LAPB is not set
410# CONFIG_ECONET is not set
411# CONFIG_WAN_ROUTER is not set
412# CONFIG_NET_SCHED is not set
413CONFIG_NET_CLS_ROUTE=y
414
415#
416# Network testing
417#
418# CONFIG_NET_PKTGEN is not set
419# CONFIG_HAMRADIO is not set
420# CONFIG_CAN is not set
421# CONFIG_IRDA is not set
422# CONFIG_BT is not set
423# CONFIG_AF_RXRPC is not set
424
425#
426# Wireless
427#
428# CONFIG_CFG80211 is not set
429CONFIG_WIRELESS_EXT=y
430# CONFIG_MAC80211 is not set
431CONFIG_IEEE80211=m
432# CONFIG_IEEE80211_DEBUG is not set
433CONFIG_IEEE80211_CRYPT_WEP=m
434CONFIG_IEEE80211_CRYPT_CCMP=m
435CONFIG_IEEE80211_CRYPT_TKIP=m
436# CONFIG_RFKILL is not set
437# CONFIG_NET_9P is not set
438
439#
440# Device Drivers
441#
442
443#
444# Generic Driver Options
445#
446CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
447CONFIG_STANDALONE=y
448CONFIG_PREVENT_FIRMWARE_BUILD=y
449CONFIG_FW_LOADER=m
450# CONFIG_SYS_HYPERVISOR is not set
451CONFIG_CONNECTOR=m
452# CONFIG_MTD is not set
453CONFIG_PARPORT=m
454# CONFIG_PARPORT_PC is not set
455CONFIG_PARPORT_AMIGA=m
456CONFIG_PARPORT_MFC3=m
457CONFIG_PARPORT_ATARI=m
458# CONFIG_PARPORT_GSC is not set
459# CONFIG_PARPORT_AX88796 is not set
460CONFIG_PARPORT_1284=y
461CONFIG_PARPORT_NOT_PC=y
462# CONFIG_PNP is not set
463CONFIG_BLK_DEV=y
464CONFIG_AMIGA_FLOPPY=y
465CONFIG_ATARI_FLOPPY=y
466CONFIG_AMIGA_Z2RAM=y
467# CONFIG_BLK_DEV_COW_COMMON is not set
468CONFIG_BLK_DEV_LOOP=y
469CONFIG_BLK_DEV_CRYPTOLOOP=m
470CONFIG_BLK_DEV_NBD=m
471CONFIG_BLK_DEV_RAM=y
472CONFIG_BLK_DEV_RAM_COUNT=16
473CONFIG_BLK_DEV_RAM_SIZE=4096
474# CONFIG_BLK_DEV_XIP is not set
475CONFIG_CDROM_PKTCDVD=m
476CONFIG_CDROM_PKTCDVD_BUFFERS=8
477# CONFIG_CDROM_PKTCDVD_WCACHE is not set
478CONFIG_ATA_OVER_ETH=m
479CONFIG_MISC_DEVICES=y
480# CONFIG_EEPROM_93CX6 is not set
481# CONFIG_ENCLOSURE_SERVICES is not set
482CONFIG_HAVE_IDE=y
483CONFIG_IDE=y
484CONFIG_BLK_DEV_IDE=y
485
486#
487# Please see Documentation/ide/ide.txt for help/info on IDE drives
488#
489# CONFIG_BLK_DEV_IDE_SATA is not set
490CONFIG_BLK_DEV_IDEDISK=y
491# CONFIG_IDEDISK_MULTI_MODE is not set
492CONFIG_BLK_DEV_IDECD=y
493CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
494# CONFIG_BLK_DEV_IDETAPE is not set
495CONFIG_BLK_DEV_IDEFLOPPY=m
496# CONFIG_BLK_DEV_IDESCSI is not set
497# CONFIG_IDE_TASK_IOCTL is not set
498CONFIG_IDE_PROC_FS=y
499
500#
501# IDE chipset support/bugfixes
502#
503# CONFIG_BLK_DEV_PLATFORM is not set
504CONFIG_BLK_DEV_GAYLE=y
505CONFIG_BLK_DEV_IDEDOUBLER=y
506CONFIG_BLK_DEV_BUDDHA=y
507CONFIG_BLK_DEV_FALCON_IDE=y
508CONFIG_BLK_DEV_MAC_IDE=y
509CONFIG_BLK_DEV_Q40IDE=y
510# CONFIG_BLK_DEV_IDEDMA is not set
511# CONFIG_BLK_DEV_HD_ONLY is not set
512# CONFIG_BLK_DEV_HD is not set
513
514#
515# SCSI device support
516#
517CONFIG_RAID_ATTRS=m
518CONFIG_SCSI=y
519CONFIG_SCSI_DMA=y
520CONFIG_SCSI_TGT=m
521# CONFIG_SCSI_NETLINK is not set
522CONFIG_SCSI_PROC_FS=y
523
524#
525# SCSI support type (disk, tape, CD-ROM)
526#
527CONFIG_BLK_DEV_SD=y
528CONFIG_CHR_DEV_ST=m
529CONFIG_CHR_DEV_OSST=m
530CONFIG_BLK_DEV_SR=y
531CONFIG_BLK_DEV_SR_VENDOR=y
532CONFIG_CHR_DEV_SG=m
533# CONFIG_CHR_DEV_SCH is not set
534
535#
536# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
537#
538# CONFIG_SCSI_MULTI_LUN is not set
539CONFIG_SCSI_CONSTANTS=y
540# CONFIG_SCSI_LOGGING is not set
541# CONFIG_SCSI_SCAN_ASYNC is not set
542CONFIG_SCSI_WAIT_SCAN=m
543
544#
545# SCSI Transports
546#
547CONFIG_SCSI_SPI_ATTRS=y
548# CONFIG_SCSI_FC_ATTRS is not set
549CONFIG_SCSI_ISCSI_ATTRS=m
550CONFIG_SCSI_SAS_ATTRS=m
551CONFIG_SCSI_SAS_LIBSAS=m
552CONFIG_SCSI_SAS_HOST_SMP=y
553# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
554CONFIG_SCSI_SRP_ATTRS=m
555CONFIG_SCSI_SRP_TGT_ATTRS=y
556CONFIG_SCSI_LOWLEVEL=y
557CONFIG_ISCSI_TCP=m
558# CONFIG_SCSI_AHA152X is not set
559# CONFIG_SCSI_AIC7XXX_OLD is not set
560# CONFIG_SCSI_ADVANSYS is not set
561# CONFIG_SCSI_IN2000 is not set
562# CONFIG_SCSI_DTC3280 is not set
563# CONFIG_SCSI_FUTURE_DOMAIN is not set
564# CONFIG_SCSI_GENERIC_NCR5380 is not set
565# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
566# CONFIG_SCSI_NCR53C406A is not set
567CONFIG_53C700_BE_BUS=y
568# CONFIG_SCSI_PAS16 is not set
569# CONFIG_SCSI_QLOGIC_FAS is not set
570# CONFIG_SCSI_SYM53C416 is not set
571# CONFIG_SCSI_T128 is not set
572# CONFIG_SCSI_DEBUG is not set
573CONFIG_A3000_SCSI=y
574CONFIG_A2091_SCSI=y
575CONFIG_GVP11_SCSI=y
576CONFIG_SCSI_A4000T=y
577CONFIG_SCSI_ZORRO7XX=y
578CONFIG_ATARI_SCSI=y
579# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
580# CONFIG_ATARI_SCSI_RESET_BOOT is not set
581CONFIG_MAC_SCSI=y
582CONFIG_SCSI_MAC_ESP=y
583CONFIG_MVME147_SCSI=y
584CONFIG_MVME16x_SCSI=y
585CONFIG_BVME6000_SCSI=y
586CONFIG_SUN3X_ESP=y
587CONFIG_MD=y
588CONFIG_BLK_DEV_MD=m
589CONFIG_MD_LINEAR=m
590CONFIG_MD_RAID0=m
591CONFIG_MD_RAID1=m
592# CONFIG_MD_RAID10 is not set
593CONFIG_MD_RAID456=m
594CONFIG_MD_RAID5_RESHAPE=y
595CONFIG_MD_MULTIPATH=m
596# CONFIG_MD_FAULTY is not set
597CONFIG_BLK_DEV_DM=m
598# CONFIG_DM_DEBUG is not set
599CONFIG_DM_CRYPT=m
600CONFIG_DM_SNAPSHOT=m
601CONFIG_DM_MIRROR=m
602CONFIG_DM_ZERO=m
603CONFIG_DM_MULTIPATH=m
604CONFIG_DM_MULTIPATH_EMC=m
605CONFIG_DM_MULTIPATH_RDAC=m
606CONFIG_DM_MULTIPATH_HP=m
607# CONFIG_DM_DELAY is not set
608CONFIG_DM_UEVENT=y
609CONFIG_MACINTOSH_DRIVERS=y
610CONFIG_ADB=y
611CONFIG_ADB_MACII=y
612CONFIG_ADB_MACIISI=y
613CONFIG_ADB_IOP=y
614CONFIG_ADB_PMU68K=y
615CONFIG_ADB_CUDA=y
616CONFIG_INPUT_ADBHID=y
617CONFIG_MAC_EMUMOUSEBTN=y
618CONFIG_NETDEVICES=y
619# CONFIG_NETDEVICES_MULTIQUEUE is not set
620CONFIG_DUMMY=m
621# CONFIG_BONDING is not set
622CONFIG_MACVLAN=m
623CONFIG_EQUALIZER=m
624# CONFIG_TUN is not set
625CONFIG_VETH=m
626# CONFIG_ARCNET is not set
627# CONFIG_PHYLIB is not set
628CONFIG_NET_ETHERNET=y
629CONFIG_MII=m
630CONFIG_ARIADNE=m
631CONFIG_A2065=m
632CONFIG_HYDRA=m
633CONFIG_ZORRO8390=m
634CONFIG_APNE=m
635CONFIG_APOLLO_ELPLUS=y
636CONFIG_MAC8390=y
637CONFIG_MAC89x0=m
638CONFIG_MACSONIC=m
639CONFIG_MACMACE=y
640CONFIG_MVME147_NET=y
641CONFIG_MVME16x_NET=y
642CONFIG_BVME6000_NET=y
643CONFIG_ATARILANCE=m
644CONFIG_SUN3LANCE=y
645CONFIG_HPLANCE=y
646# CONFIG_NET_VENDOR_3COM is not set
647# CONFIG_NET_VENDOR_SMC is not set
648# CONFIG_NET_VENDOR_RACAL is not set
649# CONFIG_AT1700 is not set
650# CONFIG_DEPCA is not set
651# CONFIG_HP100 is not set
652# CONFIG_NET_ISA is not set
653CONFIG_NE2000=m
654# CONFIG_IBM_NEW_EMAC_ZMII is not set
655# CONFIG_IBM_NEW_EMAC_RGMII is not set
656# CONFIG_IBM_NEW_EMAC_TAH is not set
657# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
658# CONFIG_NET_PCI is not set
659# CONFIG_B44 is not set
660# CONFIG_NET_POCKET is not set
661# CONFIG_NETDEV_1000 is not set
662# CONFIG_NETDEV_10000 is not set
663# CONFIG_TR is not set
664
665#
666# Wireless LAN
667#
668# CONFIG_WLAN_PRE80211 is not set
669# CONFIG_WLAN_80211 is not set
670# CONFIG_IWLWIFI_LEDS is not set
671# CONFIG_WAN is not set
672# CONFIG_PLIP is not set
673CONFIG_PPP=m
674# CONFIG_PPP_MULTILINK is not set
675CONFIG_PPP_FILTER=y
676CONFIG_PPP_ASYNC=m
677CONFIG_PPP_SYNC_TTY=m
678CONFIG_PPP_DEFLATE=m
679CONFIG_PPP_BSDCOMP=m
680CONFIG_PPP_MPPE=m
681CONFIG_PPPOE=m
682CONFIG_PPPOL2TP=m
683CONFIG_SLIP=m
684CONFIG_SLIP_COMPRESSED=y
685CONFIG_SLHC=m
686CONFIG_SLIP_SMART=y
687CONFIG_SLIP_MODE_SLIP6=y
688CONFIG_NETCONSOLE=m
689CONFIG_NETCONSOLE_DYNAMIC=y
690CONFIG_NETPOLL=y
691# CONFIG_NETPOLL_TRAP is not set
692CONFIG_NET_POLL_CONTROLLER=y
693# CONFIG_ISDN is not set
694# CONFIG_PHONE is not set
695
696#
697# Input device support
698#
699CONFIG_INPUT=y
700CONFIG_INPUT_FF_MEMLESS=m
701# CONFIG_INPUT_POLLDEV is not set
702
703#
704# Userland interfaces
705#
706CONFIG_INPUT_MOUSEDEV=y
707CONFIG_INPUT_MOUSEDEV_PSAUX=y
708CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
709CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
710# CONFIG_INPUT_JOYDEV is not set
711# CONFIG_INPUT_EVDEV is not set
712# CONFIG_INPUT_EVBUG is not set
713
714#
715# Input Device Drivers
716#
717CONFIG_INPUT_KEYBOARD=y
718# CONFIG_KEYBOARD_ATKBD is not set
719CONFIG_KEYBOARD_SUNKBD=y
720# CONFIG_KEYBOARD_LKKBD is not set
721# CONFIG_KEYBOARD_XTKBD is not set
722# CONFIG_KEYBOARD_NEWTON is not set
723# CONFIG_KEYBOARD_STOWAWAY is not set
724CONFIG_KEYBOARD_AMIGA=y
725CONFIG_ATARI_KBD_CORE=y
726CONFIG_KEYBOARD_ATARI=y
727CONFIG_KEYBOARD_HIL_OLD=y
728CONFIG_KEYBOARD_HIL=y
729CONFIG_INPUT_MOUSE=y
730CONFIG_MOUSE_PS2=y
731CONFIG_MOUSE_PS2_ALPS=y
732CONFIG_MOUSE_PS2_LOGIPS2PP=y
733CONFIG_MOUSE_PS2_SYNAPTICS=y
734CONFIG_MOUSE_PS2_LIFEBOOK=y
735CONFIG_MOUSE_PS2_TRACKPOINT=y
736# CONFIG_MOUSE_PS2_TOUCHKIT is not set
737CONFIG_MOUSE_SERIAL=m
738# CONFIG_MOUSE_INPORT is not set
739# CONFIG_MOUSE_LOGIBM is not set
740# CONFIG_MOUSE_PC110PAD is not set
741CONFIG_MOUSE_AMIGA=m
742CONFIG_MOUSE_ATARI=m
743# CONFIG_MOUSE_VSXXXAA is not set
744CONFIG_MOUSE_HIL=m
745CONFIG_INPUT_JOYSTICK=y
746# CONFIG_JOYSTICK_ANALOG is not set
747# CONFIG_JOYSTICK_A3D is not set
748# CONFIG_JOYSTICK_ADI is not set
749# CONFIG_JOYSTICK_COBRA is not set
750# CONFIG_JOYSTICK_GF2K is not set
751# CONFIG_JOYSTICK_GRIP is not set
752# CONFIG_JOYSTICK_GRIP_MP is not set
753# CONFIG_JOYSTICK_GUILLEMOT is not set
754# CONFIG_JOYSTICK_INTERACT is not set
755# CONFIG_JOYSTICK_SIDEWINDER is not set
756# CONFIG_JOYSTICK_TMDC is not set
757# CONFIG_JOYSTICK_IFORCE is not set
758# CONFIG_JOYSTICK_WARRIOR is not set
759# CONFIG_JOYSTICK_MAGELLAN is not set
760# CONFIG_JOYSTICK_SPACEORB is not set
761# CONFIG_JOYSTICK_SPACEBALL is not set
762# CONFIG_JOYSTICK_STINGER is not set
763# CONFIG_JOYSTICK_TWIDJOY is not set
764# CONFIG_JOYSTICK_ZHENHUA is not set
765# CONFIG_JOYSTICK_DB9 is not set
766# CONFIG_JOYSTICK_GAMECON is not set
767# CONFIG_JOYSTICK_TURBOGRAFX is not set
768CONFIG_JOYSTICK_AMIGA=m
769# CONFIG_JOYSTICK_JOYDUMP is not set
770# CONFIG_INPUT_TABLET is not set
771# CONFIG_INPUT_TOUCHSCREEN is not set
772CONFIG_INPUT_MISC=y
773CONFIG_INPUT_M68K_BEEP=m
774# CONFIG_INPUT_UINPUT is not set
775CONFIG_HP_SDC_RTC=m
776
777#
778# Hardware I/O ports
779#
780CONFIG_SERIO=y
781# CONFIG_SERIO_SERPORT is not set
782CONFIG_SERIO_Q40KBD=m
783# CONFIG_SERIO_PARKBD is not set
784CONFIG_HP_SDC=y
785CONFIG_HIL_MLC=y
786CONFIG_SERIO_LIBPS2=y
787# CONFIG_SERIO_RAW is not set
788# CONFIG_GAMEPORT is not set
789
790#
791# Character devices
792#
793CONFIG_VT=y
794CONFIG_VT_CONSOLE=y
795CONFIG_HW_CONSOLE=y
796CONFIG_VT_HW_CONSOLE_BINDING=y
797# CONFIG_DEVKMEM is not set
798# CONFIG_SERIAL_NONSTANDARD is not set
799CONFIG_A2232=m
800
801#
802# Serial drivers
803#
804# CONFIG_SERIAL_8250 is not set
805
806#
807# Non-8250 serial port support
808#
809CONFIG_UNIX98_PTYS=y
810CONFIG_LEGACY_PTYS=y
811CONFIG_LEGACY_PTY_COUNT=256
812CONFIG_PRINTER=m
813# CONFIG_LP_CONSOLE is not set
814# CONFIG_PPDEV is not set
815# CONFIG_IPMI_HANDLER is not set
816# CONFIG_HW_RANDOM is not set
817CONFIG_NVRAM=y
818CONFIG_GEN_RTC=m
819CONFIG_GEN_RTC_X=y
820# CONFIG_DTLK is not set
821# CONFIG_R3964 is not set
822# CONFIG_RAW_DRIVER is not set
823# CONFIG_TCG_TPM is not set
824# CONFIG_I2C is not set
825# CONFIG_SPI is not set
826# CONFIG_W1 is not set
827# CONFIG_POWER_SUPPLY is not set
828# CONFIG_HWMON is not set
829# CONFIG_THERMAL is not set
830# CONFIG_WATCHDOG is not set
831
832#
833# Sonics Silicon Backplane
834#
835CONFIG_SSB_POSSIBLE=y
836# CONFIG_SSB is not set
837
838#
839# Multifunction device drivers
840#
841# CONFIG_MFD_SM501 is not set
842# CONFIG_HTC_PASIC3 is not set
843
844#
845# Multimedia devices
846#
847
848#
849# Multimedia core support
850#
851# CONFIG_VIDEO_DEV is not set
852# CONFIG_DVB_CORE is not set
853# CONFIG_VIDEO_MEDIA is not set
854
855#
856# Multimedia drivers
857#
858# CONFIG_DAB is not set
859
860#
861# Graphics support
862#
863# CONFIG_VGASTATE is not set
864# CONFIG_VIDEO_OUTPUT_CONTROL is not set
865CONFIG_FB=y
866# CONFIG_FIRMWARE_EDID is not set
867# CONFIG_FB_DDC is not set
868CONFIG_FB_CFB_FILLRECT=y
869CONFIG_FB_CFB_COPYAREA=y
870CONFIG_FB_CFB_IMAGEBLIT=y
871# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
872# CONFIG_FB_SYS_FILLRECT is not set
873# CONFIG_FB_SYS_COPYAREA is not set
874# CONFIG_FB_SYS_IMAGEBLIT is not set
875# CONFIG_FB_FOREIGN_ENDIAN is not set
876# CONFIG_FB_SYS_FOPS is not set
877# CONFIG_FB_SVGALIB is not set
878CONFIG_FB_MACMODES=y
879# CONFIG_FB_BACKLIGHT is not set
880# CONFIG_FB_MODE_HELPERS is not set
881# CONFIG_FB_TILEBLITTING is not set
882
883#
884# Frame buffer hardware drivers
885#
886CONFIG_FB_CIRRUS=y
887CONFIG_FB_APOLLO=y
888CONFIG_FB_Q40=y
889CONFIG_FB_AMIGA=y
890CONFIG_FB_AMIGA_OCS=y
891CONFIG_FB_AMIGA_ECS=y
892CONFIG_FB_AMIGA_AGA=y
893CONFIG_FB_FM2=y
894CONFIG_FB_ATARI=y
895CONFIG_FB_VALKYRIE=y
896CONFIG_FB_MAC=y
897CONFIG_FB_HP300=y
898# CONFIG_FB_UVESA is not set
899# CONFIG_FB_S1D13XXX is not set
900# CONFIG_FB_ATY is not set
901# CONFIG_FB_VIRTUAL is not set
902# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
903
904#
905# Display device support
906#
907# CONFIG_DISPLAY_SUPPORT is not set
908
909#
910# Console display driver support
911#
912CONFIG_DUMMY_CONSOLE=y
913CONFIG_FRAMEBUFFER_CONSOLE=y
914# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
915# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
916# CONFIG_FONTS is not set
917CONFIG_FONT_8x8=y
918CONFIG_FONT_8x16=y
919CONFIG_FONT_6x11=y
920CONFIG_FONT_PEARL_8x8=y
921CONFIG_LOGO=y
922CONFIG_LOGO_LINUX_MONO=y
923CONFIG_LOGO_LINUX_VGA16=y
924CONFIG_LOGO_LINUX_CLUT224=y
925CONFIG_LOGO_MAC_CLUT224=y
926
927#
928# Sound
929#
930CONFIG_SOUND=m
931CONFIG_DMASOUND_ATARI=m
932CONFIG_DMASOUND_PAULA=m
933CONFIG_DMASOUND_Q40=m
934CONFIG_DMASOUND=m
935CONFIG_HID_SUPPORT=y
936CONFIG_HID=m
937# CONFIG_HID_DEBUG is not set
938CONFIG_HIDRAW=y
939# CONFIG_USB_SUPPORT is not set
940# CONFIG_MMC is not set
941# CONFIG_MEMSTICK is not set
942# CONFIG_NEW_LEDS is not set
943# CONFIG_ACCESSIBILITY is not set
944# CONFIG_RTC_CLASS is not set
945# CONFIG_AUXDISPLAY is not set
946# CONFIG_UIO is not set
947
948#
949# Character devices
950#
951CONFIG_ATARI_MFPSER=m
952CONFIG_ATARI_SCC=y
953CONFIG_ATARI_SCC_DMA=y
954CONFIG_ATARI_MIDI=m
955CONFIG_ATARI_DSP56K=m
956CONFIG_AMIGA_BUILTIN_SERIAL=y
957CONFIG_MULTIFACE_III_TTY=m
958CONFIG_MAC_SCC=y
959CONFIG_MAC_HID=y
960CONFIG_MVME147_SCC=y
961CONFIG_SERIAL167=y
962CONFIG_MVME162_SCC=y
963CONFIG_BVME6000_SCC=y
964CONFIG_DN_SERIAL=y
965CONFIG_SERIAL_CONSOLE=y
966
967#
968# File systems
969#
970CONFIG_EXT2_FS=y
971# CONFIG_EXT2_FS_XATTR is not set
972# CONFIG_EXT2_FS_XIP is not set
973CONFIG_EXT3_FS=y
974# CONFIG_EXT3_FS_XATTR is not set
975# CONFIG_EXT4DEV_FS is not set
976CONFIG_JBD=y
977CONFIG_REISERFS_FS=m
978# CONFIG_REISERFS_CHECK is not set
979# CONFIG_REISERFS_PROC_INFO is not set
980# CONFIG_REISERFS_FS_XATTR is not set
981CONFIG_JFS_FS=m
982# CONFIG_JFS_POSIX_ACL is not set
983# CONFIG_JFS_SECURITY is not set
984# CONFIG_JFS_DEBUG is not set
985# CONFIG_JFS_STATISTICS is not set
986# CONFIG_FS_POSIX_ACL is not set
987CONFIG_XFS_FS=m
988# CONFIG_XFS_QUOTA is not set
989# CONFIG_XFS_POSIX_ACL is not set
990# CONFIG_XFS_RT is not set
991# CONFIG_XFS_DEBUG is not set
992CONFIG_OCFS2_FS=m
993CONFIG_OCFS2_FS_O2CB=m
994CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
995# CONFIG_OCFS2_DEBUG_MASKLOG is not set
996# CONFIG_OCFS2_DEBUG_FS is not set
997CONFIG_DNOTIFY=y
998CONFIG_INOTIFY=y
999CONFIG_INOTIFY_USER=y
1000CONFIG_QUOTA=y
1001CONFIG_QUOTA_NETLINK_INTERFACE=y
1002# CONFIG_PRINT_QUOTA_WARNING is not set
1003# CONFIG_QFMT_V1 is not set
1004# CONFIG_QFMT_V2 is not set
1005CONFIG_QUOTACTL=y
1006CONFIG_AUTOFS_FS=m
1007CONFIG_AUTOFS4_FS=m
1008CONFIG_FUSE_FS=m
1009
1010#
1011# CD-ROM/DVD Filesystems
1012#
1013CONFIG_ISO9660_FS=y
1014CONFIG_JOLIET=y
1015CONFIG_ZISOFS=y
1016CONFIG_UDF_FS=m
1017CONFIG_UDF_NLS=y
1018
1019#
1020# DOS/FAT/NT Filesystems
1021#
1022CONFIG_FAT_FS=y
1023CONFIG_MSDOS_FS=y
1024CONFIG_VFAT_FS=m
1025CONFIG_FAT_DEFAULT_CODEPAGE=437
1026CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1027# CONFIG_NTFS_FS is not set
1028
1029#
1030# Pseudo filesystems
1031#
1032CONFIG_PROC_FS=y
1033CONFIG_PROC_KCORE=y
1034CONFIG_PROC_SYSCTL=y
1035CONFIG_SYSFS=y
1036CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set
1039CONFIG_CONFIGFS_FS=m
1040
1041#
1042# Miscellaneous filesystems
1043#
1044# CONFIG_ADFS_FS is not set
1045CONFIG_AFFS_FS=m
1046CONFIG_HFS_FS=y
1047CONFIG_HFSPLUS_FS=y
1048# CONFIG_BEFS_FS is not set
1049# CONFIG_BFS_FS is not set
1050# CONFIG_EFS_FS is not set
1051CONFIG_CRAMFS=m
1052# CONFIG_VXFS_FS is not set
1053CONFIG_MINIX_FS=y
1054CONFIG_HPFS_FS=m
1055# CONFIG_QNX4FS_FS is not set
1056# CONFIG_ROMFS_FS is not set
1057CONFIG_SYSV_FS=m
1058CONFIG_UFS_FS=m
1059# CONFIG_UFS_FS_WRITE is not set
1060# CONFIG_UFS_DEBUG is not set
1061CONFIG_NETWORK_FILESYSTEMS=y
1062CONFIG_NFS_FS=y
1063CONFIG_NFS_V3=y
1064# CONFIG_NFS_V3_ACL is not set
1065CONFIG_NFS_V4=y
1066CONFIG_NFSD=m
1067CONFIG_NFSD_V3=y
1068# CONFIG_NFSD_V3_ACL is not set
1069# CONFIG_NFSD_V4 is not set
1070CONFIG_ROOT_NFS=y
1071CONFIG_LOCKD=y
1072CONFIG_LOCKD_V4=y
1073CONFIG_EXPORTFS=m
1074CONFIG_NFS_COMMON=y
1075CONFIG_SUNRPC=y
1076CONFIG_SUNRPC_GSS=y
1077CONFIG_SUNRPC_BIND34=y
1078CONFIG_RPCSEC_GSS_KRB5=y
1079# CONFIG_RPCSEC_GSS_SPKM3 is not set
1080CONFIG_SMB_FS=m
1081CONFIG_SMB_NLS_DEFAULT=y
1082CONFIG_SMB_NLS_REMOTE="cp437"
1083# CONFIG_CIFS is not set
1084# CONFIG_NCP_FS is not set
1085CONFIG_CODA_FS=m
1086# CONFIG_CODA_FS_OLD_API is not set
1087# CONFIG_AFS_FS is not set
1088
1089#
1090# Partition Types
1091#
1092# CONFIG_PARTITION_ADVANCED is not set
1093CONFIG_AMIGA_PARTITION=y
1094CONFIG_ATARI_PARTITION=y
1095CONFIG_MAC_PARTITION=y
1096CONFIG_MSDOS_PARTITION=y
1097CONFIG_SUN_PARTITION=y
1098CONFIG_SYSV68_PARTITION=y
1099CONFIG_NLS=y
1100CONFIG_NLS_DEFAULT="iso8859-1"
1101CONFIG_NLS_CODEPAGE_437=y
1102CONFIG_NLS_CODEPAGE_737=m
1103CONFIG_NLS_CODEPAGE_775=m
1104CONFIG_NLS_CODEPAGE_850=m
1105CONFIG_NLS_CODEPAGE_852=m
1106CONFIG_NLS_CODEPAGE_855=m
1107CONFIG_NLS_CODEPAGE_857=m
1108CONFIG_NLS_CODEPAGE_860=m
1109CONFIG_NLS_CODEPAGE_861=m
1110CONFIG_NLS_CODEPAGE_862=m
1111CONFIG_NLS_CODEPAGE_863=m
1112CONFIG_NLS_CODEPAGE_864=m
1113CONFIG_NLS_CODEPAGE_865=m
1114CONFIG_NLS_CODEPAGE_866=m
1115CONFIG_NLS_CODEPAGE_869=m
1116CONFIG_NLS_CODEPAGE_936=m
1117CONFIG_NLS_CODEPAGE_950=m
1118CONFIG_NLS_CODEPAGE_932=m
1119CONFIG_NLS_CODEPAGE_949=m
1120CONFIG_NLS_CODEPAGE_874=m
1121CONFIG_NLS_ISO8859_8=m
1122CONFIG_NLS_CODEPAGE_1250=m
1123CONFIG_NLS_CODEPAGE_1251=m
1124CONFIG_NLS_ASCII=m
1125CONFIG_NLS_ISO8859_1=y
1126CONFIG_NLS_ISO8859_2=m
1127CONFIG_NLS_ISO8859_3=m
1128CONFIG_NLS_ISO8859_4=m
1129CONFIG_NLS_ISO8859_5=m
1130CONFIG_NLS_ISO8859_6=m
1131CONFIG_NLS_ISO8859_7=m
1132CONFIG_NLS_ISO8859_9=m
1133CONFIG_NLS_ISO8859_13=m
1134CONFIG_NLS_ISO8859_14=m
1135CONFIG_NLS_ISO8859_15=m
1136CONFIG_NLS_KOI8_R=m
1137CONFIG_NLS_KOI8_U=m
1138CONFIG_NLS_UTF8=y
1139CONFIG_DLM=m
1140# CONFIG_DLM_DEBUG is not set
1141
1142#
1143# Kernel hacking
1144#
1145# CONFIG_PRINTK_TIME is not set
1146CONFIG_ENABLE_WARN_DEPRECATED=y
1147CONFIG_ENABLE_MUST_CHECK=y
1148CONFIG_FRAME_WARN=1024
1149CONFIG_MAGIC_SYSRQ=y
1150# CONFIG_UNUSED_SYMBOLS is not set
1151# CONFIG_DEBUG_FS is not set
1152# CONFIG_HEADERS_CHECK is not set
1153# CONFIG_DEBUG_KERNEL is not set
1154CONFIG_DEBUG_BUGVERBOSE=y
1155# CONFIG_SAMPLES is not set
1156
1157#
1158# Security options
1159#
1160# CONFIG_KEYS is not set
1161# CONFIG_SECURITY is not set
1162# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1163CONFIG_XOR_BLOCKS=m
1164CONFIG_ASYNC_CORE=m
1165CONFIG_ASYNC_MEMCPY=m
1166CONFIG_ASYNC_XOR=m
1167CONFIG_CRYPTO=y
1168
1169#
1170# Crypto core or helper
1171#
1172CONFIG_CRYPTO_ALGAPI=y
1173CONFIG_CRYPTO_AEAD=m
1174CONFIG_CRYPTO_BLKCIPHER=y
1175CONFIG_CRYPTO_HASH=y
1176CONFIG_CRYPTO_MANAGER=y
1177CONFIG_CRYPTO_GF128MUL=m
1178CONFIG_CRYPTO_NULL=m
1179CONFIG_CRYPTO_CRYPTD=m
1180CONFIG_CRYPTO_AUTHENC=m
1181CONFIG_CRYPTO_TEST=m
1182
1183#
1184# Authenticated Encryption with Associated Data
1185#
1186CONFIG_CRYPTO_CCM=m
1187CONFIG_CRYPTO_GCM=m
1188CONFIG_CRYPTO_SEQIV=m
1189
1190#
1191# Block modes
1192#
1193CONFIG_CRYPTO_CBC=y
1194CONFIG_CRYPTO_CTR=m
1195CONFIG_CRYPTO_CTS=m
1196CONFIG_CRYPTO_ECB=m
1197CONFIG_CRYPTO_LRW=m
1198CONFIG_CRYPTO_PCBC=m
1199CONFIG_CRYPTO_XTS=m
1200
1201#
1202# Hash modes
1203#
1204CONFIG_CRYPTO_HMAC=y
1205CONFIG_CRYPTO_XCBC=m
1206
1207#
1208# Digest
1209#
1210CONFIG_CRYPTO_CRC32C=m
1211CONFIG_CRYPTO_MD4=m
1212CONFIG_CRYPTO_MD5=y
1213CONFIG_CRYPTO_MICHAEL_MIC=m
1214CONFIG_CRYPTO_SHA1=m
1215CONFIG_CRYPTO_SHA256=m
1216CONFIG_CRYPTO_SHA512=m
1217CONFIG_CRYPTO_TGR192=m
1218CONFIG_CRYPTO_WP512=m
1219
1220#
1221# Ciphers
1222#
1223CONFIG_CRYPTO_AES=m
1224CONFIG_CRYPTO_ANUBIS=m
1225CONFIG_CRYPTO_ARC4=m
1226CONFIG_CRYPTO_BLOWFISH=m
1227CONFIG_CRYPTO_CAMELLIA=m
1228CONFIG_CRYPTO_CAST5=m
1229CONFIG_CRYPTO_CAST6=m
1230CONFIG_CRYPTO_DES=y
1231CONFIG_CRYPTO_FCRYPT=m
1232CONFIG_CRYPTO_KHAZAD=m
1233CONFIG_CRYPTO_SALSA20=m
1234CONFIG_CRYPTO_SEED=m
1235CONFIG_CRYPTO_SERPENT=m
1236CONFIG_CRYPTO_TEA=m
1237CONFIG_CRYPTO_TWOFISH=m
1238CONFIG_CRYPTO_TWOFISH_COMMON=m
1239
1240#
1241# Compression
1242#
1243CONFIG_CRYPTO_DEFLATE=m
1244CONFIG_CRYPTO_LZO=m
1245# CONFIG_CRYPTO_HW is not set
1246
1247#
1248# Library routines
1249#
1250CONFIG_BITREVERSE=y
1251# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1252# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1253CONFIG_CRC_CCITT=m
1254CONFIG_CRC16=y
1255CONFIG_CRC_ITU_T=m
1256CONFIG_CRC32=y
1257# CONFIG_CRC7 is not set
1258CONFIG_LIBCRC32C=m
1259CONFIG_ZLIB_INFLATE=y
1260CONFIG_ZLIB_DEFLATE=m
1261CONFIG_LZO_COMPRESS=m
1262CONFIG_LZO_DECOMPRESS=m
1263CONFIG_TEXTSEARCH=y
1264CONFIG_TEXTSEARCH_KMP=m
1265CONFIG_TEXTSEARCH_BM=m
1266CONFIG_TEXTSEARCH_FSM=m
1267CONFIG_PLIST=y
1268CONFIG_HAS_IOMEM=y
1269CONFIG_HAS_DMA=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index f40b1724254b..188847fed824 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:17 2008 4# Sun May 18 14:44:49 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -144,6 +147,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
144CONFIG_NEED_MULTIPLE_NODES=y 147CONFIG_NEED_MULTIPLE_NODES=y
145# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 149# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
150CONFIG_PAGEFLAGS_EXTENDED=y
147CONFIG_SPLIT_PTLOCK_CPUS=4 151CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set 152# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1 153CONFIG_ZONE_DMA_FLAG=1
@@ -222,8 +226,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
222CONFIG_INET6_XFRM_MODE_BEET=m 226CONFIG_INET6_XFRM_MODE_BEET=m
223CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 227CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
224CONFIG_IPV6_SIT=m 228CONFIG_IPV6_SIT=m
229CONFIG_IPV6_NDISC_NODETYPE=y
225CONFIG_IPV6_TUNNEL=m 230CONFIG_IPV6_TUNNEL=m
226# CONFIG_IPV6_MULTIPLE_TABLES is not set 231# CONFIG_IPV6_MULTIPLE_TABLES is not set
232# CONFIG_IPV6_MROUTE is not set
227# CONFIG_NETWORK_SECMARK is not set 233# CONFIG_NETWORK_SECMARK is not set
228CONFIG_NETFILTER=y 234CONFIG_NETFILTER=y
229# CONFIG_NETFILTER_DEBUG is not set 235# CONFIG_NETFILTER_DEBUG is not set
@@ -239,6 +245,7 @@ CONFIG_NF_CONNTRACK=m
239CONFIG_NF_CT_ACCT=y 245CONFIG_NF_CT_ACCT=y
240CONFIG_NF_CONNTRACK_MARK=y 246CONFIG_NF_CONNTRACK_MARK=y
241# CONFIG_NF_CONNTRACK_EVENTS is not set 247# CONFIG_NF_CONNTRACK_EVENTS is not set
248# CONFIG_NF_CT_PROTO_DCCP is not set
242CONFIG_NF_CT_PROTO_GRE=m 249CONFIG_NF_CT_PROTO_GRE=m
243CONFIG_NF_CT_PROTO_SCTP=m 250CONFIG_NF_CT_PROTO_SCTP=m
244CONFIG_NF_CT_PROTO_UDPLITE=m 251CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -317,6 +324,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
317CONFIG_IP_NF_TARGET_NETMAP=m 324CONFIG_IP_NF_TARGET_NETMAP=m
318CONFIG_NF_NAT_SNMP_BASIC=m 325CONFIG_NF_NAT_SNMP_BASIC=m
319CONFIG_NF_NAT_PROTO_GRE=m 326CONFIG_NF_NAT_PROTO_GRE=m
327CONFIG_NF_NAT_PROTO_UDPLITE=m
328CONFIG_NF_NAT_PROTO_SCTP=m
320CONFIG_NF_NAT_FTP=m 329CONFIG_NF_NAT_FTP=m
321CONFIG_NF_NAT_IRC=m 330CONFIG_NF_NAT_IRC=m
322CONFIG_NF_NAT_TFTP=m 331CONFIG_NF_NAT_TFTP=m
@@ -410,8 +419,6 @@ CONFIG_IEEE80211=m
410CONFIG_IEEE80211_CRYPT_WEP=m 419CONFIG_IEEE80211_CRYPT_WEP=m
411CONFIG_IEEE80211_CRYPT_CCMP=m 420CONFIG_IEEE80211_CRYPT_CCMP=m
412CONFIG_IEEE80211_CRYPT_TKIP=m 421CONFIG_IEEE80211_CRYPT_TKIP=m
413CONFIG_IEEE80211_SOFTMAC=m
414# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
415# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
417 424
@@ -542,6 +549,7 @@ CONFIG_MVME147_NET=y
542# 549#
543# CONFIG_WLAN_PRE80211 is not set 550# CONFIG_WLAN_PRE80211 is not set
544# CONFIG_WLAN_80211 is not set 551# CONFIG_WLAN_80211 is not set
552# CONFIG_IWLWIFI_LEDS is not set
545# CONFIG_WAN is not set 553# CONFIG_WAN is not set
546CONFIG_PPP=m 554CONFIG_PPP=m
547# CONFIG_PPP_MULTILINK is not set 555# CONFIG_PPP_MULTILINK is not set
@@ -625,6 +633,7 @@ CONFIG_VT=y
625CONFIG_VT_CONSOLE=y 633CONFIG_VT_CONSOLE=y
626CONFIG_HW_CONSOLE=y 634CONFIG_HW_CONSOLE=y
627CONFIG_VT_HW_CONSOLE_BINDING=y 635CONFIG_VT_HW_CONSOLE_BINDING=y
636# CONFIG_DEVKMEM is not set
628# CONFIG_SERIAL_NONSTANDARD is not set 637# CONFIG_SERIAL_NONSTANDARD is not set
629 638
630# 639#
@@ -646,12 +655,7 @@ CONFIG_GEN_RTC_X=y
646# CONFIG_RAW_DRIVER is not set 655# CONFIG_RAW_DRIVER is not set
647# CONFIG_TCG_TPM is not set 656# CONFIG_TCG_TPM is not set
648# CONFIG_I2C is not set 657# CONFIG_I2C is not set
649
650#
651# SPI support
652#
653# CONFIG_SPI is not set 658# CONFIG_SPI is not set
654# CONFIG_SPI_MASTER is not set
655# CONFIG_W1 is not set 659# CONFIG_W1 is not set
656# CONFIG_POWER_SUPPLY is not set 660# CONFIG_POWER_SUPPLY is not set
657# CONFIG_HWMON is not set 661# CONFIG_HWMON is not set
@@ -668,12 +672,22 @@ CONFIG_SSB_POSSIBLE=y
668# Multifunction device drivers 672# Multifunction device drivers
669# 673#
670# CONFIG_MFD_SM501 is not set 674# CONFIG_MFD_SM501 is not set
675# CONFIG_HTC_PASIC3 is not set
671 676
672# 677#
673# Multimedia devices 678# Multimedia devices
674# 679#
680
681#
682# Multimedia core support
683#
675# CONFIG_VIDEO_DEV is not set 684# CONFIG_VIDEO_DEV is not set
676# CONFIG_DVB_CORE is not set 685# CONFIG_DVB_CORE is not set
686# CONFIG_VIDEO_MEDIA is not set
687
688#
689# Multimedia drivers
690#
677# CONFIG_DAB is not set 691# CONFIG_DAB is not set
678 692
679# 693#
@@ -706,11 +720,8 @@ CONFIG_HIDRAW=y
706# CONFIG_MMC is not set 720# CONFIG_MMC is not set
707# CONFIG_MEMSTICK is not set 721# CONFIG_MEMSTICK is not set
708# CONFIG_NEW_LEDS is not set 722# CONFIG_NEW_LEDS is not set
723# CONFIG_ACCESSIBILITY is not set
709# CONFIG_RTC_CLASS is not set 724# CONFIG_RTC_CLASS is not set
710
711#
712# Userspace I/O
713#
714# CONFIG_UIO is not set 725# CONFIG_UIO is not set
715 726
716# 727#
@@ -738,16 +749,15 @@ CONFIG_JFS_FS=m
738# CONFIG_JFS_SECURITY is not set 749# CONFIG_JFS_SECURITY is not set
739# CONFIG_JFS_DEBUG is not set 750# CONFIG_JFS_DEBUG is not set
740# CONFIG_JFS_STATISTICS is not set 751# CONFIG_JFS_STATISTICS is not set
741CONFIG_FS_POSIX_ACL=y 752# CONFIG_FS_POSIX_ACL is not set
742CONFIG_XFS_FS=m 753CONFIG_XFS_FS=m
743# CONFIG_XFS_QUOTA is not set 754# CONFIG_XFS_QUOTA is not set
744# CONFIG_XFS_SECURITY is not set
745# CONFIG_XFS_POSIX_ACL is not set 755# CONFIG_XFS_POSIX_ACL is not set
746# CONFIG_XFS_RT is not set 756# CONFIG_XFS_RT is not set
747CONFIG_GFS2_FS=m 757# CONFIG_XFS_DEBUG is not set
748CONFIG_GFS2_FS_LOCKING_NOLOCK=m
749CONFIG_GFS2_FS_LOCKING_DLM=m
750CONFIG_OCFS2_FS=m 758CONFIG_OCFS2_FS=m
759CONFIG_OCFS2_FS_O2CB=m
760CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
751# CONFIG_OCFS2_DEBUG_MASKLOG is not set 761# CONFIG_OCFS2_DEBUG_MASKLOG is not set
752# CONFIG_OCFS2_DEBUG_FS is not set 762# CONFIG_OCFS2_DEBUG_FS is not set
753CONFIG_DNOTIFY=y 763CONFIG_DNOTIFY=y
@@ -819,12 +829,10 @@ CONFIG_NFS_FS=y
819CONFIG_NFS_V3=y 829CONFIG_NFS_V3=y
820# CONFIG_NFS_V3_ACL is not set 830# CONFIG_NFS_V3_ACL is not set
821CONFIG_NFS_V4=y 831CONFIG_NFS_V4=y
822# CONFIG_NFS_DIRECTIO is not set
823CONFIG_NFSD=m 832CONFIG_NFSD=m
824CONFIG_NFSD_V3=y 833CONFIG_NFSD_V3=y
825# CONFIG_NFSD_V3_ACL is not set 834# CONFIG_NFSD_V3_ACL is not set
826# CONFIG_NFSD_V4 is not set 835# CONFIG_NFSD_V4 is not set
827CONFIG_NFSD_TCP=y
828CONFIG_ROOT_NFS=y 836CONFIG_ROOT_NFS=y
829CONFIG_LOCKD=y 837CONFIG_LOCKD=y
830CONFIG_LOCKD_V4=y 838CONFIG_LOCKD_V4=y
@@ -899,6 +907,7 @@ CONFIG_DLM=m
899# CONFIG_PRINTK_TIME is not set 907# CONFIG_PRINTK_TIME is not set
900CONFIG_ENABLE_WARN_DEPRECATED=y 908CONFIG_ENABLE_WARN_DEPRECATED=y
901CONFIG_ENABLE_MUST_CHECK=y 909CONFIG_ENABLE_MUST_CHECK=y
910CONFIG_FRAME_WARN=1024
902CONFIG_MAGIC_SYSRQ=y 911CONFIG_MAGIC_SYSRQ=y
903# CONFIG_UNUSED_SYMBOLS is not set 912# CONFIG_UNUSED_SYMBOLS is not set
904# CONFIG_DEBUG_FS is not set 913# CONFIG_DEBUG_FS is not set
@@ -918,53 +927,82 @@ CONFIG_ASYNC_CORE=m
918CONFIG_ASYNC_MEMCPY=m 927CONFIG_ASYNC_MEMCPY=m
919CONFIG_ASYNC_XOR=m 928CONFIG_ASYNC_XOR=m
920CONFIG_CRYPTO=y 929CONFIG_CRYPTO=y
930
931#
932# Crypto core or helper
933#
921CONFIG_CRYPTO_ALGAPI=y 934CONFIG_CRYPTO_ALGAPI=y
922CONFIG_CRYPTO_AEAD=m 935CONFIG_CRYPTO_AEAD=m
923CONFIG_CRYPTO_BLKCIPHER=y 936CONFIG_CRYPTO_BLKCIPHER=y
924CONFIG_CRYPTO_SEQIV=m
925CONFIG_CRYPTO_HASH=y 937CONFIG_CRYPTO_HASH=y
926CONFIG_CRYPTO_MANAGER=y 938CONFIG_CRYPTO_MANAGER=y
939CONFIG_CRYPTO_GF128MUL=m
940CONFIG_CRYPTO_NULL=m
941CONFIG_CRYPTO_CRYPTD=m
942CONFIG_CRYPTO_AUTHENC=m
943CONFIG_CRYPTO_TEST=m
944
945#
946# Authenticated Encryption with Associated Data
947#
948CONFIG_CRYPTO_CCM=m
949CONFIG_CRYPTO_GCM=m
950CONFIG_CRYPTO_SEQIV=m
951
952#
953# Block modes
954#
955CONFIG_CRYPTO_CBC=y
956CONFIG_CRYPTO_CTR=m
957CONFIG_CRYPTO_CTS=m
958CONFIG_CRYPTO_ECB=m
959CONFIG_CRYPTO_LRW=m
960CONFIG_CRYPTO_PCBC=m
961CONFIG_CRYPTO_XTS=m
962
963#
964# Hash modes
965#
927CONFIG_CRYPTO_HMAC=y 966CONFIG_CRYPTO_HMAC=y
928CONFIG_CRYPTO_XCBC=m 967CONFIG_CRYPTO_XCBC=m
929CONFIG_CRYPTO_NULL=m 968
969#
970# Digest
971#
972CONFIG_CRYPTO_CRC32C=m
930CONFIG_CRYPTO_MD4=m 973CONFIG_CRYPTO_MD4=m
931CONFIG_CRYPTO_MD5=y 974CONFIG_CRYPTO_MD5=y
975CONFIG_CRYPTO_MICHAEL_MIC=m
932CONFIG_CRYPTO_SHA1=m 976CONFIG_CRYPTO_SHA1=m
933CONFIG_CRYPTO_SHA256=m 977CONFIG_CRYPTO_SHA256=m
934CONFIG_CRYPTO_SHA512=m 978CONFIG_CRYPTO_SHA512=m
935CONFIG_CRYPTO_WP512=m
936CONFIG_CRYPTO_TGR192=m 979CONFIG_CRYPTO_TGR192=m
937CONFIG_CRYPTO_GF128MUL=m 980CONFIG_CRYPTO_WP512=m
938CONFIG_CRYPTO_ECB=m 981
939CONFIG_CRYPTO_CBC=y 982#
940CONFIG_CRYPTO_PCBC=m 983# Ciphers
941CONFIG_CRYPTO_LRW=m 984#
942CONFIG_CRYPTO_XTS=m
943CONFIG_CRYPTO_CTR=m
944CONFIG_CRYPTO_GCM=m
945CONFIG_CRYPTO_CCM=m
946CONFIG_CRYPTO_CRYPTD=m
947CONFIG_CRYPTO_DES=y
948CONFIG_CRYPTO_FCRYPT=m
949CONFIG_CRYPTO_BLOWFISH=m
950CONFIG_CRYPTO_TWOFISH=m
951CONFIG_CRYPTO_TWOFISH_COMMON=m
952CONFIG_CRYPTO_SERPENT=m
953CONFIG_CRYPTO_AES=m 985CONFIG_CRYPTO_AES=m
986CONFIG_CRYPTO_ANUBIS=m
987CONFIG_CRYPTO_ARC4=m
988CONFIG_CRYPTO_BLOWFISH=m
989CONFIG_CRYPTO_CAMELLIA=m
954CONFIG_CRYPTO_CAST5=m 990CONFIG_CRYPTO_CAST5=m
955CONFIG_CRYPTO_CAST6=m 991CONFIG_CRYPTO_CAST6=m
956CONFIG_CRYPTO_TEA=m 992CONFIG_CRYPTO_DES=y
957CONFIG_CRYPTO_ARC4=m 993CONFIG_CRYPTO_FCRYPT=m
958CONFIG_CRYPTO_KHAZAD=m 994CONFIG_CRYPTO_KHAZAD=m
959CONFIG_CRYPTO_ANUBIS=m
960CONFIG_CRYPTO_SEED=m
961CONFIG_CRYPTO_SALSA20=m 995CONFIG_CRYPTO_SALSA20=m
996CONFIG_CRYPTO_SEED=m
997CONFIG_CRYPTO_SERPENT=m
998CONFIG_CRYPTO_TEA=m
999CONFIG_CRYPTO_TWOFISH=m
1000CONFIG_CRYPTO_TWOFISH_COMMON=m
1001
1002#
1003# Compression
1004#
962CONFIG_CRYPTO_DEFLATE=m 1005CONFIG_CRYPTO_DEFLATE=m
963CONFIG_CRYPTO_MICHAEL_MIC=m
964CONFIG_CRYPTO_CRC32C=m
965CONFIG_CRYPTO_CAMELLIA=m
966CONFIG_CRYPTO_TEST=m
967CONFIG_CRYPTO_AUTHENC=m
968CONFIG_CRYPTO_LZO=m 1006CONFIG_CRYPTO_LZO=m
969# CONFIG_CRYPTO_HW is not set 1007# CONFIG_CRYPTO_HW is not set
970 1008
@@ -972,9 +1010,11 @@ CONFIG_CRYPTO_LZO=m
972# Library routines 1010# Library routines
973# 1011#
974CONFIG_BITREVERSE=y 1012CONFIG_BITREVERSE=y
1013# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1014# CONFIG_GENERIC_FIND_NEXT_BIT is not set
975CONFIG_CRC_CCITT=m 1015CONFIG_CRC_CCITT=m
976CONFIG_CRC16=m 1016CONFIG_CRC16=m
977# CONFIG_CRC_ITU_T is not set 1017CONFIG_CRC_ITU_T=m
978CONFIG_CRC32=y 1018CONFIG_CRC32=y
979# CONFIG_CRC7 is not set 1019# CONFIG_CRC7 is not set
980CONFIG_LIBCRC32C=m 1020CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index e9ccc774334e..983e53d990c8 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:19 2008 4# Sun May 18 14:44:50 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -144,6 +147,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
144CONFIG_NEED_MULTIPLE_NODES=y 147CONFIG_NEED_MULTIPLE_NODES=y
145# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 149# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
150CONFIG_PAGEFLAGS_EXTENDED=y
147CONFIG_SPLIT_PTLOCK_CPUS=4 151CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set 152# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1 153CONFIG_ZONE_DMA_FLAG=1
@@ -222,8 +226,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
222CONFIG_INET6_XFRM_MODE_BEET=m 226CONFIG_INET6_XFRM_MODE_BEET=m
223CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 227CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
224CONFIG_IPV6_SIT=m 228CONFIG_IPV6_SIT=m
229CONFIG_IPV6_NDISC_NODETYPE=y
225CONFIG_IPV6_TUNNEL=m 230CONFIG_IPV6_TUNNEL=m
226# CONFIG_IPV6_MULTIPLE_TABLES is not set 231# CONFIG_IPV6_MULTIPLE_TABLES is not set
232# CONFIG_IPV6_MROUTE is not set
227# CONFIG_NETWORK_SECMARK is not set 233# CONFIG_NETWORK_SECMARK is not set
228CONFIG_NETFILTER=y 234CONFIG_NETFILTER=y
229# CONFIG_NETFILTER_DEBUG is not set 235# CONFIG_NETFILTER_DEBUG is not set
@@ -239,6 +245,7 @@ CONFIG_NF_CONNTRACK=m
239CONFIG_NF_CT_ACCT=y 245CONFIG_NF_CT_ACCT=y
240CONFIG_NF_CONNTRACK_MARK=y 246CONFIG_NF_CONNTRACK_MARK=y
241# CONFIG_NF_CONNTRACK_EVENTS is not set 247# CONFIG_NF_CONNTRACK_EVENTS is not set
248# CONFIG_NF_CT_PROTO_DCCP is not set
242CONFIG_NF_CT_PROTO_GRE=m 249CONFIG_NF_CT_PROTO_GRE=m
243CONFIG_NF_CT_PROTO_SCTP=m 250CONFIG_NF_CT_PROTO_SCTP=m
244CONFIG_NF_CT_PROTO_UDPLITE=m 251CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -317,6 +324,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
317CONFIG_IP_NF_TARGET_NETMAP=m 324CONFIG_IP_NF_TARGET_NETMAP=m
318CONFIG_NF_NAT_SNMP_BASIC=m 325CONFIG_NF_NAT_SNMP_BASIC=m
319CONFIG_NF_NAT_PROTO_GRE=m 326CONFIG_NF_NAT_PROTO_GRE=m
327CONFIG_NF_NAT_PROTO_UDPLITE=m
328CONFIG_NF_NAT_PROTO_SCTP=m
320CONFIG_NF_NAT_FTP=m 329CONFIG_NF_NAT_FTP=m
321CONFIG_NF_NAT_IRC=m 330CONFIG_NF_NAT_IRC=m
322CONFIG_NF_NAT_TFTP=m 331CONFIG_NF_NAT_TFTP=m
@@ -410,8 +419,6 @@ CONFIG_IEEE80211=m
410CONFIG_IEEE80211_CRYPT_WEP=m 419CONFIG_IEEE80211_CRYPT_WEP=m
411CONFIG_IEEE80211_CRYPT_CCMP=m 420CONFIG_IEEE80211_CRYPT_CCMP=m
412CONFIG_IEEE80211_CRYPT_TKIP=m 421CONFIG_IEEE80211_CRYPT_TKIP=m
413CONFIG_IEEE80211_SOFTMAC=m
414# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
415# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
417 424
@@ -543,6 +550,7 @@ CONFIG_MVME16x_NET=y
543# 550#
544# CONFIG_WLAN_PRE80211 is not set 551# CONFIG_WLAN_PRE80211 is not set
545# CONFIG_WLAN_80211 is not set 552# CONFIG_WLAN_80211 is not set
553# CONFIG_IWLWIFI_LEDS is not set
546# CONFIG_WAN is not set 554# CONFIG_WAN is not set
547CONFIG_PPP=m 555CONFIG_PPP=m
548# CONFIG_PPP_MULTILINK is not set 556# CONFIG_PPP_MULTILINK is not set
@@ -626,6 +634,7 @@ CONFIG_VT=y
626CONFIG_VT_CONSOLE=y 634CONFIG_VT_CONSOLE=y
627CONFIG_HW_CONSOLE=y 635CONFIG_HW_CONSOLE=y
628CONFIG_VT_HW_CONSOLE_BINDING=y 636CONFIG_VT_HW_CONSOLE_BINDING=y
637# CONFIG_DEVKMEM is not set
629# CONFIG_SERIAL_NONSTANDARD is not set 638# CONFIG_SERIAL_NONSTANDARD is not set
630 639
631# 640#
@@ -647,12 +656,7 @@ CONFIG_GEN_RTC_X=y
647# CONFIG_RAW_DRIVER is not set 656# CONFIG_RAW_DRIVER is not set
648# CONFIG_TCG_TPM is not set 657# CONFIG_TCG_TPM is not set
649# CONFIG_I2C is not set 658# CONFIG_I2C is not set
650
651#
652# SPI support
653#
654# CONFIG_SPI is not set 659# CONFIG_SPI is not set
655# CONFIG_SPI_MASTER is not set
656# CONFIG_W1 is not set 660# CONFIG_W1 is not set
657# CONFIG_POWER_SUPPLY is not set 661# CONFIG_POWER_SUPPLY is not set
658# CONFIG_HWMON is not set 662# CONFIG_HWMON is not set
@@ -669,12 +673,22 @@ CONFIG_SSB_POSSIBLE=y
669# Multifunction device drivers 673# Multifunction device drivers
670# 674#
671# CONFIG_MFD_SM501 is not set 675# CONFIG_MFD_SM501 is not set
676# CONFIG_HTC_PASIC3 is not set
672 677
673# 678#
674# Multimedia devices 679# Multimedia devices
675# 680#
681
682#
683# Multimedia core support
684#
676# CONFIG_VIDEO_DEV is not set 685# CONFIG_VIDEO_DEV is not set
677# CONFIG_DVB_CORE is not set 686# CONFIG_DVB_CORE is not set
687# CONFIG_VIDEO_MEDIA is not set
688
689#
690# Multimedia drivers
691#
678# CONFIG_DAB is not set 692# CONFIG_DAB is not set
679 693
680# 694#
@@ -707,11 +721,8 @@ CONFIG_HIDRAW=y
707# CONFIG_MMC is not set 721# CONFIG_MMC is not set
708# CONFIG_MEMSTICK is not set 722# CONFIG_MEMSTICK is not set
709# CONFIG_NEW_LEDS is not set 723# CONFIG_NEW_LEDS is not set
724# CONFIG_ACCESSIBILITY is not set
710# CONFIG_RTC_CLASS is not set 725# CONFIG_RTC_CLASS is not set
711
712#
713# Userspace I/O
714#
715# CONFIG_UIO is not set 726# CONFIG_UIO is not set
716 727
717# 728#
@@ -740,16 +751,15 @@ CONFIG_JFS_FS=m
740# CONFIG_JFS_SECURITY is not set 751# CONFIG_JFS_SECURITY is not set
741# CONFIG_JFS_DEBUG is not set 752# CONFIG_JFS_DEBUG is not set
742# CONFIG_JFS_STATISTICS is not set 753# CONFIG_JFS_STATISTICS is not set
743CONFIG_FS_POSIX_ACL=y 754# CONFIG_FS_POSIX_ACL is not set
744CONFIG_XFS_FS=m 755CONFIG_XFS_FS=m
745# CONFIG_XFS_QUOTA is not set 756# CONFIG_XFS_QUOTA is not set
746# CONFIG_XFS_SECURITY is not set
747# CONFIG_XFS_POSIX_ACL is not set 757# CONFIG_XFS_POSIX_ACL is not set
748# CONFIG_XFS_RT is not set 758# CONFIG_XFS_RT is not set
749CONFIG_GFS2_FS=m 759# CONFIG_XFS_DEBUG is not set
750CONFIG_GFS2_FS_LOCKING_NOLOCK=m
751CONFIG_GFS2_FS_LOCKING_DLM=m
752CONFIG_OCFS2_FS=m 760CONFIG_OCFS2_FS=m
761CONFIG_OCFS2_FS_O2CB=m
762CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
753# CONFIG_OCFS2_DEBUG_MASKLOG is not set 763# CONFIG_OCFS2_DEBUG_MASKLOG is not set
754# CONFIG_OCFS2_DEBUG_FS is not set 764# CONFIG_OCFS2_DEBUG_FS is not set
755CONFIG_DNOTIFY=y 765CONFIG_DNOTIFY=y
@@ -821,12 +831,10 @@ CONFIG_NFS_FS=y
821CONFIG_NFS_V3=y 831CONFIG_NFS_V3=y
822# CONFIG_NFS_V3_ACL is not set 832# CONFIG_NFS_V3_ACL is not set
823CONFIG_NFS_V4=y 833CONFIG_NFS_V4=y
824# CONFIG_NFS_DIRECTIO is not set
825CONFIG_NFSD=m 834CONFIG_NFSD=m
826CONFIG_NFSD_V3=y 835CONFIG_NFSD_V3=y
827# CONFIG_NFSD_V3_ACL is not set 836# CONFIG_NFSD_V3_ACL is not set
828# CONFIG_NFSD_V4 is not set 837# CONFIG_NFSD_V4 is not set
829CONFIG_NFSD_TCP=y
830CONFIG_ROOT_NFS=y 838CONFIG_ROOT_NFS=y
831CONFIG_LOCKD=y 839CONFIG_LOCKD=y
832CONFIG_LOCKD_V4=y 840CONFIG_LOCKD_V4=y
@@ -901,6 +909,7 @@ CONFIG_DLM=m
901# CONFIG_PRINTK_TIME is not set 909# CONFIG_PRINTK_TIME is not set
902CONFIG_ENABLE_WARN_DEPRECATED=y 910CONFIG_ENABLE_WARN_DEPRECATED=y
903CONFIG_ENABLE_MUST_CHECK=y 911CONFIG_ENABLE_MUST_CHECK=y
912CONFIG_FRAME_WARN=1024
904CONFIG_MAGIC_SYSRQ=y 913CONFIG_MAGIC_SYSRQ=y
905# CONFIG_UNUSED_SYMBOLS is not set 914# CONFIG_UNUSED_SYMBOLS is not set
906# CONFIG_DEBUG_FS is not set 915# CONFIG_DEBUG_FS is not set
@@ -920,53 +929,82 @@ CONFIG_ASYNC_CORE=m
920CONFIG_ASYNC_MEMCPY=m 929CONFIG_ASYNC_MEMCPY=m
921CONFIG_ASYNC_XOR=m 930CONFIG_ASYNC_XOR=m
922CONFIG_CRYPTO=y 931CONFIG_CRYPTO=y
932
933#
934# Crypto core or helper
935#
923CONFIG_CRYPTO_ALGAPI=y 936CONFIG_CRYPTO_ALGAPI=y
924CONFIG_CRYPTO_AEAD=m 937CONFIG_CRYPTO_AEAD=m
925CONFIG_CRYPTO_BLKCIPHER=y 938CONFIG_CRYPTO_BLKCIPHER=y
926CONFIG_CRYPTO_SEQIV=m
927CONFIG_CRYPTO_HASH=y 939CONFIG_CRYPTO_HASH=y
928CONFIG_CRYPTO_MANAGER=y 940CONFIG_CRYPTO_MANAGER=y
941CONFIG_CRYPTO_GF128MUL=m
942CONFIG_CRYPTO_NULL=m
943CONFIG_CRYPTO_CRYPTD=m
944CONFIG_CRYPTO_AUTHENC=m
945CONFIG_CRYPTO_TEST=m
946
947#
948# Authenticated Encryption with Associated Data
949#
950CONFIG_CRYPTO_CCM=m
951CONFIG_CRYPTO_GCM=m
952CONFIG_CRYPTO_SEQIV=m
953
954#
955# Block modes
956#
957CONFIG_CRYPTO_CBC=y
958CONFIG_CRYPTO_CTR=m
959CONFIG_CRYPTO_CTS=m
960CONFIG_CRYPTO_ECB=m
961CONFIG_CRYPTO_LRW=m
962CONFIG_CRYPTO_PCBC=m
963CONFIG_CRYPTO_XTS=m
964
965#
966# Hash modes
967#
929CONFIG_CRYPTO_HMAC=y 968CONFIG_CRYPTO_HMAC=y
930CONFIG_CRYPTO_XCBC=m 969CONFIG_CRYPTO_XCBC=m
931CONFIG_CRYPTO_NULL=m 970
971#
972# Digest
973#
974CONFIG_CRYPTO_CRC32C=m
932CONFIG_CRYPTO_MD4=m 975CONFIG_CRYPTO_MD4=m
933CONFIG_CRYPTO_MD5=y 976CONFIG_CRYPTO_MD5=y
977CONFIG_CRYPTO_MICHAEL_MIC=m
934CONFIG_CRYPTO_SHA1=m 978CONFIG_CRYPTO_SHA1=m
935CONFIG_CRYPTO_SHA256=m 979CONFIG_CRYPTO_SHA256=m
936CONFIG_CRYPTO_SHA512=m 980CONFIG_CRYPTO_SHA512=m
937CONFIG_CRYPTO_WP512=m
938CONFIG_CRYPTO_TGR192=m 981CONFIG_CRYPTO_TGR192=m
939CONFIG_CRYPTO_GF128MUL=m 982CONFIG_CRYPTO_WP512=m
940CONFIG_CRYPTO_ECB=m 983
941CONFIG_CRYPTO_CBC=y 984#
942CONFIG_CRYPTO_PCBC=m 985# Ciphers
943CONFIG_CRYPTO_LRW=m 986#
944CONFIG_CRYPTO_XTS=m
945CONFIG_CRYPTO_CTR=m
946CONFIG_CRYPTO_GCM=m
947CONFIG_CRYPTO_CCM=m
948CONFIG_CRYPTO_CRYPTD=m
949CONFIG_CRYPTO_DES=y
950CONFIG_CRYPTO_FCRYPT=m
951CONFIG_CRYPTO_BLOWFISH=m
952CONFIG_CRYPTO_TWOFISH=m
953CONFIG_CRYPTO_TWOFISH_COMMON=m
954CONFIG_CRYPTO_SERPENT=m
955CONFIG_CRYPTO_AES=m 987CONFIG_CRYPTO_AES=m
988CONFIG_CRYPTO_ANUBIS=m
989CONFIG_CRYPTO_ARC4=m
990CONFIG_CRYPTO_BLOWFISH=m
991CONFIG_CRYPTO_CAMELLIA=m
956CONFIG_CRYPTO_CAST5=m 992CONFIG_CRYPTO_CAST5=m
957CONFIG_CRYPTO_CAST6=m 993CONFIG_CRYPTO_CAST6=m
958CONFIG_CRYPTO_TEA=m 994CONFIG_CRYPTO_DES=y
959CONFIG_CRYPTO_ARC4=m 995CONFIG_CRYPTO_FCRYPT=m
960CONFIG_CRYPTO_KHAZAD=m 996CONFIG_CRYPTO_KHAZAD=m
961CONFIG_CRYPTO_ANUBIS=m
962CONFIG_CRYPTO_SEED=m
963CONFIG_CRYPTO_SALSA20=m 997CONFIG_CRYPTO_SALSA20=m
998CONFIG_CRYPTO_SEED=m
999CONFIG_CRYPTO_SERPENT=m
1000CONFIG_CRYPTO_TEA=m
1001CONFIG_CRYPTO_TWOFISH=m
1002CONFIG_CRYPTO_TWOFISH_COMMON=m
1003
1004#
1005# Compression
1006#
964CONFIG_CRYPTO_DEFLATE=m 1007CONFIG_CRYPTO_DEFLATE=m
965CONFIG_CRYPTO_MICHAEL_MIC=m
966CONFIG_CRYPTO_CRC32C=m
967CONFIG_CRYPTO_CAMELLIA=m
968CONFIG_CRYPTO_TEST=m
969CONFIG_CRYPTO_AUTHENC=m
970CONFIG_CRYPTO_LZO=m 1008CONFIG_CRYPTO_LZO=m
971# CONFIG_CRYPTO_HW is not set 1009# CONFIG_CRYPTO_HW is not set
972 1010
@@ -974,9 +1012,11 @@ CONFIG_CRYPTO_LZO=m
974# Library routines 1012# Library routines
975# 1013#
976CONFIG_BITREVERSE=y 1014CONFIG_BITREVERSE=y
1015# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1016# CONFIG_GENERIC_FIND_NEXT_BIT is not set
977CONFIG_CRC_CCITT=m 1017CONFIG_CRC_CCITT=m
978CONFIG_CRC16=m 1018CONFIG_CRC16=m
979# CONFIG_CRC_ITU_T is not set 1019CONFIG_CRC_ITU_T=m
980CONFIG_CRC32=y 1020CONFIG_CRC32=y
981# CONFIG_CRC7 is not set 1021# CONFIG_CRC7 is not set
982CONFIG_LIBCRC32C=m 1022CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 165658fe73eb..7707f3fb0a70 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:20 2008 4# Sun May 18 14:44:51 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -12,7 +12,6 @@ CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 12CONFIG_GENERIC_CALIBRATE_DELAY=y
13CONFIG_TIME_LOW_RES=y 13CONFIG_TIME_LOW_RES=y
14CONFIG_GENERIC_IOMAP=y 14CONFIG_GENERIC_IOMAP=y
15CONFIG_ARCH_MAY_HAVE_PC_FDC=y
16CONFIG_NO_IOPORT=y 15CONFIG_NO_IOPORT=y
17# CONFIG_NO_DMA is not set 16# CONFIG_NO_DMA is not set
18CONFIG_ARCH_SUPPORTS_AOUT=y 17CONFIG_ARCH_SUPPORTS_AOUT=y
@@ -53,6 +52,7 @@ CONFIG_SYSCTL=y
53# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
54CONFIG_UID16=y 53CONFIG_UID16=y
55CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
56CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
57# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
58CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -77,12 +77,14 @@ CONFIG_SLAB=y
77# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
78# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
79# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
80CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
81CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
82CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
83# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
84CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
85CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
86CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
87# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
88# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -142,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
142CONFIG_NEED_MULTIPLE_NODES=y 144CONFIG_NEED_MULTIPLE_NODES=y
143# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
144# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
147CONFIG_PAGEFLAGS_EXTENDED=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
146# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1 150CONFIG_ZONE_DMA_FLAG=1
@@ -220,8 +223,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
220CONFIG_INET6_XFRM_MODE_BEET=m 223CONFIG_INET6_XFRM_MODE_BEET=m
221CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 224CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
222CONFIG_IPV6_SIT=m 225CONFIG_IPV6_SIT=m
226CONFIG_IPV6_NDISC_NODETYPE=y
223CONFIG_IPV6_TUNNEL=m 227CONFIG_IPV6_TUNNEL=m
224# CONFIG_IPV6_MULTIPLE_TABLES is not set 228# CONFIG_IPV6_MULTIPLE_TABLES is not set
229# CONFIG_IPV6_MROUTE is not set
225# CONFIG_NETWORK_SECMARK is not set 230# CONFIG_NETWORK_SECMARK is not set
226CONFIG_NETFILTER=y 231CONFIG_NETFILTER=y
227# CONFIG_NETFILTER_DEBUG is not set 232# CONFIG_NETFILTER_DEBUG is not set
@@ -237,6 +242,7 @@ CONFIG_NF_CONNTRACK=m
237CONFIG_NF_CT_ACCT=y 242CONFIG_NF_CT_ACCT=y
238CONFIG_NF_CONNTRACK_MARK=y 243CONFIG_NF_CONNTRACK_MARK=y
239# CONFIG_NF_CONNTRACK_EVENTS is not set 244# CONFIG_NF_CONNTRACK_EVENTS is not set
245# CONFIG_NF_CT_PROTO_DCCP is not set
240CONFIG_NF_CT_PROTO_GRE=m 246CONFIG_NF_CT_PROTO_GRE=m
241CONFIG_NF_CT_PROTO_SCTP=m 247CONFIG_NF_CT_PROTO_SCTP=m
242CONFIG_NF_CT_PROTO_UDPLITE=m 248CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -315,6 +321,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
315CONFIG_IP_NF_TARGET_NETMAP=m 321CONFIG_IP_NF_TARGET_NETMAP=m
316CONFIG_NF_NAT_SNMP_BASIC=m 322CONFIG_NF_NAT_SNMP_BASIC=m
317CONFIG_NF_NAT_PROTO_GRE=m 323CONFIG_NF_NAT_PROTO_GRE=m
324CONFIG_NF_NAT_PROTO_UDPLITE=m
325CONFIG_NF_NAT_PROTO_SCTP=m
318CONFIG_NF_NAT_FTP=m 326CONFIG_NF_NAT_FTP=m
319CONFIG_NF_NAT_IRC=m 327CONFIG_NF_NAT_IRC=m
320CONFIG_NF_NAT_TFTP=m 328CONFIG_NF_NAT_TFTP=m
@@ -408,8 +416,6 @@ CONFIG_IEEE80211=m
408CONFIG_IEEE80211_CRYPT_WEP=m 416CONFIG_IEEE80211_CRYPT_WEP=m
409CONFIG_IEEE80211_CRYPT_CCMP=m 417CONFIG_IEEE80211_CRYPT_CCMP=m
410CONFIG_IEEE80211_CRYPT_TKIP=m 418CONFIG_IEEE80211_CRYPT_TKIP=m
411CONFIG_IEEE80211_SOFTMAC=m
412# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
413# CONFIG_RFKILL is not set 419# CONFIG_RFKILL is not set
414# CONFIG_NET_9P is not set 420# CONFIG_NET_9P is not set
415 421
@@ -430,7 +436,6 @@ CONFIG_CONNECTOR=m
430# CONFIG_PARPORT is not set 436# CONFIG_PARPORT is not set
431# CONFIG_PNP is not set 437# CONFIG_PNP is not set
432CONFIG_BLK_DEV=y 438CONFIG_BLK_DEV=y
433# CONFIG_BLK_DEV_FD is not set
434# CONFIG_BLK_DEV_COW_COMMON is not set 439# CONFIG_BLK_DEV_COW_COMMON is not set
435CONFIG_BLK_DEV_LOOP=y 440CONFIG_BLK_DEV_LOOP=y
436CONFIG_BLK_DEV_CRYPTOLOOP=m 441CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -467,25 +472,10 @@ CONFIG_IDE_PROC_FS=y
467# 472#
468# IDE chipset support/bugfixes 473# IDE chipset support/bugfixes
469# 474#
470# CONFIG_IDE_GENERIC is not set
471# CONFIG_BLK_DEV_PLATFORM is not set 475# CONFIG_BLK_DEV_PLATFORM is not set
472CONFIG_BLK_DEV_Q40IDE=y 476CONFIG_BLK_DEV_Q40IDE=y
473
474#
475# Other IDE chipsets support
476#
477
478#
479# Note: most of these also require special kernel boot parameters
480#
481# CONFIG_BLK_DEV_4DRIVES is not set
482# CONFIG_BLK_DEV_ALI14XX is not set
483# CONFIG_BLK_DEV_DTC2278 is not set
484# CONFIG_BLK_DEV_HT6560B is not set
485# CONFIG_BLK_DEV_QD65XX is not set
486# CONFIG_BLK_DEV_UMC8672 is not set
487# CONFIG_BLK_DEV_IDEDMA is not set 477# CONFIG_BLK_DEV_IDEDMA is not set
488# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set 478# CONFIG_BLK_DEV_HD_ONLY is not set
489# CONFIG_BLK_DEV_HD is not set 479# CONFIG_BLK_DEV_HD is not set
490 480
491# 481#
@@ -603,6 +593,7 @@ CONFIG_NE2000=m
603# 593#
604# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
605# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
596# CONFIG_IWLWIFI_LEDS is not set
606# CONFIG_WAN is not set 597# CONFIG_WAN is not set
607CONFIG_PPP=m 598CONFIG_PPP=m
608# CONFIG_PPP_MULTILINK is not set 599# CONFIG_PPP_MULTILINK is not set
@@ -692,6 +683,7 @@ CONFIG_VT=y
692CONFIG_VT_CONSOLE=y 683CONFIG_VT_CONSOLE=y
693CONFIG_HW_CONSOLE=y 684CONFIG_HW_CONSOLE=y
694CONFIG_VT_HW_CONSOLE_BINDING=y 685CONFIG_VT_HW_CONSOLE_BINDING=y
686# CONFIG_DEVKMEM is not set
695# CONFIG_SERIAL_NONSTANDARD is not set 687# CONFIG_SERIAL_NONSTANDARD is not set
696 688
697# 689#
@@ -714,12 +706,7 @@ CONFIG_GEN_RTC_X=y
714# CONFIG_RAW_DRIVER is not set 706# CONFIG_RAW_DRIVER is not set
715# CONFIG_TCG_TPM is not set 707# CONFIG_TCG_TPM is not set
716# CONFIG_I2C is not set 708# CONFIG_I2C is not set
717
718#
719# SPI support
720#
721# CONFIG_SPI is not set 709# CONFIG_SPI is not set
722# CONFIG_SPI_MASTER is not set
723# CONFIG_W1 is not set 710# CONFIG_W1 is not set
724# CONFIG_POWER_SUPPLY is not set 711# CONFIG_POWER_SUPPLY is not set
725# CONFIG_HWMON is not set 712# CONFIG_HWMON is not set
@@ -736,12 +723,22 @@ CONFIG_SSB_POSSIBLE=y
736# Multifunction device drivers 723# Multifunction device drivers
737# 724#
738# CONFIG_MFD_SM501 is not set 725# CONFIG_MFD_SM501 is not set
726# CONFIG_HTC_PASIC3 is not set
739 727
740# 728#
741# Multimedia devices 729# Multimedia devices
742# 730#
731
732#
733# Multimedia core support
734#
743# CONFIG_VIDEO_DEV is not set 735# CONFIG_VIDEO_DEV is not set
744# CONFIG_DVB_CORE is not set 736# CONFIG_DVB_CORE is not set
737# CONFIG_VIDEO_MEDIA is not set
738
739#
740# Multimedia drivers
741#
745# CONFIG_DAB is not set 742# CONFIG_DAB is not set
746 743
747# 744#
@@ -759,8 +756,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
759# CONFIG_FB_SYS_FILLRECT is not set 756# CONFIG_FB_SYS_FILLRECT is not set
760# CONFIG_FB_SYS_COPYAREA is not set 757# CONFIG_FB_SYS_COPYAREA is not set
761# CONFIG_FB_SYS_IMAGEBLIT is not set 758# CONFIG_FB_SYS_IMAGEBLIT is not set
759# CONFIG_FB_FOREIGN_ENDIAN is not set
762# CONFIG_FB_SYS_FOPS is not set 760# CONFIG_FB_SYS_FOPS is not set
763CONFIG_FB_DEFERRED_IO=y
764# CONFIG_FB_SVGALIB is not set 761# CONFIG_FB_SVGALIB is not set
765# CONFIG_FB_MACMODES is not set 762# CONFIG_FB_MACMODES is not set
766# CONFIG_FB_BACKLIGHT is not set 763# CONFIG_FB_BACKLIGHT is not set
@@ -810,11 +807,8 @@ CONFIG_HIDRAW=y
810# CONFIG_MMC is not set 807# CONFIG_MMC is not set
811# CONFIG_MEMSTICK is not set 808# CONFIG_MEMSTICK is not set
812# CONFIG_NEW_LEDS is not set 809# CONFIG_NEW_LEDS is not set
810# CONFIG_ACCESSIBILITY is not set
813# CONFIG_RTC_CLASS is not set 811# CONFIG_RTC_CLASS is not set
814
815#
816# Userspace I/O
817#
818# CONFIG_UIO is not set 812# CONFIG_UIO is not set
819 813
820# 814#
@@ -840,16 +834,15 @@ CONFIG_JFS_FS=m
840# CONFIG_JFS_SECURITY is not set 834# CONFIG_JFS_SECURITY is not set
841# CONFIG_JFS_DEBUG is not set 835# CONFIG_JFS_DEBUG is not set
842# CONFIG_JFS_STATISTICS is not set 836# CONFIG_JFS_STATISTICS is not set
843CONFIG_FS_POSIX_ACL=y 837# CONFIG_FS_POSIX_ACL is not set
844CONFIG_XFS_FS=m 838CONFIG_XFS_FS=m
845# CONFIG_XFS_QUOTA is not set 839# CONFIG_XFS_QUOTA is not set
846# CONFIG_XFS_SECURITY is not set
847# CONFIG_XFS_POSIX_ACL is not set 840# CONFIG_XFS_POSIX_ACL is not set
848# CONFIG_XFS_RT is not set 841# CONFIG_XFS_RT is not set
849CONFIG_GFS2_FS=m 842# CONFIG_XFS_DEBUG is not set
850CONFIG_GFS2_FS_LOCKING_NOLOCK=m
851CONFIG_GFS2_FS_LOCKING_DLM=m
852CONFIG_OCFS2_FS=m 843CONFIG_OCFS2_FS=m
844CONFIG_OCFS2_FS_O2CB=m
845CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
853# CONFIG_OCFS2_DEBUG_MASKLOG is not set 846# CONFIG_OCFS2_DEBUG_MASKLOG is not set
854# CONFIG_OCFS2_DEBUG_FS is not set 847# CONFIG_OCFS2_DEBUG_FS is not set
855CONFIG_DNOTIFY=y 848CONFIG_DNOTIFY=y
@@ -921,12 +914,10 @@ CONFIG_NFS_FS=y
921CONFIG_NFS_V3=y 914CONFIG_NFS_V3=y
922# CONFIG_NFS_V3_ACL is not set 915# CONFIG_NFS_V3_ACL is not set
923CONFIG_NFS_V4=y 916CONFIG_NFS_V4=y
924# CONFIG_NFS_DIRECTIO is not set
925CONFIG_NFSD=m 917CONFIG_NFSD=m
926CONFIG_NFSD_V3=y 918CONFIG_NFSD_V3=y
927# CONFIG_NFSD_V3_ACL is not set 919# CONFIG_NFSD_V3_ACL is not set
928# CONFIG_NFSD_V4 is not set 920# CONFIG_NFSD_V4 is not set
929CONFIG_NFSD_TCP=y
930CONFIG_LOCKD=y 921CONFIG_LOCKD=y
931CONFIG_LOCKD_V4=y 922CONFIG_LOCKD_V4=y
932CONFIG_EXPORTFS=m 923CONFIG_EXPORTFS=m
@@ -999,6 +990,7 @@ CONFIG_DLM=m
999# CONFIG_PRINTK_TIME is not set 990# CONFIG_PRINTK_TIME is not set
1000CONFIG_ENABLE_WARN_DEPRECATED=y 991CONFIG_ENABLE_WARN_DEPRECATED=y
1001CONFIG_ENABLE_MUST_CHECK=y 992CONFIG_ENABLE_MUST_CHECK=y
993CONFIG_FRAME_WARN=1024
1002CONFIG_MAGIC_SYSRQ=y 994CONFIG_MAGIC_SYSRQ=y
1003# CONFIG_UNUSED_SYMBOLS is not set 995# CONFIG_UNUSED_SYMBOLS is not set
1004# CONFIG_DEBUG_FS is not set 996# CONFIG_DEBUG_FS is not set
@@ -1018,53 +1010,82 @@ CONFIG_ASYNC_CORE=m
1018CONFIG_ASYNC_MEMCPY=m 1010CONFIG_ASYNC_MEMCPY=m
1019CONFIG_ASYNC_XOR=m 1011CONFIG_ASYNC_XOR=m
1020CONFIG_CRYPTO=y 1012CONFIG_CRYPTO=y
1013
1014#
1015# Crypto core or helper
1016#
1021CONFIG_CRYPTO_ALGAPI=y 1017CONFIG_CRYPTO_ALGAPI=y
1022CONFIG_CRYPTO_AEAD=m 1018CONFIG_CRYPTO_AEAD=m
1023CONFIG_CRYPTO_BLKCIPHER=y 1019CONFIG_CRYPTO_BLKCIPHER=y
1024CONFIG_CRYPTO_SEQIV=m
1025CONFIG_CRYPTO_HASH=y 1020CONFIG_CRYPTO_HASH=y
1026CONFIG_CRYPTO_MANAGER=y 1021CONFIG_CRYPTO_MANAGER=y
1022CONFIG_CRYPTO_GF128MUL=m
1023CONFIG_CRYPTO_NULL=m
1024CONFIG_CRYPTO_CRYPTD=m
1025CONFIG_CRYPTO_AUTHENC=m
1026CONFIG_CRYPTO_TEST=m
1027
1028#
1029# Authenticated Encryption with Associated Data
1030#
1031CONFIG_CRYPTO_CCM=m
1032CONFIG_CRYPTO_GCM=m
1033CONFIG_CRYPTO_SEQIV=m
1034
1035#
1036# Block modes
1037#
1038CONFIG_CRYPTO_CBC=y
1039CONFIG_CRYPTO_CTR=m
1040CONFIG_CRYPTO_CTS=m
1041CONFIG_CRYPTO_ECB=m
1042CONFIG_CRYPTO_LRW=m
1043CONFIG_CRYPTO_PCBC=m
1044CONFIG_CRYPTO_XTS=m
1045
1046#
1047# Hash modes
1048#
1027CONFIG_CRYPTO_HMAC=y 1049CONFIG_CRYPTO_HMAC=y
1028CONFIG_CRYPTO_XCBC=m 1050CONFIG_CRYPTO_XCBC=m
1029CONFIG_CRYPTO_NULL=m 1051
1052#
1053# Digest
1054#
1055CONFIG_CRYPTO_CRC32C=m
1030CONFIG_CRYPTO_MD4=m 1056CONFIG_CRYPTO_MD4=m
1031CONFIG_CRYPTO_MD5=y 1057CONFIG_CRYPTO_MD5=y
1058CONFIG_CRYPTO_MICHAEL_MIC=m
1032CONFIG_CRYPTO_SHA1=m 1059CONFIG_CRYPTO_SHA1=m
1033CONFIG_CRYPTO_SHA256=m 1060CONFIG_CRYPTO_SHA256=m
1034CONFIG_CRYPTO_SHA512=m 1061CONFIG_CRYPTO_SHA512=m
1035CONFIG_CRYPTO_WP512=m
1036CONFIG_CRYPTO_TGR192=m 1062CONFIG_CRYPTO_TGR192=m
1037CONFIG_CRYPTO_GF128MUL=m 1063CONFIG_CRYPTO_WP512=m
1038CONFIG_CRYPTO_ECB=m 1064
1039CONFIG_CRYPTO_CBC=y 1065#
1040CONFIG_CRYPTO_PCBC=m 1066# Ciphers
1041CONFIG_CRYPTO_LRW=m 1067#
1042CONFIG_CRYPTO_XTS=m
1043CONFIG_CRYPTO_CTR=m
1044CONFIG_CRYPTO_GCM=m
1045CONFIG_CRYPTO_CCM=m
1046CONFIG_CRYPTO_CRYPTD=m
1047CONFIG_CRYPTO_DES=y
1048CONFIG_CRYPTO_FCRYPT=m
1049CONFIG_CRYPTO_BLOWFISH=m
1050CONFIG_CRYPTO_TWOFISH=m
1051CONFIG_CRYPTO_TWOFISH_COMMON=m
1052CONFIG_CRYPTO_SERPENT=m
1053CONFIG_CRYPTO_AES=m 1068CONFIG_CRYPTO_AES=m
1069CONFIG_CRYPTO_ANUBIS=m
1070CONFIG_CRYPTO_ARC4=m
1071CONFIG_CRYPTO_BLOWFISH=m
1072CONFIG_CRYPTO_CAMELLIA=m
1054CONFIG_CRYPTO_CAST5=m 1073CONFIG_CRYPTO_CAST5=m
1055CONFIG_CRYPTO_CAST6=m 1074CONFIG_CRYPTO_CAST6=m
1056CONFIG_CRYPTO_TEA=m 1075CONFIG_CRYPTO_DES=y
1057CONFIG_CRYPTO_ARC4=m 1076CONFIG_CRYPTO_FCRYPT=m
1058CONFIG_CRYPTO_KHAZAD=m 1077CONFIG_CRYPTO_KHAZAD=m
1059CONFIG_CRYPTO_ANUBIS=m
1060CONFIG_CRYPTO_SEED=m
1061CONFIG_CRYPTO_SALSA20=m 1078CONFIG_CRYPTO_SALSA20=m
1079CONFIG_CRYPTO_SEED=m
1080CONFIG_CRYPTO_SERPENT=m
1081CONFIG_CRYPTO_TEA=m
1082CONFIG_CRYPTO_TWOFISH=m
1083CONFIG_CRYPTO_TWOFISH_COMMON=m
1084
1085#
1086# Compression
1087#
1062CONFIG_CRYPTO_DEFLATE=m 1088CONFIG_CRYPTO_DEFLATE=m
1063CONFIG_CRYPTO_MICHAEL_MIC=m
1064CONFIG_CRYPTO_CRC32C=m
1065CONFIG_CRYPTO_CAMELLIA=m
1066CONFIG_CRYPTO_TEST=m
1067CONFIG_CRYPTO_AUTHENC=m
1068CONFIG_CRYPTO_LZO=m 1089CONFIG_CRYPTO_LZO=m
1069# CONFIG_CRYPTO_HW is not set 1090# CONFIG_CRYPTO_HW is not set
1070 1091
@@ -1072,9 +1093,11 @@ CONFIG_CRYPTO_LZO=m
1072# Library routines 1093# Library routines
1073# 1094#
1074CONFIG_BITREVERSE=y 1095CONFIG_BITREVERSE=y
1096# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1097# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1075CONFIG_CRC_CCITT=m 1098CONFIG_CRC_CCITT=m
1076CONFIG_CRC16=m 1099CONFIG_CRC16=m
1077# CONFIG_CRC_ITU_T is not set 1100CONFIG_CRC_ITU_T=m
1078CONFIG_CRC32=y 1101CONFIG_CRC32=y
1079# CONFIG_CRC7 is not set 1102# CONFIG_CRC7 is not set
1080CONFIG_LIBCRC32C=m 1103CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index bd2b9c4927c4..a765f6f15d2c 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:22 2008 4# Sun May 18 14:44:53 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -130,6 +133,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
130CONFIG_NEED_MULTIPLE_NODES=y 133CONFIG_NEED_MULTIPLE_NODES=y
131# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
132# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 135# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
136CONFIG_PAGEFLAGS_EXTENDED=y
133CONFIG_SPLIT_PTLOCK_CPUS=4 137CONFIG_SPLIT_PTLOCK_CPUS=4
134# CONFIG_RESOURCES_64BIT is not set 138# CONFIG_RESOURCES_64BIT is not set
135CONFIG_ZONE_DMA_FLAG=1 139CONFIG_ZONE_DMA_FLAG=1
@@ -208,8 +212,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
208CONFIG_INET6_XFRM_MODE_BEET=m 212CONFIG_INET6_XFRM_MODE_BEET=m
209CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 213CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
210CONFIG_IPV6_SIT=m 214CONFIG_IPV6_SIT=m
215CONFIG_IPV6_NDISC_NODETYPE=y
211CONFIG_IPV6_TUNNEL=m 216CONFIG_IPV6_TUNNEL=m
212# CONFIG_IPV6_MULTIPLE_TABLES is not set 217# CONFIG_IPV6_MULTIPLE_TABLES is not set
218# CONFIG_IPV6_MROUTE is not set
213# CONFIG_NETWORK_SECMARK is not set 219# CONFIG_NETWORK_SECMARK is not set
214CONFIG_NETFILTER=y 220CONFIG_NETFILTER=y
215# CONFIG_NETFILTER_DEBUG is not set 221# CONFIG_NETFILTER_DEBUG is not set
@@ -225,6 +231,7 @@ CONFIG_NF_CONNTRACK=m
225CONFIG_NF_CT_ACCT=y 231CONFIG_NF_CT_ACCT=y
226CONFIG_NF_CONNTRACK_MARK=y 232CONFIG_NF_CONNTRACK_MARK=y
227# CONFIG_NF_CONNTRACK_EVENTS is not set 233# CONFIG_NF_CONNTRACK_EVENTS is not set
234# CONFIG_NF_CT_PROTO_DCCP is not set
228CONFIG_NF_CT_PROTO_GRE=m 235CONFIG_NF_CT_PROTO_GRE=m
229CONFIG_NF_CT_PROTO_SCTP=m 236CONFIG_NF_CT_PROTO_SCTP=m
230CONFIG_NF_CT_PROTO_UDPLITE=m 237CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -303,6 +310,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
303CONFIG_IP_NF_TARGET_NETMAP=m 310CONFIG_IP_NF_TARGET_NETMAP=m
304CONFIG_NF_NAT_SNMP_BASIC=m 311CONFIG_NF_NAT_SNMP_BASIC=m
305CONFIG_NF_NAT_PROTO_GRE=m 312CONFIG_NF_NAT_PROTO_GRE=m
313CONFIG_NF_NAT_PROTO_UDPLITE=m
314CONFIG_NF_NAT_PROTO_SCTP=m
306CONFIG_NF_NAT_FTP=m 315CONFIG_NF_NAT_FTP=m
307CONFIG_NF_NAT_IRC=m 316CONFIG_NF_NAT_IRC=m
308CONFIG_NF_NAT_TFTP=m 317CONFIG_NF_NAT_TFTP=m
@@ -396,8 +405,6 @@ CONFIG_IEEE80211=m
396CONFIG_IEEE80211_CRYPT_WEP=m 405CONFIG_IEEE80211_CRYPT_WEP=m
397CONFIG_IEEE80211_CRYPT_CCMP=m 406CONFIG_IEEE80211_CRYPT_CCMP=m
398CONFIG_IEEE80211_CRYPT_TKIP=m 407CONFIG_IEEE80211_CRYPT_TKIP=m
399CONFIG_IEEE80211_SOFTMAC=m
400# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
401# CONFIG_RFKILL is not set 408# CONFIG_RFKILL is not set
402# CONFIG_NET_9P is not set 409# CONFIG_NET_9P is not set
403 410
@@ -529,6 +536,7 @@ CONFIG_SUN3_82586=y
529# 536#
530# CONFIG_WLAN_PRE80211 is not set 537# CONFIG_WLAN_PRE80211 is not set
531# CONFIG_WLAN_80211 is not set 538# CONFIG_WLAN_80211 is not set
539# CONFIG_IWLWIFI_LEDS is not set
532# CONFIG_WAN is not set 540# CONFIG_WAN is not set
533CONFIG_PPP=m 541CONFIG_PPP=m
534# CONFIG_PPP_MULTILINK is not set 542# CONFIG_PPP_MULTILINK is not set
@@ -612,6 +620,7 @@ CONFIG_VT=y
612CONFIG_VT_CONSOLE=y 620CONFIG_VT_CONSOLE=y
613CONFIG_HW_CONSOLE=y 621CONFIG_HW_CONSOLE=y
614CONFIG_VT_HW_CONSOLE_BINDING=y 622CONFIG_VT_HW_CONSOLE_BINDING=y
623# CONFIG_DEVKMEM is not set
615# CONFIG_SERIAL_NONSTANDARD is not set 624# CONFIG_SERIAL_NONSTANDARD is not set
616 625
617# 626#
@@ -633,12 +642,7 @@ CONFIG_GEN_RTC_X=y
633# CONFIG_RAW_DRIVER is not set 642# CONFIG_RAW_DRIVER is not set
634# CONFIG_TCG_TPM is not set 643# CONFIG_TCG_TPM is not set
635# CONFIG_I2C is not set 644# CONFIG_I2C is not set
636
637#
638# SPI support
639#
640# CONFIG_SPI is not set 645# CONFIG_SPI is not set
641# CONFIG_SPI_MASTER is not set
642# CONFIG_W1 is not set 646# CONFIG_W1 is not set
643# CONFIG_POWER_SUPPLY is not set 647# CONFIG_POWER_SUPPLY is not set
644# CONFIG_HWMON is not set 648# CONFIG_HWMON is not set
@@ -655,12 +659,22 @@ CONFIG_SSB_POSSIBLE=y
655# Multifunction device drivers 659# Multifunction device drivers
656# 660#
657# CONFIG_MFD_SM501 is not set 661# CONFIG_MFD_SM501 is not set
662# CONFIG_HTC_PASIC3 is not set
658 663
659# 664#
660# Multimedia devices 665# Multimedia devices
661# 666#
667
668#
669# Multimedia core support
670#
662# CONFIG_VIDEO_DEV is not set 671# CONFIG_VIDEO_DEV is not set
663# CONFIG_DVB_CORE is not set 672# CONFIG_DVB_CORE is not set
673# CONFIG_VIDEO_MEDIA is not set
674
675#
676# Multimedia drivers
677#
664# CONFIG_DAB is not set 678# CONFIG_DAB is not set
665 679
666# 680#
@@ -678,8 +692,8 @@ CONFIG_FB=y
678# CONFIG_FB_SYS_FILLRECT is not set 692# CONFIG_FB_SYS_FILLRECT is not set
679# CONFIG_FB_SYS_COPYAREA is not set 693# CONFIG_FB_SYS_COPYAREA is not set
680# CONFIG_FB_SYS_IMAGEBLIT is not set 694# CONFIG_FB_SYS_IMAGEBLIT is not set
695# CONFIG_FB_FOREIGN_ENDIAN is not set
681# CONFIG_FB_SYS_FOPS is not set 696# CONFIG_FB_SYS_FOPS is not set
682CONFIG_FB_DEFERRED_IO=y
683# CONFIG_FB_SVGALIB is not set 697# CONFIG_FB_SVGALIB is not set
684# CONFIG_FB_MACMODES is not set 698# CONFIG_FB_MACMODES is not set
685# CONFIG_FB_BACKLIGHT is not set 699# CONFIG_FB_BACKLIGHT is not set
@@ -726,11 +740,8 @@ CONFIG_HIDRAW=y
726# CONFIG_MMC is not set 740# CONFIG_MMC is not set
727# CONFIG_MEMSTICK is not set 741# CONFIG_MEMSTICK is not set
728# CONFIG_NEW_LEDS is not set 742# CONFIG_NEW_LEDS is not set
743# CONFIG_ACCESSIBILITY is not set
729# CONFIG_RTC_CLASS is not set 744# CONFIG_RTC_CLASS is not set
730
731#
732# Userspace I/O
733#
734# CONFIG_UIO is not set 745# CONFIG_UIO is not set
735 746
736# 747#
@@ -756,16 +767,15 @@ CONFIG_JFS_FS=m
756# CONFIG_JFS_SECURITY is not set 767# CONFIG_JFS_SECURITY is not set
757# CONFIG_JFS_DEBUG is not set 768# CONFIG_JFS_DEBUG is not set
758# CONFIG_JFS_STATISTICS is not set 769# CONFIG_JFS_STATISTICS is not set
759CONFIG_FS_POSIX_ACL=y 770# CONFIG_FS_POSIX_ACL is not set
760CONFIG_XFS_FS=m 771CONFIG_XFS_FS=m
761# CONFIG_XFS_QUOTA is not set 772# CONFIG_XFS_QUOTA is not set
762# CONFIG_XFS_SECURITY is not set
763# CONFIG_XFS_POSIX_ACL is not set 773# CONFIG_XFS_POSIX_ACL is not set
764# CONFIG_XFS_RT is not set 774# CONFIG_XFS_RT is not set
765CONFIG_GFS2_FS=m 775# CONFIG_XFS_DEBUG is not set
766CONFIG_GFS2_FS_LOCKING_NOLOCK=m
767CONFIG_GFS2_FS_LOCKING_DLM=m
768CONFIG_OCFS2_FS=m 776CONFIG_OCFS2_FS=m
777CONFIG_OCFS2_FS_O2CB=m
778CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
769# CONFIG_OCFS2_DEBUG_MASKLOG is not set 779# CONFIG_OCFS2_DEBUG_MASKLOG is not set
770# CONFIG_OCFS2_DEBUG_FS is not set 780# CONFIG_OCFS2_DEBUG_FS is not set
771CONFIG_DNOTIFY=y 781CONFIG_DNOTIFY=y
@@ -837,12 +847,10 @@ CONFIG_NFS_FS=y
837CONFIG_NFS_V3=y 847CONFIG_NFS_V3=y
838# CONFIG_NFS_V3_ACL is not set 848# CONFIG_NFS_V3_ACL is not set
839CONFIG_NFS_V4=y 849CONFIG_NFS_V4=y
840# CONFIG_NFS_DIRECTIO is not set
841CONFIG_NFSD=m 850CONFIG_NFSD=m
842CONFIG_NFSD_V3=y 851CONFIG_NFSD_V3=y
843# CONFIG_NFSD_V3_ACL is not set 852# CONFIG_NFSD_V3_ACL is not set
844# CONFIG_NFSD_V4 is not set 853# CONFIG_NFSD_V4 is not set
845CONFIG_NFSD_TCP=y
846CONFIG_ROOT_NFS=y 854CONFIG_ROOT_NFS=y
847CONFIG_LOCKD=y 855CONFIG_LOCKD=y
848CONFIG_LOCKD_V4=y 856CONFIG_LOCKD_V4=y
@@ -917,6 +925,7 @@ CONFIG_DLM=m
917# CONFIG_PRINTK_TIME is not set 925# CONFIG_PRINTK_TIME is not set
918CONFIG_ENABLE_WARN_DEPRECATED=y 926CONFIG_ENABLE_WARN_DEPRECATED=y
919CONFIG_ENABLE_MUST_CHECK=y 927CONFIG_ENABLE_MUST_CHECK=y
928CONFIG_FRAME_WARN=1024
920CONFIG_MAGIC_SYSRQ=y 929CONFIG_MAGIC_SYSRQ=y
921# CONFIG_UNUSED_SYMBOLS is not set 930# CONFIG_UNUSED_SYMBOLS is not set
922# CONFIG_DEBUG_FS is not set 931# CONFIG_DEBUG_FS is not set
@@ -936,53 +945,82 @@ CONFIG_ASYNC_CORE=m
936CONFIG_ASYNC_MEMCPY=m 945CONFIG_ASYNC_MEMCPY=m
937CONFIG_ASYNC_XOR=m 946CONFIG_ASYNC_XOR=m
938CONFIG_CRYPTO=y 947CONFIG_CRYPTO=y
948
949#
950# Crypto core or helper
951#
939CONFIG_CRYPTO_ALGAPI=y 952CONFIG_CRYPTO_ALGAPI=y
940CONFIG_CRYPTO_AEAD=m 953CONFIG_CRYPTO_AEAD=m
941CONFIG_CRYPTO_BLKCIPHER=y 954CONFIG_CRYPTO_BLKCIPHER=y
942CONFIG_CRYPTO_SEQIV=m
943CONFIG_CRYPTO_HASH=y 955CONFIG_CRYPTO_HASH=y
944CONFIG_CRYPTO_MANAGER=y 956CONFIG_CRYPTO_MANAGER=y
957CONFIG_CRYPTO_GF128MUL=m
958CONFIG_CRYPTO_NULL=m
959CONFIG_CRYPTO_CRYPTD=m
960CONFIG_CRYPTO_AUTHENC=m
961CONFIG_CRYPTO_TEST=m
962
963#
964# Authenticated Encryption with Associated Data
965#
966CONFIG_CRYPTO_CCM=m
967CONFIG_CRYPTO_GCM=m
968CONFIG_CRYPTO_SEQIV=m
969
970#
971# Block modes
972#
973CONFIG_CRYPTO_CBC=y
974CONFIG_CRYPTO_CTR=m
975CONFIG_CRYPTO_CTS=m
976CONFIG_CRYPTO_ECB=m
977CONFIG_CRYPTO_LRW=m
978CONFIG_CRYPTO_PCBC=m
979CONFIG_CRYPTO_XTS=m
980
981#
982# Hash modes
983#
945CONFIG_CRYPTO_HMAC=y 984CONFIG_CRYPTO_HMAC=y
946CONFIG_CRYPTO_XCBC=m 985CONFIG_CRYPTO_XCBC=m
947CONFIG_CRYPTO_NULL=m 986
987#
988# Digest
989#
990CONFIG_CRYPTO_CRC32C=m
948CONFIG_CRYPTO_MD4=m 991CONFIG_CRYPTO_MD4=m
949CONFIG_CRYPTO_MD5=y 992CONFIG_CRYPTO_MD5=y
993CONFIG_CRYPTO_MICHAEL_MIC=m
950CONFIG_CRYPTO_SHA1=m 994CONFIG_CRYPTO_SHA1=m
951CONFIG_CRYPTO_SHA256=m 995CONFIG_CRYPTO_SHA256=m
952CONFIG_CRYPTO_SHA512=m 996CONFIG_CRYPTO_SHA512=m
953CONFIG_CRYPTO_WP512=m
954CONFIG_CRYPTO_TGR192=m 997CONFIG_CRYPTO_TGR192=m
955CONFIG_CRYPTO_GF128MUL=m 998CONFIG_CRYPTO_WP512=m
956CONFIG_CRYPTO_ECB=m 999
957CONFIG_CRYPTO_CBC=y 1000#
958CONFIG_CRYPTO_PCBC=m 1001# Ciphers
959CONFIG_CRYPTO_LRW=m 1002#
960CONFIG_CRYPTO_XTS=m
961CONFIG_CRYPTO_CTR=m
962CONFIG_CRYPTO_GCM=m
963CONFIG_CRYPTO_CCM=m
964CONFIG_CRYPTO_CRYPTD=m
965CONFIG_CRYPTO_DES=y
966CONFIG_CRYPTO_FCRYPT=m
967CONFIG_CRYPTO_BLOWFISH=m
968CONFIG_CRYPTO_TWOFISH=m
969CONFIG_CRYPTO_TWOFISH_COMMON=m
970CONFIG_CRYPTO_SERPENT=m
971CONFIG_CRYPTO_AES=m 1003CONFIG_CRYPTO_AES=m
1004CONFIG_CRYPTO_ANUBIS=m
1005CONFIG_CRYPTO_ARC4=m
1006CONFIG_CRYPTO_BLOWFISH=m
1007CONFIG_CRYPTO_CAMELLIA=m
972CONFIG_CRYPTO_CAST5=m 1008CONFIG_CRYPTO_CAST5=m
973CONFIG_CRYPTO_CAST6=m 1009CONFIG_CRYPTO_CAST6=m
974CONFIG_CRYPTO_TEA=m 1010CONFIG_CRYPTO_DES=y
975CONFIG_CRYPTO_ARC4=m 1011CONFIG_CRYPTO_FCRYPT=m
976CONFIG_CRYPTO_KHAZAD=m 1012CONFIG_CRYPTO_KHAZAD=m
977CONFIG_CRYPTO_ANUBIS=m
978CONFIG_CRYPTO_SEED=m
979CONFIG_CRYPTO_SALSA20=m 1013CONFIG_CRYPTO_SALSA20=m
1014CONFIG_CRYPTO_SEED=m
1015CONFIG_CRYPTO_SERPENT=m
1016CONFIG_CRYPTO_TEA=m
1017CONFIG_CRYPTO_TWOFISH=m
1018CONFIG_CRYPTO_TWOFISH_COMMON=m
1019
1020#
1021# Compression
1022#
980CONFIG_CRYPTO_DEFLATE=m 1023CONFIG_CRYPTO_DEFLATE=m
981CONFIG_CRYPTO_MICHAEL_MIC=m
982CONFIG_CRYPTO_CRC32C=m
983CONFIG_CRYPTO_CAMELLIA=m
984CONFIG_CRYPTO_TEST=m
985CONFIG_CRYPTO_AUTHENC=m
986CONFIG_CRYPTO_LZO=m 1024CONFIG_CRYPTO_LZO=m
987# CONFIG_CRYPTO_HW is not set 1025# CONFIG_CRYPTO_HW is not set
988 1026
@@ -990,9 +1028,11 @@ CONFIG_CRYPTO_LZO=m
990# Library routines 1028# Library routines
991# 1029#
992CONFIG_BITREVERSE=y 1030CONFIG_BITREVERSE=y
1031# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1032# CONFIG_GENERIC_FIND_NEXT_BIT is not set
993CONFIG_CRC_CCITT=m 1033CONFIG_CRC_CCITT=m
994CONFIG_CRC16=m 1034CONFIG_CRC16=m
995# CONFIG_CRC_ITU_T is not set 1035CONFIG_CRC_ITU_T=m
996CONFIG_CRC32=y 1036CONFIG_CRC32=y
997# CONFIG_CRC7 is not set 1037# CONFIG_CRC7 is not set
998CONFIG_LIBCRC32C=m 1038CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index f18154f1ef1f..431513937498 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_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.25-rc8 3# Linux kernel version: 2.6.26-rc2
4# Wed Apr 2 20:46:23 2008 4# Sun May 18 14:44:54 2008
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -52,6 +52,7 @@ CONFIG_SYSCTL=y
52# CONFIG_EMBEDDED is not set 52# CONFIG_EMBEDDED is not set
53CONFIG_UID16=y 53CONFIG_UID16=y
54CONFIG_SYSCTL_SYSCALL=y 54CONFIG_SYSCTL_SYSCALL=y
55CONFIG_SYSCTL_SYSCALL_CHECK=y
55CONFIG_KALLSYMS=y 56CONFIG_KALLSYMS=y
56# CONFIG_KALLSYMS_EXTRA_PASS is not set 57# CONFIG_KALLSYMS_EXTRA_PASS is not set
57CONFIG_HOTPLUG=y 58CONFIG_HOTPLUG=y
@@ -76,12 +77,14 @@ CONFIG_SLAB=y
76# CONFIG_HAVE_OPROFILE is not set 77# CONFIG_HAVE_OPROFILE is not set
77# CONFIG_HAVE_KPROBES is not set 78# CONFIG_HAVE_KPROBES is not set
78# CONFIG_HAVE_KRETPROBES is not set 79# CONFIG_HAVE_KRETPROBES is not set
80# CONFIG_HAVE_DMA_ATTRS is not set
79CONFIG_PROC_PAGE_MONITOR=y 81CONFIG_PROC_PAGE_MONITOR=y
80CONFIG_SLABINFO=y 82CONFIG_SLABINFO=y
81CONFIG_RT_MUTEXES=y 83CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
84CONFIG_MODULES=y 86CONFIG_MODULES=y
87# CONFIG_MODULE_FORCE_LOAD is not set
85CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
86# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
87# CONFIG_MODVERSIONS is not set 90# CONFIG_MODVERSIONS is not set
@@ -141,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141CONFIG_NEED_MULTIPLE_NODES=y 144CONFIG_NEED_MULTIPLE_NODES=y
142# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
143# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 146# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
147CONFIG_PAGEFLAGS_EXTENDED=y
144CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1 150CONFIG_ZONE_DMA_FLAG=1
@@ -219,8 +223,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
219CONFIG_INET6_XFRM_MODE_BEET=m 223CONFIG_INET6_XFRM_MODE_BEET=m
220CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 224CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
221CONFIG_IPV6_SIT=m 225CONFIG_IPV6_SIT=m
226CONFIG_IPV6_NDISC_NODETYPE=y
222CONFIG_IPV6_TUNNEL=m 227CONFIG_IPV6_TUNNEL=m
223# CONFIG_IPV6_MULTIPLE_TABLES is not set 228# CONFIG_IPV6_MULTIPLE_TABLES is not set
229# CONFIG_IPV6_MROUTE is not set
224# CONFIG_NETWORK_SECMARK is not set 230# CONFIG_NETWORK_SECMARK is not set
225CONFIG_NETFILTER=y 231CONFIG_NETFILTER=y
226# CONFIG_NETFILTER_DEBUG is not set 232# CONFIG_NETFILTER_DEBUG is not set
@@ -236,6 +242,7 @@ CONFIG_NF_CONNTRACK=m
236CONFIG_NF_CT_ACCT=y 242CONFIG_NF_CT_ACCT=y
237CONFIG_NF_CONNTRACK_MARK=y 243CONFIG_NF_CONNTRACK_MARK=y
238# CONFIG_NF_CONNTRACK_EVENTS is not set 244# CONFIG_NF_CONNTRACK_EVENTS is not set
245# CONFIG_NF_CT_PROTO_DCCP is not set
239CONFIG_NF_CT_PROTO_GRE=m 246CONFIG_NF_CT_PROTO_GRE=m
240CONFIG_NF_CT_PROTO_SCTP=m 247CONFIG_NF_CT_PROTO_SCTP=m
241CONFIG_NF_CT_PROTO_UDPLITE=m 248CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -314,6 +321,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
314CONFIG_IP_NF_TARGET_NETMAP=m 321CONFIG_IP_NF_TARGET_NETMAP=m
315CONFIG_NF_NAT_SNMP_BASIC=m 322CONFIG_NF_NAT_SNMP_BASIC=m
316CONFIG_NF_NAT_PROTO_GRE=m 323CONFIG_NF_NAT_PROTO_GRE=m
324CONFIG_NF_NAT_PROTO_UDPLITE=m
325CONFIG_NF_NAT_PROTO_SCTP=m
317CONFIG_NF_NAT_FTP=m 326CONFIG_NF_NAT_FTP=m
318CONFIG_NF_NAT_IRC=m 327CONFIG_NF_NAT_IRC=m
319CONFIG_NF_NAT_TFTP=m 328CONFIG_NF_NAT_TFTP=m
@@ -407,8 +416,6 @@ CONFIG_IEEE80211=m
407CONFIG_IEEE80211_CRYPT_WEP=m 416CONFIG_IEEE80211_CRYPT_WEP=m
408CONFIG_IEEE80211_CRYPT_CCMP=m 417CONFIG_IEEE80211_CRYPT_CCMP=m
409CONFIG_IEEE80211_CRYPT_TKIP=m 418CONFIG_IEEE80211_CRYPT_TKIP=m
410CONFIG_IEEE80211_SOFTMAC=m
411# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
412# CONFIG_RFKILL is not set 419# CONFIG_RFKILL is not set
413# CONFIG_NET_9P is not set 420# CONFIG_NET_9P is not set
414 421
@@ -539,6 +546,7 @@ CONFIG_SUN3LANCE=y
539# 546#
540# CONFIG_WLAN_PRE80211 is not set 547# CONFIG_WLAN_PRE80211 is not set
541# CONFIG_WLAN_80211 is not set 548# CONFIG_WLAN_80211 is not set
549# CONFIG_IWLWIFI_LEDS is not set
542# CONFIG_WAN is not set 550# CONFIG_WAN is not set
543CONFIG_PPP=m 551CONFIG_PPP=m
544# CONFIG_PPP_MULTILINK is not set 552# CONFIG_PPP_MULTILINK is not set
@@ -622,6 +630,7 @@ CONFIG_VT=y
622CONFIG_VT_CONSOLE=y 630CONFIG_VT_CONSOLE=y
623CONFIG_HW_CONSOLE=y 631CONFIG_HW_CONSOLE=y
624CONFIG_VT_HW_CONSOLE_BINDING=y 632CONFIG_VT_HW_CONSOLE_BINDING=y
633# CONFIG_DEVKMEM is not set
625# CONFIG_SERIAL_NONSTANDARD is not set 634# CONFIG_SERIAL_NONSTANDARD is not set
626 635
627# 636#
@@ -643,12 +652,7 @@ CONFIG_GEN_RTC_X=y
643# CONFIG_RAW_DRIVER is not set 652# CONFIG_RAW_DRIVER is not set
644# CONFIG_TCG_TPM is not set 653# CONFIG_TCG_TPM is not set
645# CONFIG_I2C is not set 654# CONFIG_I2C is not set
646
647#
648# SPI support
649#
650# CONFIG_SPI is not set 655# CONFIG_SPI is not set
651# CONFIG_SPI_MASTER is not set
652# CONFIG_W1 is not set 656# CONFIG_W1 is not set
653# CONFIG_POWER_SUPPLY is not set 657# CONFIG_POWER_SUPPLY is not set
654# CONFIG_HWMON is not set 658# CONFIG_HWMON is not set
@@ -665,12 +669,22 @@ CONFIG_SSB_POSSIBLE=y
665# Multifunction device drivers 669# Multifunction device drivers
666# 670#
667# CONFIG_MFD_SM501 is not set 671# CONFIG_MFD_SM501 is not set
672# CONFIG_HTC_PASIC3 is not set
668 673
669# 674#
670# Multimedia devices 675# Multimedia devices
671# 676#
677
678#
679# Multimedia core support
680#
672# CONFIG_VIDEO_DEV is not set 681# CONFIG_VIDEO_DEV is not set
673# CONFIG_DVB_CORE is not set 682# CONFIG_DVB_CORE is not set
683# CONFIG_VIDEO_MEDIA is not set
684
685#
686# Multimedia drivers
687#
674# CONFIG_DAB is not set 688# CONFIG_DAB is not set
675 689
676# 690#
@@ -688,8 +702,8 @@ CONFIG_FB=y
688# CONFIG_FB_SYS_FILLRECT is not set 702# CONFIG_FB_SYS_FILLRECT is not set
689# CONFIG_FB_SYS_COPYAREA is not set 703# CONFIG_FB_SYS_COPYAREA is not set
690# CONFIG_FB_SYS_IMAGEBLIT is not set 704# CONFIG_FB_SYS_IMAGEBLIT is not set
705# CONFIG_FB_FOREIGN_ENDIAN is not set
691# CONFIG_FB_SYS_FOPS is not set 706# CONFIG_FB_SYS_FOPS is not set
692CONFIG_FB_DEFERRED_IO=y
693# CONFIG_FB_SVGALIB is not set 707# CONFIG_FB_SVGALIB is not set
694# CONFIG_FB_MACMODES is not set 708# CONFIG_FB_MACMODES is not set
695# CONFIG_FB_BACKLIGHT is not set 709# CONFIG_FB_BACKLIGHT is not set
@@ -736,11 +750,8 @@ CONFIG_HIDRAW=y
736# CONFIG_MMC is not set 750# CONFIG_MMC is not set
737# CONFIG_MEMSTICK is not set 751# CONFIG_MEMSTICK is not set
738# CONFIG_NEW_LEDS is not set 752# CONFIG_NEW_LEDS is not set
753# CONFIG_ACCESSIBILITY is not set
739# CONFIG_RTC_CLASS is not set 754# CONFIG_RTC_CLASS is not set
740
741#
742# Userspace I/O
743#
744# CONFIG_UIO is not set 755# CONFIG_UIO is not set
745 756
746# 757#
@@ -766,16 +777,15 @@ CONFIG_JFS_FS=m
766# CONFIG_JFS_SECURITY is not set 777# CONFIG_JFS_SECURITY is not set
767# CONFIG_JFS_DEBUG is not set 778# CONFIG_JFS_DEBUG is not set
768# CONFIG_JFS_STATISTICS is not set 779# CONFIG_JFS_STATISTICS is not set
769CONFIG_FS_POSIX_ACL=y 780# CONFIG_FS_POSIX_ACL is not set
770CONFIG_XFS_FS=m 781CONFIG_XFS_FS=m
771# CONFIG_XFS_QUOTA is not set 782# CONFIG_XFS_QUOTA is not set
772# CONFIG_XFS_SECURITY is not set
773# CONFIG_XFS_POSIX_ACL is not set 783# CONFIG_XFS_POSIX_ACL is not set
774# CONFIG_XFS_RT is not set 784# CONFIG_XFS_RT is not set
775CONFIG_GFS2_FS=m 785# CONFIG_XFS_DEBUG is not set
776CONFIG_GFS2_FS_LOCKING_NOLOCK=m
777CONFIG_GFS2_FS_LOCKING_DLM=m
778CONFIG_OCFS2_FS=m 786CONFIG_OCFS2_FS=m
787CONFIG_OCFS2_FS_O2CB=m
788CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
779# CONFIG_OCFS2_DEBUG_MASKLOG is not set 789# CONFIG_OCFS2_DEBUG_MASKLOG is not set
780# CONFIG_OCFS2_DEBUG_FS is not set 790# CONFIG_OCFS2_DEBUG_FS is not set
781CONFIG_DNOTIFY=y 791CONFIG_DNOTIFY=y
@@ -847,12 +857,10 @@ CONFIG_NFS_FS=y
847CONFIG_NFS_V3=y 857CONFIG_NFS_V3=y
848# CONFIG_NFS_V3_ACL is not set 858# CONFIG_NFS_V3_ACL is not set
849CONFIG_NFS_V4=y 859CONFIG_NFS_V4=y
850# CONFIG_NFS_DIRECTIO is not set
851CONFIG_NFSD=m 860CONFIG_NFSD=m
852CONFIG_NFSD_V3=y 861CONFIG_NFSD_V3=y
853# CONFIG_NFSD_V3_ACL is not set 862# CONFIG_NFSD_V3_ACL is not set
854# CONFIG_NFSD_V4 is not set 863# CONFIG_NFSD_V4 is not set
855CONFIG_NFSD_TCP=y
856CONFIG_ROOT_NFS=y 864CONFIG_ROOT_NFS=y
857CONFIG_LOCKD=y 865CONFIG_LOCKD=y
858CONFIG_LOCKD_V4=y 866CONFIG_LOCKD_V4=y
@@ -927,6 +935,7 @@ CONFIG_DLM=m
927# CONFIG_PRINTK_TIME is not set 935# CONFIG_PRINTK_TIME is not set
928CONFIG_ENABLE_WARN_DEPRECATED=y 936CONFIG_ENABLE_WARN_DEPRECATED=y
929CONFIG_ENABLE_MUST_CHECK=y 937CONFIG_ENABLE_MUST_CHECK=y
938CONFIG_FRAME_WARN=1024
930CONFIG_MAGIC_SYSRQ=y 939CONFIG_MAGIC_SYSRQ=y
931# CONFIG_UNUSED_SYMBOLS is not set 940# CONFIG_UNUSED_SYMBOLS is not set
932# CONFIG_DEBUG_FS is not set 941# CONFIG_DEBUG_FS is not set
@@ -946,53 +955,82 @@ CONFIG_ASYNC_CORE=m
946CONFIG_ASYNC_MEMCPY=m 955CONFIG_ASYNC_MEMCPY=m
947CONFIG_ASYNC_XOR=m 956CONFIG_ASYNC_XOR=m
948CONFIG_CRYPTO=y 957CONFIG_CRYPTO=y
958
959#
960# Crypto core or helper
961#
949CONFIG_CRYPTO_ALGAPI=y 962CONFIG_CRYPTO_ALGAPI=y
950CONFIG_CRYPTO_AEAD=m 963CONFIG_CRYPTO_AEAD=m
951CONFIG_CRYPTO_BLKCIPHER=y 964CONFIG_CRYPTO_BLKCIPHER=y
952CONFIG_CRYPTO_SEQIV=m
953CONFIG_CRYPTO_HASH=y 965CONFIG_CRYPTO_HASH=y
954CONFIG_CRYPTO_MANAGER=y 966CONFIG_CRYPTO_MANAGER=y
967CONFIG_CRYPTO_GF128MUL=m
968CONFIG_CRYPTO_NULL=m
969CONFIG_CRYPTO_CRYPTD=m
970CONFIG_CRYPTO_AUTHENC=m
971CONFIG_CRYPTO_TEST=m
972
973#
974# Authenticated Encryption with Associated Data
975#
976CONFIG_CRYPTO_CCM=m
977CONFIG_CRYPTO_GCM=m
978CONFIG_CRYPTO_SEQIV=m
979
980#
981# Block modes
982#
983CONFIG_CRYPTO_CBC=y
984CONFIG_CRYPTO_CTR=m
985CONFIG_CRYPTO_CTS=m
986CONFIG_CRYPTO_ECB=m
987CONFIG_CRYPTO_LRW=m
988CONFIG_CRYPTO_PCBC=m
989CONFIG_CRYPTO_XTS=m
990
991#
992# Hash modes
993#
955CONFIG_CRYPTO_HMAC=y 994CONFIG_CRYPTO_HMAC=y
956CONFIG_CRYPTO_XCBC=m 995CONFIG_CRYPTO_XCBC=m
957CONFIG_CRYPTO_NULL=m 996
997#
998# Digest
999#
1000CONFIG_CRYPTO_CRC32C=m
958CONFIG_CRYPTO_MD4=m 1001CONFIG_CRYPTO_MD4=m
959CONFIG_CRYPTO_MD5=y 1002CONFIG_CRYPTO_MD5=y
1003CONFIG_CRYPTO_MICHAEL_MIC=m
960CONFIG_CRYPTO_SHA1=m 1004CONFIG_CRYPTO_SHA1=m
961CONFIG_CRYPTO_SHA256=m 1005CONFIG_CRYPTO_SHA256=m
962CONFIG_CRYPTO_SHA512=m 1006CONFIG_CRYPTO_SHA512=m
963CONFIG_CRYPTO_WP512=m
964CONFIG_CRYPTO_TGR192=m 1007CONFIG_CRYPTO_TGR192=m
965CONFIG_CRYPTO_GF128MUL=m 1008CONFIG_CRYPTO_WP512=m
966CONFIG_CRYPTO_ECB=m 1009
967CONFIG_CRYPTO_CBC=y 1010#
968CONFIG_CRYPTO_PCBC=m 1011# Ciphers
969CONFIG_CRYPTO_LRW=m 1012#
970CONFIG_CRYPTO_XTS=m
971CONFIG_CRYPTO_CTR=m
972CONFIG_CRYPTO_GCM=m
973CONFIG_CRYPTO_CCM=m
974CONFIG_CRYPTO_CRYPTD=m
975CONFIG_CRYPTO_DES=y
976CONFIG_CRYPTO_FCRYPT=m
977CONFIG_CRYPTO_BLOWFISH=m
978CONFIG_CRYPTO_TWOFISH=m
979CONFIG_CRYPTO_TWOFISH_COMMON=m
980CONFIG_CRYPTO_SERPENT=m
981CONFIG_CRYPTO_AES=m 1013CONFIG_CRYPTO_AES=m
1014CONFIG_CRYPTO_ANUBIS=m
1015CONFIG_CRYPTO_ARC4=m
1016CONFIG_CRYPTO_BLOWFISH=m
1017CONFIG_CRYPTO_CAMELLIA=m
982CONFIG_CRYPTO_CAST5=m 1018CONFIG_CRYPTO_CAST5=m
983CONFIG_CRYPTO_CAST6=m 1019CONFIG_CRYPTO_CAST6=m
984CONFIG_CRYPTO_TEA=m 1020CONFIG_CRYPTO_DES=y
985CONFIG_CRYPTO_ARC4=m 1021CONFIG_CRYPTO_FCRYPT=m
986CONFIG_CRYPTO_KHAZAD=m 1022CONFIG_CRYPTO_KHAZAD=m
987CONFIG_CRYPTO_ANUBIS=m
988CONFIG_CRYPTO_SEED=m
989CONFIG_CRYPTO_SALSA20=m 1023CONFIG_CRYPTO_SALSA20=m
1024CONFIG_CRYPTO_SEED=m
1025CONFIG_CRYPTO_SERPENT=m
1026CONFIG_CRYPTO_TEA=m
1027CONFIG_CRYPTO_TWOFISH=m
1028CONFIG_CRYPTO_TWOFISH_COMMON=m
1029
1030#
1031# Compression
1032#
990CONFIG_CRYPTO_DEFLATE=m 1033CONFIG_CRYPTO_DEFLATE=m
991CONFIG_CRYPTO_MICHAEL_MIC=m
992CONFIG_CRYPTO_CRC32C=m
993CONFIG_CRYPTO_CAMELLIA=m
994CONFIG_CRYPTO_TEST=m
995CONFIG_CRYPTO_AUTHENC=m
996CONFIG_CRYPTO_LZO=m 1034CONFIG_CRYPTO_LZO=m
997# CONFIG_CRYPTO_HW is not set 1035# CONFIG_CRYPTO_HW is not set
998 1036
@@ -1000,9 +1038,11 @@ CONFIG_CRYPTO_LZO=m
1000# Library routines 1038# Library routines
1001# 1039#
1002CONFIG_BITREVERSE=y 1040CONFIG_BITREVERSE=y
1041# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1042# CONFIG_GENERIC_FIND_NEXT_BIT is not set
1003CONFIG_CRC_CCITT=m 1043CONFIG_CRC_CCITT=m
1004CONFIG_CRC16=m 1044CONFIG_CRC16=m
1005# CONFIG_CRC_ITU_T is not set 1045CONFIG_CRC_ITU_T=m
1006CONFIG_CRC32=y 1046CONFIG_CRC32=y
1007# CONFIG_CRC7 is not set 1047# CONFIG_CRC7 is not set
1008CONFIG_LIBCRC32C=m 1048CONFIG_LIBCRC32C=m
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index faa6764f1d13..f513f530de91 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -1434,7 +1434,7 @@ L(mmu_fixup_done):
1434#endif 1434#endif
1435 1435
1436#ifdef CONFIG_HP300 1436#ifdef CONFIG_HP300
1437 is_not_hp300(1f) 1437 is_not_hp300(2f)
1438 /* 1438 /*
1439 * Fix up the iobase register to point to the new location of the LEDs. 1439 * Fix up the iobase register to point to the new location of the LEDs.
1440 */ 1440 */
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index bba650312fd9..a9fb83a8c180 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -41,11 +41,12 @@
41#endif 41#endif
42 42
43unsigned long m68k_machtype; 43unsigned long m68k_machtype;
44unsigned long m68k_cputype;
45EXPORT_SYMBOL(m68k_machtype); 44EXPORT_SYMBOL(m68k_machtype);
45unsigned long m68k_cputype;
46EXPORT_SYMBOL(m68k_cputype); 46EXPORT_SYMBOL(m68k_cputype);
47unsigned long m68k_fputype; 47unsigned long m68k_fputype;
48unsigned long m68k_mmutype; 48unsigned long m68k_mmutype;
49EXPORT_SYMBOL(m68k_mmutype);
49#ifdef CONFIG_VME 50#ifdef CONFIG_VME
50unsigned long vme_brdtype; 51unsigned long vme_brdtype;
51EXPORT_SYMBOL(vme_brdtype); 52EXPORT_SYMBOL(vme_brdtype);
@@ -345,19 +346,19 @@ void __init setup_arch(char **cmdline_p)
345 346
346/* set ISA defs early as possible */ 347/* set ISA defs early as possible */
347#if defined(CONFIG_ISA) && defined(MULTI_ISA) 348#if defined(CONFIG_ISA) && defined(MULTI_ISA)
348#if defined(CONFIG_Q40)
349 if (MACH_IS_Q40) { 349 if (MACH_IS_Q40) {
350 isa_type = Q40_ISA; 350 isa_type = ISA_TYPE_Q40;
351 isa_sex = 0; 351 isa_sex = 0;
352 } 352 }
353#elif defined(CONFIG_GG2) 353#ifdef CONFIG_GG2
354 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) { 354 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) {
355 isa_type = GG2_ISA; 355 isa_type = ISA_TYPE_GG2;
356 isa_sex = 0; 356 isa_sex = 0;
357 } 357 }
358#elif defined(CONFIG_AMIGA_PCMCIA) 358#endif
359#ifdef CONFIG_AMIGA_PCMCIA
359 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) { 360 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) {
360 isa_type = AG_ISA; 361 isa_type = ISA_TYPE_AG;
361 isa_sex = 1; 362 isa_sex = 1;
362 } 363 }
363#endif 364#endif
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index aff93c9d13f4..76eb832527f2 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/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.25 3# Linux kernel version: 2.6.26-rc2
4# Sat Apr 26 03:11:06 2008 4# Fri May 16 13:36:07 2008
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -74,6 +74,7 @@ CONFIG_SYSCTL=y
74# CONFIG_EMBEDDED is not set 74# CONFIG_EMBEDDED is not set
75CONFIG_UID16=y 75CONFIG_UID16=y
76CONFIG_SYSCTL_SYSCALL=y 76CONFIG_SYSCTL_SYSCALL=y
77CONFIG_SYSCTL_SYSCALL_CHECK=y
77CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
78# CONFIG_KALLSYMS_ALL is not set 79# CONFIG_KALLSYMS_ALL is not set
79# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -103,12 +104,14 @@ CONFIG_KPROBES=y
103CONFIG_KRETPROBES=y 104CONFIG_KRETPROBES=y
104CONFIG_HAVE_KPROBES=y 105CONFIG_HAVE_KPROBES=y
105CONFIG_HAVE_KRETPROBES=y 106CONFIG_HAVE_KRETPROBES=y
107# CONFIG_HAVE_DMA_ATTRS is not set
106CONFIG_PROC_PAGE_MONITOR=y 108CONFIG_PROC_PAGE_MONITOR=y
107CONFIG_SLABINFO=y 109CONFIG_SLABINFO=y
108CONFIG_RT_MUTEXES=y 110CONFIG_RT_MUTEXES=y
109# CONFIG_TINY_SHMEM is not set 111# CONFIG_TINY_SHMEM is not set
110CONFIG_BASE_SMALL=0 112CONFIG_BASE_SMALL=0
111CONFIG_MODULES=y 113CONFIG_MODULES=y
114# CONFIG_MODULE_FORCE_LOAD is not set
112CONFIG_MODULE_UNLOAD=y 115CONFIG_MODULE_UNLOAD=y
113CONFIG_MODULE_FORCE_UNLOAD=y 116CONFIG_MODULE_FORCE_UNLOAD=y
114CONFIG_MODVERSIONS=y 117CONFIG_MODVERSIONS=y
@@ -170,6 +173,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
170CONFIG_SPARSEMEM_EXTREME=y 173CONFIG_SPARSEMEM_EXTREME=y
171CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 174CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
172CONFIG_SPARSEMEM_VMEMMAP=y 175CONFIG_SPARSEMEM_VMEMMAP=y
176CONFIG_PAGEFLAGS_EXTENDED=y
173CONFIG_SPLIT_PTLOCK_CPUS=4 177CONFIG_SPLIT_PTLOCK_CPUS=4
174CONFIG_MIGRATION=y 178CONFIG_MIGRATION=y
175CONFIG_RESOURCES_64BIT=y 179CONFIG_RESOURCES_64BIT=y
@@ -402,7 +406,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
402CONFIG_BLK_DEV_IDEDMA_PCI=y 406CONFIG_BLK_DEV_IDEDMA_PCI=y
403# CONFIG_BLK_DEV_AEC62XX is not set 407# CONFIG_BLK_DEV_AEC62XX is not set
404CONFIG_BLK_DEV_ALI15X3=y 408CONFIG_BLK_DEV_ALI15X3=y
405# CONFIG_WDC_ALI15X3 is not set
406# CONFIG_BLK_DEV_AMD74XX is not set 409# CONFIG_BLK_DEV_AMD74XX is not set
407# CONFIG_BLK_DEV_CMD64X is not set 410# CONFIG_BLK_DEV_CMD64X is not set
408# CONFIG_BLK_DEV_TRIFLEX is not set 411# CONFIG_BLK_DEV_TRIFLEX is not set
@@ -609,6 +612,7 @@ CONFIG_NIU=m
609# CONFIG_MLX4_CORE is not set 612# CONFIG_MLX4_CORE is not set
610# CONFIG_TEHUTI is not set 613# CONFIG_TEHUTI is not set
611# CONFIG_BNX2X is not set 614# CONFIG_BNX2X is not set
615# CONFIG_SFC is not set
612# CONFIG_TR is not set 616# CONFIG_TR is not set
613 617
614# 618#
@@ -717,6 +721,7 @@ CONFIG_VT=y
717CONFIG_VT_CONSOLE=y 721CONFIG_VT_CONSOLE=y
718CONFIG_HW_CONSOLE=y 722CONFIG_HW_CONSOLE=y
719# CONFIG_VT_HW_CONSOLE_BINDING is not set 723# CONFIG_VT_HW_CONSOLE_BINDING is not set
724# CONFIG_DEVKMEM is not set
720# CONFIG_SERIAL_NONSTANDARD is not set 725# CONFIG_SERIAL_NONSTANDARD is not set
721# CONFIG_NOZOMI is not set 726# CONFIG_NOZOMI is not set
722 727
@@ -793,12 +798,7 @@ CONFIG_I2C_ALGOBIT=y
793# CONFIG_I2C_DEBUG_ALGO is not set 798# CONFIG_I2C_DEBUG_ALGO is not set
794# CONFIG_I2C_DEBUG_BUS is not set 799# CONFIG_I2C_DEBUG_BUS is not set
795# CONFIG_I2C_DEBUG_CHIP is not set 800# CONFIG_I2C_DEBUG_CHIP is not set
796
797#
798# SPI support
799#
800# CONFIG_SPI is not set 801# CONFIG_SPI is not set
801# CONFIG_SPI_MASTER is not set
802# CONFIG_W1 is not set 802# CONFIG_W1 is not set
803# CONFIG_POWER_SUPPLY is not set 803# CONFIG_POWER_SUPPLY is not set
804CONFIG_HWMON=y 804CONFIG_HWMON=y
@@ -873,8 +873,17 @@ CONFIG_SSB_POSSIBLE=y
873# 873#
874# Multimedia devices 874# Multimedia devices
875# 875#
876
877#
878# Multimedia core support
879#
876# CONFIG_VIDEO_DEV is not set 880# CONFIG_VIDEO_DEV is not set
877# CONFIG_DVB_CORE is not set 881# CONFIG_DVB_CORE is not set
882# CONFIG_VIDEO_MEDIA is not set
883
884#
885# Multimedia drivers
886#
878# CONFIG_DAB is not set 887# CONFIG_DAB is not set
879 888
880# 889#
@@ -893,8 +902,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
893# CONFIG_FB_SYS_FILLRECT is not set 902# CONFIG_FB_SYS_FILLRECT is not set
894# CONFIG_FB_SYS_COPYAREA is not set 903# CONFIG_FB_SYS_COPYAREA is not set
895# CONFIG_FB_SYS_IMAGEBLIT is not set 904# CONFIG_FB_SYS_IMAGEBLIT is not set
905# CONFIG_FB_FOREIGN_ENDIAN is not set
896# CONFIG_FB_SYS_FOPS is not set 906# CONFIG_FB_SYS_FOPS is not set
897CONFIG_FB_DEFERRED_IO=y
898# CONFIG_FB_SVGALIB is not set 907# CONFIG_FB_SVGALIB is not set
899# CONFIG_FB_MACMODES is not set 908# CONFIG_FB_MACMODES is not set
900# CONFIG_FB_BACKLIGHT is not set 909# CONFIG_FB_BACKLIGHT is not set
@@ -1100,6 +1109,10 @@ CONFIG_SND_SUN_CS4231=m
1100# 1109#
1101 1110
1102# 1111#
1112# SoC Audio for the Texas Instruments OMAP
1113#
1114
1115#
1103# Open Sound System 1116# Open Sound System
1104# 1117#
1105# CONFIG_SOUND_PRIME is not set 1118# CONFIG_SOUND_PRIME is not set
@@ -1135,10 +1148,12 @@ CONFIG_USB_DEVICEFS=y
1135# 1148#
1136# USB Host Controller Drivers 1149# USB Host Controller Drivers
1137# 1150#
1151# CONFIG_USB_C67X00_HCD is not set
1138CONFIG_USB_EHCI_HCD=m 1152CONFIG_USB_EHCI_HCD=m
1139# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1153# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1140# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1154# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1141# CONFIG_USB_ISP116X_HCD is not set 1155# CONFIG_USB_ISP116X_HCD is not set
1156# CONFIG_USB_ISP1760_HCD is not set
1142CONFIG_USB_OHCI_HCD=y 1157CONFIG_USB_OHCI_HCD=y
1143# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1158# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1144# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1159# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1173,6 +1188,7 @@ CONFIG_USB_STORAGE=m
1173# CONFIG_USB_STORAGE_ALAUDA is not set 1188# CONFIG_USB_STORAGE_ALAUDA is not set
1174# CONFIG_USB_STORAGE_ONETOUCH is not set 1189# CONFIG_USB_STORAGE_ONETOUCH is not set
1175# CONFIG_USB_STORAGE_KARMA is not set 1190# CONFIG_USB_STORAGE_KARMA is not set
1191# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1176# CONFIG_USB_LIBUSUAL is not set 1192# CONFIG_USB_LIBUSUAL is not set
1177 1193
1178# 1194#
@@ -1214,6 +1230,7 @@ CONFIG_USB_STORAGE=m
1214# CONFIG_MMC is not set 1230# CONFIG_MMC is not set
1215# CONFIG_MEMSTICK is not set 1231# CONFIG_MEMSTICK is not set
1216# CONFIG_NEW_LEDS is not set 1232# CONFIG_NEW_LEDS is not set
1233# CONFIG_ACCESSIBILITY is not set
1217# CONFIG_INFINIBAND is not set 1234# CONFIG_INFINIBAND is not set
1218# CONFIG_RTC_CLASS is not set 1235# CONFIG_RTC_CLASS is not set
1219# CONFIG_UIO is not set 1236# CONFIG_UIO is not set
@@ -1367,6 +1384,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1367CONFIG_PRINTK_TIME=y 1384CONFIG_PRINTK_TIME=y
1368# CONFIG_ENABLE_WARN_DEPRECATED is not set 1385# CONFIG_ENABLE_WARN_DEPRECATED is not set
1369CONFIG_ENABLE_MUST_CHECK=y 1386CONFIG_ENABLE_MUST_CHECK=y
1387CONFIG_FRAME_WARN=2048
1370CONFIG_MAGIC_SYSRQ=y 1388CONFIG_MAGIC_SYSRQ=y
1371# CONFIG_UNUSED_SYMBOLS is not set 1389# CONFIG_UNUSED_SYMBOLS is not set
1372CONFIG_DEBUG_FS=y 1390CONFIG_DEBUG_FS=y
@@ -1377,6 +1395,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
1377# CONFIG_SCHED_DEBUG is not set 1395# CONFIG_SCHED_DEBUG is not set
1378CONFIG_SCHEDSTATS=y 1396CONFIG_SCHEDSTATS=y
1379# CONFIG_TIMER_STATS is not set 1397# CONFIG_TIMER_STATS is not set
1398# CONFIG_DEBUG_OBJECTS is not set
1380# CONFIG_SLUB_DEBUG_ON is not set 1399# CONFIG_SLUB_DEBUG_ON is not set
1381# CONFIG_SLUB_STATS is not set 1400# CONFIG_SLUB_STATS is not set
1382# CONFIG_DEBUG_RT_MUTEXES is not set 1401# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1402,6 +1421,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
1402# CONFIG_LKDTM is not set 1421# CONFIG_LKDTM is not set
1403# CONFIG_FAULT_INJECTION is not set 1422# CONFIG_FAULT_INJECTION is not set
1404# CONFIG_SAMPLES is not set 1423# CONFIG_SAMPLES is not set
1424CONFIG_HAVE_ARCH_KGDB=y
1425# CONFIG_KGDB is not set
1405# CONFIG_DEBUG_STACK_USAGE is not set 1426# CONFIG_DEBUG_STACK_USAGE is not set
1406# CONFIG_DEBUG_DCFLUSH is not set 1427# CONFIG_DEBUG_DCFLUSH is not set
1407# CONFIG_STACK_DEBUG is not set 1428# CONFIG_STACK_DEBUG is not set
@@ -1503,6 +1524,7 @@ CONFIG_CRYPTO_HW=y
1503# Library routines 1524# Library routines
1504# 1525#
1505CONFIG_BITREVERSE=y 1526CONFIG_BITREVERSE=y
1527# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1506CONFIG_CRC_CCITT=m 1528CONFIG_CRC_CCITT=m
1507CONFIG_CRC16=m 1529CONFIG_CRC16=m
1508# CONFIG_CRC_ITU_T is not set 1530# CONFIG_CRC_ITU_T is not set
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index a9828d748e2c..3c7b9471eafb 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -768,7 +768,7 @@ static void __init find_ramdisk(unsigned long phys_base)
768 initrd_start = ramdisk_image; 768 initrd_start = ramdisk_image;
769 initrd_end = ramdisk_image + sparc_ramdisk_size; 769 initrd_end = ramdisk_image + sparc_ramdisk_size;
770 770
771 lmb_reserve(initrd_start, initrd_end); 771 lmb_reserve(initrd_start, sparc_ramdisk_size);
772 772
773 initrd_start += PAGE_OFFSET; 773 initrd_start += PAGE_OFFSET;
774 initrd_end += PAGE_OFFSET; 774 initrd_end += PAGE_OFFSET;
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 67e9b4a1e89d..ba370dc8685b 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -99,15 +99,6 @@ static void mwait_idle(void)
99 local_irq_enable(); 99 local_irq_enable();
100} 100}
101 101
102
103static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
104{
105 if (force_mwait)
106 return 1;
107 /* Any C1 states supported? */
108 return c->cpuid_level >= 5 && ((cpuid_edx(5) >> 4) & 0xf) > 0;
109}
110
111/* 102/*
112 * On SMP it's slightly faster (but much more power-consuming!) 103 * On SMP it's slightly faster (but much more power-consuming!)
113 * to poll the ->work.need_resched flag instead of waiting for the 104 * to poll the ->work.need_resched flag instead of waiting for the
@@ -119,6 +110,33 @@ static void poll_idle(void)
119 cpu_relax(); 110 cpu_relax();
120} 111}
121 112
113/*
114 * mwait selection logic:
115 *
116 * It depends on the CPU. For AMD CPUs that support MWAIT this is
117 * wrong. Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings
118 * then depend on a clock divisor and current Pstate of the core. If
119 * all cores of a processor are in halt state (C1) the processor can
120 * enter the C1E (C1 enhanced) state. If mwait is used this will never
121 * happen.
122 *
123 * idle=mwait overrides this decision and forces the usage of mwait.
124 */
125static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
126{
127 if (force_mwait)
128 return 1;
129
130 if (c->x86_vendor == X86_VENDOR_AMD) {
131 switch(c->x86) {
132 case 0x10:
133 case 0x11:
134 return 0;
135 }
136 }
137 return 1;
138}
139
122void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) 140void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
123{ 141{
124 static int selected; 142 static int selected;
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index bcb1a8e4b2db..de3a99812450 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -28,7 +28,7 @@
28#ifdef CONFIG_X86_PAT 28#ifdef CONFIG_X86_PAT
29int __read_mostly pat_wc_enabled = 1; 29int __read_mostly pat_wc_enabled = 1;
30 30
31void __init pat_disable(char *reason) 31void __cpuinit pat_disable(char *reason)
32{ 32{
33 pat_wc_enabled = 0; 33 pat_wc_enabled = 0;
34 printk(KERN_INFO "%s\n", reason); 34 printk(KERN_INFO "%s\n", reason);
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index c9751b2b57e6..7516baff3bb9 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void)
1714 int i, ret; 1714 int i, ret;
1715 1715
1716 if (!MACH_IS_AMIGA) 1716 if (!MACH_IS_AMIGA)
1717 return -ENXIO; 1717 return -ENODEV;
1718 1718
1719 if (!AMIGAHW_PRESENT(AMI_FLOPPY)) 1719 if (!AMIGAHW_PRESENT(AMI_FLOPPY))
1720 return -ENXIO; 1720 return -ENODEV;
1721 1721
1722 if (register_blkdev(FLOPPY_MAJOR,"fd")) 1722 if (register_blkdev(FLOPPY_MAJOR,"fd"))
1723 return -EBUSY; 1723 return -EBUSY;
@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void)
1755 if (!floppy_queue) 1755 if (!floppy_queue)
1756 goto out_queue; 1756 goto out_queue;
1757 1757
1758 ret = -ENXIO; 1758 ret = -ENODEV;
1759 if (fd_probe_drives() < 1) /* No usable drives */ 1759 if (fd_probe_drives() < 1) /* No usable drives */
1760 goto out_probe; 1760 goto out_probe;
1761 1761
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 2d5853cbd4b0..be20a67f1fa8 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -332,7 +332,7 @@ z2_init(void)
332 int ret; 332 int ret;
333 333
334 if (!MACH_IS_AMIGA) 334 if (!MACH_IS_AMIGA)
335 return -ENXIO; 335 return -ENODEV;
336 336
337 ret = -EBUSY; 337 ret = -EBUSY;
338 if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) 338 if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index 53b3d44f8c06..55a95892ccf9 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -17,7 +17,7 @@
17 17
18#include <linux/interrupt.h> 18#include <linux/interrupt.h>
19#include <linux/sched.h> 19#include <linux/sched.h>
20#include <linux/byteorder/generic.h> 20#include <asm/byteorder.h>
21#include <asm/sn/sn_sal.h> 21#include <asm/sn/sn_sal.h>
22#include <asm/unaligned.h> 22#include <asm/unaligned.h>
23#include "snsc.h" 23#include "snsc.h"
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index e122a0e87bb0..f17ac043b551 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -89,9 +89,7 @@ static void scc_break_ctl(struct tty_struct *tty, int break_state);
89 89
90static struct tty_driver *scc_driver; 90static struct tty_driver *scc_driver;
91 91
92struct scc_port scc_ports[2]; 92static struct scc_port scc_ports[2];
93
94int scc_initialized = 0;
95 93
96/*--------------------------------------------------------------------------- 94/*---------------------------------------------------------------------------
97 * Interface from generic_serial.c back here 95 * Interface from generic_serial.c back here
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 1f527bbf8d96..caa2632dd08e 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -95,6 +95,9 @@ static int __init macide_init(void)
95 int irq; 95 int irq;
96 hw_regs_t hw; 96 hw_regs_t hw;
97 97
98 if (!MACH_IS_MAC)
99 return -ENODEV;
100
98 switch (macintosh_config->ide_type) { 101 switch (macintosh_config->ide_type) {
99 case MAC_IDE_QUADRA: 102 case MAC_IDE_QUADRA:
100 base = IDE_BASE; 103 base = IDE_BASE;
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 50d80ecf0b80..aacf71f3cd44 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -217,6 +217,10 @@ hil_keyb_init(void)
217 return -ENOMEM; 217 return -ENOMEM;
218 218
219#if defined(CONFIG_HP300) 219#if defined(CONFIG_HP300)
220 if (!MACH_IS_HP300) {
221 err = -ENODEV;
222 goto err1;
223 }
220 if (!hwreg_present((void *)(HILBASE + HIL_DATA))) { 224 if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
221 printk(KERN_ERR "HIL: hardware register was not found\n"); 225 printk(KERN_ERR "HIL: hardware register was not found\n");
222 err = -ENODEV; 226 err = -ENODEV;
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index ab76ea442fa5..45e5d05b01de 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -691,6 +691,11 @@ static int __init hp_sdc_rtc_init(void)
691{ 691{
692 int ret; 692 int ret;
693 693
694#ifdef __mc68000__
695 if (!MACH_IS_HP300)
696 return -ENODEV;
697#endif
698
694 init_MUTEX(&i8042tregs); 699 init_MUTEX(&i8042tregs);
695 700
696 if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr))) 701 if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index f1fd3b638a37..587398f5c9df 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -306,6 +306,11 @@ static int __init hp_sdc_mlc_init(void)
306{ 306{
307 hil_mlc *mlc = &hp_sdc_mlc; 307 hil_mlc *mlc = &hp_sdc_mlc;
308 308
309#ifdef __mc68000__
310 if (!MACH_IS_HP300)
311 return -ENODEV;
312#endif
313
309 printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n"); 314 printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
310 315
311 hp_sdc_mlc_priv.emtestmode = 0; 316 hp_sdc_mlc_priv.emtestmode = 0;
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index cb89aff2e160..d962a8d78b14 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
156 int error; 156 int error;
157 157
158 if (!MACH_IS_Q40) 158 if (!MACH_IS_Q40)
159 return -EIO; 159 return -ENODEV;
160 160
161 error = platform_driver_register(&q40kbd_driver); 161 error = platform_driver_register(&q40kbd_driver);
162 if (error) 162 if (error)
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 5e749c528a62..15d037ae25c5 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -34,7 +34,7 @@
34#include <linux/mm.h> 34#include <linux/mm.h>
35#include <linux/vmalloc.h> 35#include <linux/vmalloc.h>
36#include <linux/page-flags.h> 36#include <linux/page-flags.h>
37#include <linux/byteorder/generic.h> 37#include <asm/byteorder.h>
38#include <asm/page.h> 38#include <asm/page.h>
39#include <asm/uaccess.h> 39#include <asm/uaccess.h>
40 40
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 5748b1e1a128..7f9c7bcf3c85 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -34,7 +34,7 @@
34#include <linux/mm.h> 34#include <linux/mm.h>
35#include <linux/vmalloc.h> 35#include <linux/vmalloc.h>
36#include <linux/page-flags.h> 36#include <linux/page-flags.h>
37#include <linux/byteorder/generic.h> 37#include <asm/byteorder.h>
38#include <asm/page.h> 38#include <asm/page.h>
39#include <asm/uaccess.h> 39#include <asm/uaccess.h>
40 40
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 363dd2b9475c..e5c4e9f5193f 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -38,7 +38,7 @@
38#include <linux/mm.h> 38#include <linux/mm.h>
39#include <linux/vmalloc.h> 39#include <linux/vmalloc.h>
40#include <linux/page-flags.h> 40#include <linux/page-flags.h>
41#include <linux/byteorder/generic.h> 41#include <asm/byteorder.h>
42#include <asm/page.h> 42#include <asm/page.h>
43#include <asm/uaccess.h> 43#include <asm/uaccess.h>
44 44
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 7b60533efe45..37629ffd34c3 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -31,7 +31,6 @@
31#include <linux/kernel.h> 31#include <linux/kernel.h>
32#include <linux/module.h> 32#include <linux/module.h>
33#include <linux/vmalloc.h> 33#include <linux/vmalloc.h>
34#include <linux/byteorder/generic.h>
35 34
36#include <linux/interrupt.h> 35#include <linux/interrupt.h>
37#include <linux/proc_fs.h> 36#include <linux/proc_fs.h>
@@ -47,6 +46,7 @@
47#include <linux/delay.h> 46#include <linux/delay.h>
48#include <linux/wait.h> 47#include <linux/wait.h>
49 48
49#include <asm/byteorder.h>
50#include <asm/io.h> 50#include <asm/io.h>
51 51
52#include "videocodec.h" 52#include "videocodec.h"
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 0134bec1e399..345c77e46837 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -52,7 +52,6 @@
52#include <linux/pci.h> 52#include <linux/pci.h>
53#include <linux/vmalloc.h> 53#include <linux/vmalloc.h>
54#include <linux/wait.h> 54#include <linux/wait.h>
55#include <linux/byteorder/generic.h>
56 55
57#include <linux/interrupt.h> 56#include <linux/interrupt.h>
58#include <linux/i2c.h> 57#include <linux/i2c.h>
@@ -74,6 +73,7 @@
74#include <media/v4l2-common.h> 73#include <media/v4l2-common.h>
75#include "videocodec.h" 74#include "videocodec.h"
76 75
76#include <asm/byteorder.h>
77#include <asm/io.h> 77#include <asm/io.h>
78#include <asm/uaccess.h> 78#include <asm/uaccess.h>
79#include <linux/proc_fs.h> 79#include <linux/proc_fs.h>
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 2797da7eeee6..da292e647eb1 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1162,6 +1162,7 @@ struct net_device * __init i82596_probe(int unit)
1162 memcpy(eth_addr, (void *) 0xfffc1f2c, 6); /* YUCK! Get addr from NOVRAM */ 1162 memcpy(eth_addr, (void *) 0xfffc1f2c, 6); /* YUCK! Get addr from NOVRAM */
1163 dev->base_addr = MVME_I596_BASE; 1163 dev->base_addr = MVME_I596_BASE;
1164 dev->irq = (unsigned) MVME16x_IRQ_I596; 1164 dev->irq = (unsigned) MVME16x_IRQ_I596;
1165 goto found;
1165 } 1166 }
1166#endif 1167#endif
1167#ifdef ENABLE_BVME6000_NET 1168#ifdef ENABLE_BVME6000_NET
@@ -1176,6 +1177,7 @@ struct net_device * __init i82596_probe(int unit)
1176 rtc[3] = msr; 1177 rtc[3] = msr;
1177 dev->base_addr = BVME_I596_BASE; 1178 dev->base_addr = BVME_I596_BASE;
1178 dev->irq = (unsigned) BVME_IRQ_I596; 1179 dev->irq = (unsigned) BVME_IRQ_I596;
1180 goto found;
1179 } 1181 }
1180#endif 1182#endif
1181#ifdef ENABLE_APRICOT 1183#ifdef ENABLE_APRICOT
@@ -1212,8 +1214,13 @@ struct net_device * __init i82596_probe(int unit)
1212 } 1214 }
1213 1215
1214 dev->irq = 10; 1216 dev->irq = 10;
1217 goto found;
1215 } 1218 }
1216#endif 1219#endif
1220 err = -ENODEV;
1221 goto out;
1222
1223found:
1217 dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0); 1224 dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
1218 if (!dev->mem_start) { 1225 if (!dev->mem_start) {
1219 err = -ENOMEM; 1226 err = -ENOMEM;
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 47a8275d3962..867f6fff543c 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -127,6 +127,9 @@ struct net_device * __init apne_probe(int unit)
127#endif 127#endif
128 int err; 128 int err;
129 129
130 if (!MACH_IS_AMIGA)
131 return ERR_PTR(-ENODEV);
132
130 if (apne_owned) 133 if (apne_owned)
131 return ERR_PTR(-ENODEV); 134 return ERR_PTR(-ENODEV);
132 135
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 2a66e5b7cebc..4ce8afd481c3 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -183,6 +183,9 @@ struct net_device * __init mac89x0_probe(int unit)
183 int err = -ENODEV; 183 int err = -ENODEV;
184 DECLARE_MAC_BUF(mac); 184 DECLARE_MAC_BUF(mac);
185 185
186 if (!MACH_IS_MAC)
187 return ERR_PTR(-ENODEV);
188
186 dev = alloc_etherdev(sizeof(struct net_local)); 189 dev = alloc_etherdev(sizeof(struct net_local));
187 if (!dev) 190 if (!dev)
188 return ERR_PTR(-ENOMEM); 191 return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 18770527df99..51ad3765e075 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(void)
781{ 781{
782 int err; 782 int err;
783 783
784 if (!MACH_IS_MAC)
785 return -ENODEV;
786
784 if ((err = platform_driver_register(&mac_mace_driver))) { 787 if ((err = platform_driver_register(&mac_mace_driver))) {
785 printk(KERN_ERR "Driver registration failed\n"); 788 printk(KERN_ERR "Driver registration failed\n");
786 return err; 789 return err;
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index f8d46134daca..359452a06c67 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -250,6 +250,9 @@ struct net_device * __init sun3lance_probe(int unit)
250 static int found; 250 static int found;
251 int err = -ENODEV; 251 int err = -ENODEV;
252 252
253 if (!MACH_IS_SUN3 && !MACH_IS_SUN3X)
254 return ERR_PTR(-ENODEV);
255
253 /* check that this machine has an onboard lance */ 256 /* check that this machine has an onboard lance */
254 switch(idprom->id_machtype) { 257 switch(idprom->id_machtype) {
255 case SM_SUN3|SM_3_50: 258 case SM_SUN3|SM_3_50:
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index ef2da4023d68..438e63ecccf1 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -47,6 +47,7 @@
47#include <linux/string.h> 47#include <linux/string.h>
48#include <linux/ctype.h> 48#include <linux/ctype.h>
49#include <linux/timer.h> 49#include <linux/timer.h>
50#include <asm/byteorder.h>
50#include <asm/io.h> 51#include <asm/io.h>
51#include <asm/system.h> 52#include <asm/system.h>
52#include <asm/uaccess.h> 53#include <asm/uaccess.h>
@@ -60,7 +61,6 @@
60#include <linux/delay.h> 61#include <linux/delay.h>
61#include <linux/wireless.h> 62#include <linux/wireless.h>
62#include <net/iw_handler.h> 63#include <net/iw_handler.h>
63#include <linux/byteorder/generic.h>
64#include <linux/crc32.h> 64#include <linux/crc32.h>
65#include <linux/proc_fs.h> 65#include <linux/proc_fs.h>
66#include <linux/device.h> 66#include <linux/device.h>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2cdaf1ff8315..002b61b4f0f6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -627,11 +627,9 @@ config FB_MAC
627 select FB_CFB_IMAGEBLIT 627 select FB_CFB_IMAGEBLIT
628 select FB_MACMODES 628 select FB_MACMODES
629 629
630# bool ' Apple DAFB display support' CONFIG_FB_DAFB
631config FB_HP300 630config FB_HP300
632 bool 631 bool
633 depends on (FB = y) && HP300 632 depends on (FB = y) && DIO
634 select FB_CFB_FILLRECT
635 select FB_CFB_IMAGEBLIT 633 select FB_CFB_IMAGEBLIT
636 default y 634 default y
637 635
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index e6492c1048bf..05a328c11a8b 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
2261 amifb_setup(option); 2261 amifb_setup(option);
2262#endif 2262#endif
2263 if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO)) 2263 if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
2264 return -ENXIO; 2264 return -ENODEV;
2265 2265
2266 /* 2266 /*
2267 * We request all registers starting from bplpt[0] 2267 * We request all registers starting from bplpt[0]
@@ -2333,7 +2333,7 @@ default_chipset:
2333 strcat(fb_info.fix.id, "Unknown"); 2333 strcat(fb_info.fix.id, "Unknown");
2334 goto default_chipset; 2334 goto default_chipset;
2335#else /* CONFIG_FB_AMIGA_OCS */ 2335#else /* CONFIG_FB_AMIGA_OCS */
2336 err = -ENXIO; 2336 err = -ENODEV;
2337 goto amifb_error; 2337 goto amifb_error;
2338#endif /* CONFIG_FB_AMIGA_OCS */ 2338#endif /* CONFIG_FB_AMIGA_OCS */
2339 break; 2339 break;
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index b083ea7e9c69..606da043f4b4 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -284,6 +284,9 @@ int __init dnfb_init(void)
284{ 284{
285 int ret; 285 int ret;
286 286
287 if (!MACH_IS_APOLLO)
288 return -ENODEV;
289
287 if (fb_get_options("dnfb", NULL)) 290 if (fb_get_options("dnfb", NULL))
288 return -ENODEV; 291 return -ENODEV;
289 292
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 2eb4fb159084..b8ebff1e8493 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -382,7 +382,7 @@ int __init hpfb_init(void)
382#define INTFBPADDR 0x560000 382#define INTFBPADDR 0x560000
383 383
384 if (!MACH_IS_HP300) 384 if (!MACH_IS_HP300)
385 return -ENXIO; 385 return -ENODEV;
386 386
387 if (fb_get_options("hpfb", NULL)) 387 if (fb_get_options("hpfb", NULL))
388 return -ENODEV; 388 return -ENODEV;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 48aea39c35a5..3ee314beacc1 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -355,9 +355,8 @@ static int pxafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
355 } 355 }
356 356
357#ifdef CONFIG_CPU_FREQ 357#ifdef CONFIG_CPU_FREQ
358 pr_debug("pxafb: dma period = %d ps, clock = %d kHz\n", 358 pr_debug("pxafb: dma period = %d ps\n",
359 pxafb_display_dma_period(var), 359 pxafb_display_dma_period(var));
360 get_clk_frequency_khz(0));
361#endif 360#endif
362 361
363 return 0; 362 return 0;
diff --git a/fs/befs/endian.h b/fs/befs/endian.h
index e254a20869f4..6cb84d896d05 100644
--- a/fs/befs/endian.h
+++ b/fs/befs/endian.h
@@ -9,7 +9,7 @@
9#ifndef LINUX_BEFS_ENDIAN 9#ifndef LINUX_BEFS_ENDIAN
10#define LINUX_BEFS_ENDIAN 10#define LINUX_BEFS_ENDIAN
11 11
12#include <linux/byteorder/generic.h> 12#include <asm/byteorder.h>
13 13
14static inline u64 14static inline u64
15fs64_to_cpu(const struct super_block *sb, fs64 n) 15fs64_to_cpu(const struct super_block *sb, fs64 n)
diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h
index 224e009e5296..36a3b62d4d8d 100644
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
@@ -47,4 +47,8 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
47} 47}
48#endif 48#endif
49 49
50void omap2_set_globals_242x(void);
51void omap2_set_globals_243x(void);
52void omap2_set_globals_343x(void);
53
50#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ 54#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
diff --git a/include/asm-arm/arch-omap/control.h b/include/asm-arm/arch-omap/control.h
index 9944bb5d5330..59c0686f8be7 100644
--- a/include/asm-arm/arch-omap/control.h
+++ b/include/asm-arm/arch-omap/control.h
@@ -80,7 +80,7 @@
80#define OMAP24XX_CONTROL_SEC_TAP (OMAP2_CONTROL_GENERAL + 0x0064) 80#define OMAP24XX_CONTROL_SEC_TAP (OMAP2_CONTROL_GENERAL + 0x0064)
81#define OMAP24XX_CONTROL_OCM_PUB_RAM_ADD (OMAP2_CONTROL_GENERAL + 0x006c) 81#define OMAP24XX_CONTROL_OCM_PUB_RAM_ADD (OMAP2_CONTROL_GENERAL + 0x006c)
82#define OMAP24XX_CONTROL_EXT_SEC_RAM_START_ADD (OMAP2_CONTROL_GENERAL + 0x0070) 82#define OMAP24XX_CONTROL_EXT_SEC_RAM_START_ADD (OMAP2_CONTROL_GENERAL + 0x0070)
83#define OMAP24XX_CONTROL_EXT_SEC_RAM_STOP_ADD (OMAP2_CONTROL_GENERAL + 0x0074 83#define OMAP24XX_CONTROL_EXT_SEC_RAM_STOP_ADD (OMAP2_CONTROL_GENERAL + 0x0074)
84#define OMAP24XX_CONTROL_SEC_STATUS (OMAP2_CONTROL_GENERAL + 0x0080) 84#define OMAP24XX_CONTROL_SEC_STATUS (OMAP2_CONTROL_GENERAL + 0x0080)
85#define OMAP24XX_CONTROL_SEC_ERR_STATUS (OMAP2_CONTROL_GENERAL + 0x0084) 85#define OMAP24XX_CONTROL_SEC_ERR_STATUS (OMAP2_CONTROL_GENERAL + 0x0084)
86#define OMAP24XX_CONTROL_STATUS (OMAP2_CONTROL_GENERAL + 0x0088) 86#define OMAP24XX_CONTROL_STATUS (OMAP2_CONTROL_GENERAL + 0x0088)
diff --git a/include/asm-arm/arch-omap/mmc.h b/include/asm-arm/arch-omap/mmc.h
index c9588f49eb52..7cfc5f258560 100644
--- a/include/asm-arm/arch-omap/mmc.h
+++ b/include/asm-arm/arch-omap/mmc.h
@@ -15,21 +15,16 @@
15#include <linux/device.h> 15#include <linux/device.h>
16#include <linux/mmc/host.h> 16#include <linux/mmc/host.h>
17 17
18#include <asm/arch/board.h>
19
18#define OMAP_MMC_MAX_SLOTS 2 20#define OMAP_MMC_MAX_SLOTS 2
19 21
20struct omap_mmc_platform_data { 22struct omap_mmc_platform_data {
21 struct omap_mmc_conf conf; 23 struct omap_mmc_conf conf;
22 24
23 unsigned enabled:1;
24 /* number of slots on board */ 25 /* number of slots on board */
25 unsigned nr_slots:2; 26 unsigned nr_slots:2;
26 /* nomux means "standard" muxing is wrong on this board, and that 27
27 * board-specific code handled it before common init logic.
28 */
29 unsigned nomux:1;
30 /* 4 wire signaling is optional, and is only used for SD/SDIO and
31 * MMCv4 */
32 unsigned wire4:1;
33 /* set if your board has components or wiring that limits the 28 /* set if your board has components or wiring that limits the
34 * maximum frequency on the MMC bus */ 29 * maximum frequency on the MMC bus */
35 unsigned int max_freq; 30 unsigned int max_freq;
@@ -40,6 +35,11 @@ struct omap_mmc_platform_data {
40 * not supported */ 35 * not supported */
41 int (* init)(struct device *dev); 36 int (* init)(struct device *dev);
42 void (* cleanup)(struct device *dev); 37 void (* cleanup)(struct device *dev);
38 void (* shutdown)(struct device *dev);
39
40 /* To handle board related suspend/resume functionality for MMC */
41 int (*suspend)(struct device *dev, int slot);
42 int (*resume)(struct device *dev, int slot);
43 43
44 struct omap_mmc_slot_data { 44 struct omap_mmc_slot_data {
45 int (* set_bus_mode)(struct device *dev, int slot, int bus_mode); 45 int (* set_bus_mode)(struct device *dev, int slot, int bus_mode);
@@ -56,13 +56,19 @@ struct omap_mmc_platform_data {
56 56
57 const char *name; 57 const char *name;
58 u32 ocr_mask; 58 u32 ocr_mask;
59
60 /* Card detection IRQs */
61 int card_detect_irq;
62 int (* card_detect)(int irq);
63
64 unsigned int ban_openended:1;
65
59 } slots[OMAP_MMC_MAX_SLOTS]; 66 } slots[OMAP_MMC_MAX_SLOTS];
60}; 67};
61 68
62extern void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info); 69extern void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info);
63 70
64/* called from board-specific card detection service routine */ 71/* called from board-specific card detection service routine */
65extern void omap_mmc_notify_card_detect(struct device *dev, int slot, int detected);
66extern void omap_mmc_notify_cover_event(struct device *dev, int slot, int is_closed); 72extern void omap_mmc_notify_cover_event(struct device *dev, int slot, int is_closed);
67 73
68#endif 74#endif
diff --git a/include/asm-arm/arch-sa1100/irqs.h b/include/asm-arm/arch-sa1100/irqs.h
index d7940683efb1..7bf80484bb77 100644
--- a/include/asm-arm/arch-sa1100/irqs.h
+++ b/include/asm-arm/arch-sa1100/irqs.h
@@ -141,7 +141,7 @@
141#define IRQ_LOCOMO_LT (IRQ_BOARD_END + 17) 141#define IRQ_LOCOMO_LT (IRQ_BOARD_END + 17)
142#define IRQ_LOCOMO_SPI_RFR (IRQ_BOARD_END + 18) 142#define IRQ_LOCOMO_SPI_RFR (IRQ_BOARD_END + 18)
143#define IRQ_LOCOMO_SPI_RFW (IRQ_BOARD_END + 19) 143#define IRQ_LOCOMO_SPI_RFW (IRQ_BOARD_END + 19)
144#define IRQ_LOCOMO_SPI_OVRN (IRQ_BOARD_END + 20) 144#define IRQ_LOCOMO_SPI_REND (IRQ_BOARD_END + 20)
145#define IRQ_LOCOMO_SPI_TEND (IRQ_BOARD_END + 21) 145#define IRQ_LOCOMO_SPI_TEND (IRQ_BOARD_END + 21)
146 146
147/* 147/*
diff --git a/include/asm-arm/hardware/locomo.h b/include/asm-arm/hardware/locomo.h
index adab77780ed3..fb0645de6f31 100644
--- a/include/asm-arm/hardware/locomo.h
+++ b/include/asm-arm/hardware/locomo.h
@@ -58,6 +58,11 @@
58#define LOCOMO_SPIMD 0x00 /* SPI mode setting */ 58#define LOCOMO_SPIMD 0x00 /* SPI mode setting */
59#define LOCOMO_SPICT 0x04 /* SPI mode control */ 59#define LOCOMO_SPICT 0x04 /* SPI mode control */
60#define LOCOMO_SPIST 0x08 /* SPI status */ 60#define LOCOMO_SPIST 0x08 /* SPI status */
61#define LOCOMO_SPI_TEND (1 << 3) /* Transfer end bit */
62#define LOCOMO_SPI_REND (1 << 2) /* Receive end bit */
63#define LOCOMO_SPI_RFW (1 << 1) /* write buffer bit */
64#define LOCOMO_SPI_RFR (1) /* read buffer bit */
65
61#define LOCOMO_SPIIS 0x10 /* SPI interrupt status */ 66#define LOCOMO_SPIIS 0x10 /* SPI interrupt status */
62#define LOCOMO_SPIWE 0x14 /* SPI interrupt status write enable */ 67#define LOCOMO_SPIWE 0x14 /* SPI interrupt status write enable */
63#define LOCOMO_SPIIE 0x18 /* SPI interrupt enable */ 68#define LOCOMO_SPIIE 0x18 /* SPI interrupt enable */
@@ -66,16 +71,12 @@
66#define LOCOMO_SPIRD 0x24 /* SPI receive data read */ 71#define LOCOMO_SPIRD 0x24 /* SPI receive data read */
67#define LOCOMO_SPITS 0x28 /* SPI transfer data shift */ 72#define LOCOMO_SPITS 0x28 /* SPI transfer data shift */
68#define LOCOMO_SPIRS 0x2C /* SPI receive data shift */ 73#define LOCOMO_SPIRS 0x2C /* SPI receive data shift */
69#define LOCOMO_SPI_TEND (1 << 3) /* Transfer end bit */
70#define LOCOMO_SPI_OVRN (1 << 2) /* Over Run bit */
71#define LOCOMO_SPI_RFW (1 << 1) /* write buffer bit */
72#define LOCOMO_SPI_RFR (1) /* read buffer bit */
73 74
74/* GPIO */ 75/* GPIO */
75#define LOCOMO_GPD 0x90 /* GPIO direction */ 76#define LOCOMO_GPD 0x90 /* GPIO direction */
76#define LOCOMO_GPE 0x94 /* GPIO input enable */ 77#define LOCOMO_GPE 0x94 /* GPIO input enable */
77#define LOCOMO_GPL 0x98 /* GPIO level */ 78#define LOCOMO_GPL 0x98 /* GPIO level */
78#define LOCOMO_GPO 0x9c /* GPIO out data setteing */ 79#define LOCOMO_GPO 0x9c /* GPIO out data setting */
79#define LOCOMO_GRIE 0xa0 /* GPIO rise detection */ 80#define LOCOMO_GRIE 0xa0 /* GPIO rise detection */
80#define LOCOMO_GFIE 0xa4 /* GPIO fall detection */ 81#define LOCOMO_GFIE 0xa4 /* GPIO fall detection */
81#define LOCOMO_GIS 0xa8 /* GPIO edge detection status */ 82#define LOCOMO_GIS 0xa8 /* GPIO edge detection status */
@@ -96,6 +97,9 @@
96#define LOCOMO_GPIO_DAC_SDATA LOCOMO_GPIO(10) 97#define LOCOMO_GPIO_DAC_SDATA LOCOMO_GPIO(10)
97#define LOCOMO_GPIO_DAC_SCK LOCOMO_GPIO(11) 98#define LOCOMO_GPIO_DAC_SCK LOCOMO_GPIO(11)
98#define LOCOMO_GPIO_DAC_SLOAD LOCOMO_GPIO(12) 99#define LOCOMO_GPIO_DAC_SLOAD LOCOMO_GPIO(12)
100#define LOCOMO_GPIO_CARD_DETECT LOCOMO_GPIO(13)
101#define LOCOMO_GPIO_WRITE_PROT LOCOMO_GPIO(14)
102#define LOCOMO_GPIO_CARD_POWER LOCOMO_GPIO(15)
99 103
100/* Start the definitions of the devices. Each device has an initial 104/* Start the definitions of the devices. Each device has an initial
101 * base address and a series of offsets from that base address. */ 105 * base address and a series of offsets from that base address. */
@@ -122,7 +126,7 @@
122/* Audio controller */ 126/* Audio controller */
123#define LOCOMO_AUDIO 0x54 127#define LOCOMO_AUDIO 0x54
124#define LOCOMO_ACC 0x00 /* Audio clock */ 128#define LOCOMO_ACC 0x00 /* Audio clock */
125#define LOCOMO_PAIF 0x7C /* PCM audio interface */ 129#define LOCOMO_PAIF 0xD0 /* PCM audio interface */
126/* Audio clock */ 130/* Audio clock */
127#define LOCOMO_ACC_XON 0x80 131#define LOCOMO_ACC_XON 0x80
128#define LOCOMO_ACC_XEN 0x40 132#define LOCOMO_ACC_XEN 0x40
@@ -162,7 +166,7 @@ extern struct bus_type locomo_bus_type;
162#define LOCOMO_DEVID_AUDIO 3 166#define LOCOMO_DEVID_AUDIO 3
163#define LOCOMO_DEVID_LED 4 167#define LOCOMO_DEVID_LED 4
164#define LOCOMO_DEVID_UART 5 168#define LOCOMO_DEVID_UART 5
165#define LOCOMO_DEVID_SPI 6 169#define LOCOMO_DEVID_SPI 6
166 170
167struct locomo_dev { 171struct locomo_dev {
168 struct device dev; 172 struct device dev;
@@ -204,7 +208,6 @@ int locomo_gpio_read_level(struct device *dev, unsigned int bits);
204int locomo_gpio_read_output(struct device *dev, unsigned int bits); 208int locomo_gpio_read_output(struct device *dev, unsigned int bits);
205void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set); 209void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set);
206 210
207
208/* M62332 control function */ 211/* M62332 control function */
209void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int channel); 212void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int channel);
210 213
diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h
index 7b60776cc966..e5b528deb8a8 100644
--- a/include/asm-m68k/bug.h
+++ b/include/asm-m68k/bug.h
@@ -7,7 +7,7 @@
7#ifndef CONFIG_SUN3 7#ifndef CONFIG_SUN3
8#define BUG() do { \ 8#define BUG() do { \
9 printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ 9 printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
10 asm volatile("illegal"); \ 10 __builtin_trap(); \
11} while (0) 11} while (0)
12#else 12#else
13#define BUG() do { \ 13#define BUG() do { \
@@ -17,7 +17,7 @@
17#endif 17#endif
18#else 18#else
19#define BUG() do { \ 19#define BUG() do { \
20 asm volatile("illegal"); \ 20 __builtin_trap(); \
21} while (0) 21} while (0)
22#endif 22#endif
23 23
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h
index baf4f9b8acfc..657187f0c7c2 100644
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
@@ -91,20 +91,20 @@ extern unsigned long gg2_isa_base;
91#undef MULTI_ISA 91#undef MULTI_ISA
92#endif 92#endif
93 93
94#define Q40_ISA (1) 94#define ISA_TYPE_Q40 (1)
95#define GG2_ISA (2) 95#define ISA_TYPE_GG2 (2)
96#define AG_ISA (3) 96#define ISA_TYPE_AG (3)
97 97
98#if defined(CONFIG_Q40) && !defined(MULTI_ISA) 98#if defined(CONFIG_Q40) && !defined(MULTI_ISA)
99#define ISA_TYPE Q40_ISA 99#define ISA_TYPE ISA_TYPE_Q40
100#define ISA_SEX 0 100#define ISA_SEX 0
101#endif 101#endif
102#if defined(CONFIG_AMIGA_PCMCIA) && !defined(MULTI_ISA) 102#if defined(CONFIG_AMIGA_PCMCIA) && !defined(MULTI_ISA)
103#define ISA_TYPE AG_ISA 103#define ISA_TYPE ISA_TYPE_AG
104#define ISA_SEX 1 104#define ISA_SEX 1
105#endif 105#endif
106#if defined(CONFIG_GG2) && !defined(MULTI_ISA) 106#if defined(CONFIG_GG2) && !defined(MULTI_ISA)
107#define ISA_TYPE GG2_ISA 107#define ISA_TYPE ISA_TYPE_GG2
108#define ISA_SEX 0 108#define ISA_SEX 0
109#endif 109#endif
110 110
@@ -126,13 +126,13 @@ static inline u8 __iomem *isa_itb(unsigned long addr)
126 switch(ISA_TYPE) 126 switch(ISA_TYPE)
127 { 127 {
128#ifdef CONFIG_Q40 128#ifdef CONFIG_Q40
129 case Q40_ISA: return (u8 __iomem *)Q40_ISA_IO_B(addr); 129 case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr);
130#endif 130#endif
131#ifdef CONFIG_GG2 131#ifdef CONFIG_GG2
132 case GG2_ISA: return (u8 __iomem *)GG2_ISA_IO_B(addr); 132 case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_IO_B(addr);
133#endif 133#endif
134#ifdef CONFIG_AMIGA_PCMCIA 134#ifdef CONFIG_AMIGA_PCMCIA
135 case AG_ISA: return (u8 __iomem *)AG_ISA_IO_B(addr); 135 case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
136#endif 136#endif
137 default: return NULL; /* avoid warnings, just in case */ 137 default: return NULL; /* avoid warnings, just in case */
138 } 138 }
@@ -142,13 +142,13 @@ static inline u16 __iomem *isa_itw(unsigned long addr)
142 switch(ISA_TYPE) 142 switch(ISA_TYPE)
143 { 143 {
144#ifdef CONFIG_Q40 144#ifdef CONFIG_Q40
145 case Q40_ISA: return (u16 __iomem *)Q40_ISA_IO_W(addr); 145 case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr);
146#endif 146#endif
147#ifdef CONFIG_GG2 147#ifdef CONFIG_GG2
148 case GG2_ISA: return (u16 __iomem *)GG2_ISA_IO_W(addr); 148 case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_IO_W(addr);
149#endif 149#endif
150#ifdef CONFIG_AMIGA_PCMCIA 150#ifdef CONFIG_AMIGA_PCMCIA
151 case AG_ISA: return (u16 __iomem *)AG_ISA_IO_W(addr); 151 case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);
152#endif 152#endif
153 default: return NULL; /* avoid warnings, just in case */ 153 default: return NULL; /* avoid warnings, just in case */
154 } 154 }
@@ -158,7 +158,7 @@ static inline u32 __iomem *isa_itl(unsigned long addr)
158 switch(ISA_TYPE) 158 switch(ISA_TYPE)
159 { 159 {
160#ifdef CONFIG_AMIGA_PCMCIA 160#ifdef CONFIG_AMIGA_PCMCIA
161 case AG_ISA: return (u32 __iomem *)AG_ISA_IO_W(addr); 161 case ISA_TYPE_AG: return (u32 __iomem *)AG_ISA_IO_W(addr);
162#endif 162#endif
163 default: return 0; /* avoid warnings, just in case */ 163 default: return 0; /* avoid warnings, just in case */
164 } 164 }
@@ -168,13 +168,13 @@ static inline u8 __iomem *isa_mtb(unsigned long addr)
168 switch(ISA_TYPE) 168 switch(ISA_TYPE)
169 { 169 {
170#ifdef CONFIG_Q40 170#ifdef CONFIG_Q40
171 case Q40_ISA: return (u8 __iomem *)Q40_ISA_MEM_B(addr); 171 case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr);
172#endif 172#endif
173#ifdef CONFIG_GG2 173#ifdef CONFIG_GG2
174 case GG2_ISA: return (u8 __iomem *)GG2_ISA_MEM_B(addr); 174 case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_MEM_B(addr);
175#endif 175#endif
176#ifdef CONFIG_AMIGA_PCMCIA 176#ifdef CONFIG_AMIGA_PCMCIA
177 case AG_ISA: return (u8 __iomem *)addr; 177 case ISA_TYPE_AG: return (u8 __iomem *)addr;
178#endif 178#endif
179 default: return NULL; /* avoid warnings, just in case */ 179 default: return NULL; /* avoid warnings, just in case */
180 } 180 }
@@ -184,13 +184,13 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
184 switch(ISA_TYPE) 184 switch(ISA_TYPE)
185 { 185 {
186#ifdef CONFIG_Q40 186#ifdef CONFIG_Q40
187 case Q40_ISA: return (u16 __iomem *)Q40_ISA_MEM_W(addr); 187 case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr);
188#endif 188#endif
189#ifdef CONFIG_GG2 189#ifdef CONFIG_GG2
190 case GG2_ISA: return (u16 __iomem *)GG2_ISA_MEM_W(addr); 190 case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_MEM_W(addr);
191#endif 191#endif
192#ifdef CONFIG_AMIGA_PCMCIA 192#ifdef CONFIG_AMIGA_PCMCIA
193 case AG_ISA: return (u16 __iomem *)addr; 193 case ISA_TYPE_AG: return (u16 __iomem *)addr;
194#endif 194#endif
195 default: return NULL; /* avoid warnings, just in case */ 195 default: return NULL; /* avoid warnings, just in case */
196 } 196 }
@@ -218,13 +218,13 @@ static inline void isa_delay(void)
218 switch(ISA_TYPE) 218 switch(ISA_TYPE)
219 { 219 {
220#ifdef CONFIG_Q40 220#ifdef CONFIG_Q40
221 case Q40_ISA: isa_outb(0,0x80); break; 221 case ISA_TYPE_Q40: isa_outb(0,0x80); break;
222#endif 222#endif
223#ifdef CONFIG_GG2 223#ifdef CONFIG_GG2
224 case GG2_ISA: break; 224 case ISA_TYPE_GG2: break;
225#endif 225#endif
226#ifdef CONFIG_AMIGA_PCMCIA 226#ifdef CONFIG_AMIGA_PCMCIA
227 case AG_ISA: break; 227 case ISA_TYPE_AG: break;
228#endif 228#endif
229 default: break; /* avoid warnings */ 229 default: break; /* avoid warnings */
230 } 230 }
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h
index 2a8853cd6554..4dfb3952b375 100644
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
@@ -248,7 +248,7 @@ extern unsigned long m68k_machtype;
248#ifndef __ASSEMBLY__ 248#ifndef __ASSEMBLY__
249extern unsigned long m68k_cputype; 249extern unsigned long m68k_cputype;
250extern unsigned long m68k_fputype; 250extern unsigned long m68k_fputype;
251extern unsigned long m68k_mmutype; /* Not really used yet */ 251extern unsigned long m68k_mmutype;
252#ifdef CONFIG_VME 252#ifdef CONFIG_VME
253extern unsigned long vme_brdtype; 253extern unsigned long vme_brdtype;
254#endif 254#endif
diff --git a/include/asm-m68k/uaccess.h b/include/asm-m68k/uaccess.h
index 5c1264cf0c65..7107f3fbdbb6 100644
--- a/include/asm-m68k/uaccess.h
+++ b/include/asm-m68k/uaccess.h
@@ -14,7 +14,11 @@
14#define VERIFY_WRITE 1 14#define VERIFY_WRITE 1
15 15
16/* We let the MMU do all checking */ 16/* We let the MMU do all checking */
17#define access_ok(type,addr,size) 1 17static inline int access_ok(int type, const void __user *addr,
18 unsigned long size)
19{
20 return 1;
21}
18 22
19/* 23/*
20 * The exception table consists of pairs of addresses: the first is the 24 * The exception table consists of pairs of addresses: the first is the
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-01 05:33:32 -0500