[kernel] r11253 - in dists/sid/linux-2.6/debian: . config/m68k patches/bugfix/m68k/2.6.25 patches/series
Christian T. Steigies
cts at alioth.debian.org
Sun May 4 14:16:41 UTC 2008
Author: cts
Date: Sun May 4 14:16:39 2008
New Revision: 11253
Log:
more m68k patches, document changes
Added:
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/SCSI_MAC_ESP-needs-SCSI_SPI_ATTRS.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-82596-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-FB_HP300-depends-on-DIO.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-FB_HP300-does-not-need-FB_CFB_FILLRECT.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-apne-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-hp_sdc-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-mac89x0-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macmace-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-q40ints.c-needs-asm-floppy.h.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-q40kbd-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-sun3lance-breaks-multi-platform.diff
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/config/m68k/config
dists/sid/linux-2.6/debian/config/m68k/config.mac
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/fb-CONFIG_FB_DEFERRED_IO-should-default-to-n.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-convert-access_ok-to-inline-func.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-dnfb-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-initcalls-should-return-ENODEV-if-device-not-found.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-kill-CONFIG_FB_DAFB.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macide-breaks-multi-platform.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-update-defconfig.diff
dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-vmlinux-std_sun3.lds.S_cleanup_use_PAGE_SIZE_macro.diff
dists/sid/linux-2.6/debian/patches/series/2-extra
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Sun May 4 14:16:39 2008
@@ -1,5 +1,6 @@
linux-2.6 (2.6.25-2) UNRELEASED; urgency=low
+ [ maximilian attems ]
* Add stable release 2.6.25.1:
- Fix dnotify/close race (CVE-2008-1375)
- V4L: Fix VIDIOCGAP corruption in ivtv
@@ -41,7 +42,12 @@
- hrtimer: raise softirq unlocked to avoid circular lock dependency
- tcp: tcp_probe buffer overflow and incorrect return value
- -- maximilian attems <maks at debian.org> Fri, 02 May 2008 11:45:33 +0200
+ [ Christian T. Steigies ]
+ * [m68k] Add patches for 2.6.25.
+ * [m68k] Disable EXT4DEV_FS for now.
+ * [m68k] Enable SCSI_MAC_ESP for mac.
+
+ -- Christian T. Steigies <cts at debian.org> Sat, 03 May 2008 14:12:54 +0200
linux-2.6 (2.6.25-1) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/m68k/config (original)
+++ dists/sid/linux-2.6/debian/config/m68k/config Sun May 4 14:16:39 2008
@@ -350,4 +350,6 @@
CONFIG_IP_TCPDIAG=y
# CONFIG_IP_TCPDIAG_IPV6 is not set
CONFIG_OBSOLETE_MODPARM=y
+# disable EXT4 for m68k
+CONFIG_EXT4DEV_FS=n
Modified: dists/sid/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/sid/linux-2.6/debian/config/m68k/config.mac (original)
+++ dists/sid/linux-2.6/debian/config/m68k/config.mac Sun May 4 14:16:39 2008
@@ -120,6 +120,7 @@
## file: drivers/scsi/Kconfig
##
CONFIG_MAC_SCSI=y
+CONFIG_SCSI_MAC_ESP=y
##
## file: drivers/serial/Kconfig
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/SCSI_MAC_ESP-needs-SCSI_SPI_ATTRS.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/SCSI_MAC_ESP-needs-SCSI_SPI_ATTRS.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,23 @@
+Subject: [PATCH] CONFIG_SCSI_MAC_ESP needs CONFIG_SCSI_SPI_ATTRS
+Cc: linux-scsi at vger.kernel.org
+
+From: Geert Uytterhoeven <geert at linux-m68k.org>
+
+The new mac_esp scsi driver needs CONFIG_SCSI_SPI_ATTRS, just like all other
+drivers using the new esp_scsi core.
+
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ drivers/scsi/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/scsi/Kconfig
++++ b/drivers/scsi/Kconfig
+@@ -1678,6 +1678,7 @@ config MAC_SCSI
+ config SCSI_MAC_ESP
+ tristate "Macintosh NCR53c9[46] SCSI"
+ depends on MAC && SCSI
++ select SCSI_SPI_ATTRS
+ help
+ This is the NCR 53c9x SCSI controller found on most of the 68040
+ based Macintoshes.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/fb-CONFIG_FB_DEFERRED_IO-should-default-to-n.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/fb-CONFIG_FB_DEFERRED_IO-should-default-to-n.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/fb-CONFIG_FB_DEFERRED_IO-should-default-to-n.diff Sun May 4 14:16:39 2008
@@ -5,21 +5,19 @@
CONFIG_FB_DEFERRED_IO can not be turned off, while it's already selected
automatically by the drivers that need it.
-Although it's nice to have more compile-coverage, not being able to disable a
-rarely used feature is annoying.
-
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
- drivers/video/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
+ drivers/video/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
-@@ -147,7 +147,6 @@ config FB_SYS_FOPS
+@@ -147,7 +147,7 @@ config FB_SYS_FOPS
config FB_DEFERRED_IO
bool
depends on FB
- default y
++ default n
config FB_SVGALIB
tristate
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-82596-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-82596-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,36 @@
+---
+ drivers/net/82596.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/net/82596.c
++++ b/drivers/net/82596.c
+@@ -1162,6 +1162,7 @@ struct net_device * __init i82596_probe(
+ memcpy(eth_addr, (void *) 0xfffc1f2c, 6); /* YUCK! Get addr from NOVRAM */
+ dev->base_addr = MVME_I596_BASE;
+ dev->irq = (unsigned) MVME16x_IRQ_I596;
++ goto found;
+ }
+ #endif
+ #ifdef ENABLE_BVME6000_NET
+@@ -1176,6 +1177,7 @@ struct net_device * __init i82596_probe(
+ rtc[3] = msr;
+ dev->base_addr = BVME_I596_BASE;
+ dev->irq = (unsigned) BVME_IRQ_I596;
++ goto found;
+ }
+ #endif
+ #ifdef ENABLE_APRICOT
+@@ -1212,8 +1214,13 @@ struct net_device * __init i82596_probe(
+ }
+
+ dev->irq = 10;
++ goto found;
+ }
+ #endif
++ err = -ENODEV;
++ goto out;
++
++found:
+ dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
+ if (!dev->mem_start) {
+ err = -ENOMEM;
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-FB_HP300-depends-on-DIO.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-FB_HP300-depends-on-DIO.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,22 @@
+Subject: [PATCH] m68k: FB_HP300 depends on DIO
+
+From: Geert Uytterhoeven <geert at linux-m68k.org>
+
+FB_HP300 doesn't depend only on HP300, but also on DIO (which depends on HP300)
+
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ drivers/video/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
+@@ -596,7 +596,7 @@ config FB_MAC
+
+ config FB_HP300
+ bool
+- depends on (FB = y) && HP300
++ depends on (FB = y) && DIO
+ select FB_CFB_IMAGEBLIT
+ default y
+
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-FB_HP300-does-not-need-FB_CFB_FILLRECT.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-FB_HP300-does-not-need-FB_CFB_FILLRECT.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,21 @@
+Subject: [PATCH] m68k: FB_HP300 does not need FB_CFB_FILLRECT
+
+From: Geert Uytterhoeven <geert at linux-m68k.org>
+
+FB_HP300 does not need FB_CFB_FILLRECT
+
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ drivers/video/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
+@@ -598,7 +598,6 @@ config FB_MAC
+ config FB_HP300
+ bool
+ depends on (FB = y) && HP300
+- select FB_CFB_FILLRECT
+ select FB_CFB_IMAGEBLIT
+ default y
+
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-apne-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-apne-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,16 @@
+---
+ drivers/net/apne.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/apne.c
++++ b/drivers/net/apne.c
+@@ -127,6 +127,9 @@ struct net_device * __init apne_probe(in
+ #endif
+ int err;
+
++ if (!MACH_IS_AMIGA)
++ return ERR_PTR(-ENODEV);
++
+ if (apne_owned)
+ return ERR_PTR(-ENODEV);
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-convert-access_ok-to-inline-func.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-convert-access_ok-to-inline-func.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-convert-access_ok-to-inline-func.diff Sun May 4 14:16:39 2008
@@ -20,7 +20,7 @@
/* We let the MMU do all checking */
-#define access_ok(type,addr,size) 1
-+static inline int access_ok(int type, const void __user *addr,
++static inline int access_ok(int type, const void __user * addr,
+ unsigned long size)
+{
+ return 1;
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-dnfb-breaks-multi-platform.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-dnfb-breaks-multi-platform.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-dnfb-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -1,5 +1,4 @@
Subject: [PATCH] m68k: dnfb doesn't check for Apollo
-Cc: linux-fbdev-devel at lists.sourceforge.net
From: Geert Uytterhoeven <geert at linux-m68k.org>
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-hp_sdc-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-hp_sdc-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,33 @@
+---
+ drivers/input/misc/hp_sdc_rtc.c | 5 +++++
+ drivers/input/serio/hp_sdc_mlc.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+--- 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)
+ {
+ int ret;
+
++#ifdef __mc68000__
++ if (!MACH_IS_HP300)
++ return -ENODEV;
++#endif
++
+ init_MUTEX(&i8042tregs);
+
+ if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
+--- 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)
+ {
+ hil_mlc *mlc = &hp_sdc_mlc;
+
++#ifdef __mc68000__
++ if (!MACH_IS_HP300)
++ return -ENODEV;
++#endif
++
+ printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
+
+ hp_sdc_mlc_priv.emtestmode = 0;
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-initcalls-should-return-ENODEV-if-device-not-found.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-initcalls-should-return-ENODEV-if-device-not-found.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-initcalls-should-return-ENODEV-if-device-not-found.diff Sun May 4 14:16:39 2008
@@ -1,18 +1,13 @@
-Subject: [PATCH] m68k: Return -ENODEV if no device is found
-
-From: Geert Uytterhoeven <geert at linux-m68k.org>
According to the tests in do_initcalls(), the proper error code in case no
-device is found is -ENODEV, not -ENXIO or -EIO.
+device is found is -ENODEV, not -ENXIO.
-Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
- drivers/block/amiflop.c | 6 +++---
- drivers/block/z2ram.c | 2 +-
- drivers/input/serio/q40kbd.c | 2 +-
- drivers/video/amifb.c | 4 ++--
- drivers/video/hpfb.c | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
+ drivers/block/amiflop.c | 6 +++---
+ drivers/block/z2ram.c | 2 +-
+ drivers/video/amifb.c | 4 ++--
+ drivers/video/hpfb.c | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -49,17 +44,6 @@
ret = -EBUSY;
if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
---- a/drivers/input/serio/q40kbd.c
-+++ b/drivers/input/serio/q40kbd.c
-@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
- int error;
-
- if (!MACH_IS_Q40)
-- return -EIO;
-+ return -ENODEV;
-
- error = platform_driver_register(&q40kbd_driver);
- if (error)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-kill-CONFIG_FB_DAFB.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-kill-CONFIG_FB_DAFB.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-kill-CONFIG_FB_DAFB.diff Sun May 4 14:16:39 2008
@@ -1,5 +1,4 @@
Subject: [PATCH] m68k: Kill CONFIG_FB_DAFB
-Cc: linux-fbdev-devel at lists.sourceforge.net
From: Geert Uytterhoeven <geert at linux-m68k.org>
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-mac89x0-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-mac89x0-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,16 @@
+---
+ drivers/net/mac89x0.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/mac89x0.c
++++ b/drivers/net/mac89x0.c
+@@ -183,6 +183,9 @@ struct net_device * __init mac89x0_probe
+ int err = -ENODEV;
+ DECLARE_MAC_BUF(mac);
+
++ if (!MACH_IS_MAC)
++ return ERR_PTR(-ENODEV);
++
+ dev = alloc_etherdev(sizeof(struct net_local));
+ if (!dev)
+ return ERR_PTR(-ENOMEM);
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macide-breaks-multi-platform.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macide-breaks-multi-platform.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macide-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -1,5 +1,4 @@
Subject: [PATCH] m68k: macide doesn't check for Mac
-Cc: linux-ide at vger.kernel.org
From: Geert Uytterhoeven <geert at linux-m68k.org>
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macmace-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-macmace-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,24 @@
+Subject: [PATCH] m68k: macmace doesn't check for Mac
+
+From: Geert Uytterhoeven <geert at linux-m68k.org>
+
+The Macintosh MACE network driver (macmace) doesn't check whether it's
+actually running on Mac hardware, causing a crash if it isn't.
+
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ drivers/net/macmace.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/macmace.c
++++ b/drivers/net/macmace.c
+@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(v
+ {
+ int err;
+
++ if (!MACH_IS_MAC)
++ return -ENODEV;
++
+ if ((err = platform_driver_register(&mac_mace_driver))) {
+ printk(KERN_ERR "Driver registration failed\n");
+ return err;
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-q40ints.c-needs-asm-floppy.h.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-q40ints.c-needs-asm-floppy.h.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,34 @@
+
+arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
+arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'
+
+FIXME q40_irq_handler() calls floppy_hardint():
+
+arch/m68k/q40/q40ints.c:215: error: too few arguments to function 'floppy_hardint'
+
+---
+ arch/m68k/Kconfig | 2 +-
+ arch/m68k/q40/q40ints.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/m68k/Kconfig
++++ b/arch/m68k/Kconfig
+@@ -44,7 +44,7 @@ config GENERIC_IOMAP
+
+ config ARCH_MAY_HAVE_PC_FDC
+ bool
+- depends on Q40 || (BROKEN && SUN3X)
++ depends on BROKEN && (Q40 || SUN3X)
+ default y
+
+ config NO_IOPORT
+--- a/arch/m68k/q40/q40ints.c
++++ b/arch/m68k/q40/q40ints.c
+@@ -16,6 +16,7 @@
+ #include <linux/errno.h>
+ #include <linux/interrupt.h>
+
++//#include <asm/floppy.h>
+ #include <asm/ptrace.h>
+ #include <asm/system.h>
+ #include <asm/irq.h>
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-q40kbd-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-q40kbd-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,15 @@
+---
+ drivers/input/serio/q40kbd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/input/serio/q40kbd.c
++++ b/drivers/input/serio/q40kbd.c
+@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
+ int error;
+
+ if (!MACH_IS_Q40)
+- return -EIO;
++ return -ENODEV;
+
+ error = platform_driver_register(&q40kbd_driver);
+ if (error)
Added: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-sun3lance-breaks-multi-platform.diff
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-sun3lance-breaks-multi-platform.diff Sun May 4 14:16:39 2008
@@ -0,0 +1,24 @@
+Subject: [PATCH] m68k: sun3lance doesn't check for Sun3/Sun3x
+
+From: Geert Uytterhoeven <geert at linux-m68k.org>
+
+The Sun3 LANCE network driver (sun3lance) doesn't check whether it's
+actually running on Sun3 or Sun3x hardware, causing a crash if it isn't.
+
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ drivers/net/sun3lance.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/sun3lance.c
++++ b/drivers/net/sun3lance.c
+@@ -250,6 +250,9 @@ struct net_device * __init sun3lance_pro
+ static int found;
+ int err = -ENODEV;
+
++ if (!MACH_IS_SUN3 && !MACH_IS_SUN3X)
++ return ERR_PTR(-ENODEV);
++
+ /* check that this machine has an onboard lance */
+ switch(idprom->id_machtype) {
+ case SM_SUN3|SM_3_50:
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-update-defconfig.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-update-defconfig.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-update-defconfig.diff Sun May 4 14:16:39 2008
@@ -1,129 +1,39 @@
-Subject: [PATCH] m68k: Update defconfigs
-
-From: Geert Uytterhoeven <geert at linux-m68k.org>
-
-Update the m68k defconfigs
-
-Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
- arch/m68k/configs/amiga_defconfig | 130 ++++++++++++++++++----------------
- arch/m68k/configs/apollo_defconfig | 112 ++++++++++++++++++-----------
- arch/m68k/configs/atari_defconfig | 115 ++++++++++++++++++------------
- arch/m68k/configs/bvme6000_defconfig | 112 ++++++++++++++++++-----------
- arch/m68k/configs/hp300_defconfig | 114 ++++++++++++++++++------------
- arch/m68k/configs/mac_defconfig | 115 ++++++++++++++++++------------
- arch/m68k/configs/mvme147_defconfig | 112 ++++++++++++++++++-----------
- arch/m68k/configs/mvme16x_defconfig | 112 ++++++++++++++++++-----------
- arch/m68k/configs/q40_defconfig | 131 ++++++++++++++++++-----------------
- arch/m68k/configs/sun3_defconfig | 112 ++++++++++++++++++-----------
- arch/m68k/configs/sun3x_defconfig | 112 ++++++++++++++++++-----------
- 11 files changed, 775 insertions(+), 502 deletions(-)
+ arch/m68k/configs/amiga_defconfig | 5
+ arch/m68k/configs/apollo_defconfig | 4
+ arch/m68k/configs/atari_defconfig | 9
+ arch/m68k/configs/bvme6000_defconfig | 2
+ arch/m68k/configs/hp300_defconfig | 6
+ arch/m68k/configs/mac_defconfig | 4
+ arch/m68k/configs/multi_defconfig | 1247 +++++++++++++++++++++++++++++++++++
+ arch/m68k/configs/mvme147_defconfig | 2
+ arch/m68k/configs/mvme16x_defconfig | 2
+ arch/m68k/configs/q40_defconfig | 6
+ arch/m68k/configs/sun3_defconfig | 4
+ arch/m68k/configs/sun3x_defconfig | 4
+ 12 files changed, 1272 insertions(+), 23 deletions(-)
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:06 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:51:57 2008
++# Fri Apr 4 14:56:25 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -222,8 +222,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -239,6 +241,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -317,6 +320,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -410,8 +415,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -477,27 +480,12 @@ CONFIG_IDE_PROC_FS=y
- #
- # IDE chipset support/bugfixes
- #
--# CONFIG_IDE_GENERIC is not set
- # CONFIG_BLK_DEV_PLATFORM is not set
- CONFIG_BLK_DEV_GAYLE=y
- CONFIG_BLK_DEV_IDEDOUBLER=y
- CONFIG_BLK_DEV_BUDDHA=y
--
--#
--# Other IDE chipsets support
--#
--
--#
--# Note: most of these also require special kernel boot parameters
--#
--# CONFIG_BLK_DEV_4DRIVES is not set
--# CONFIG_BLK_DEV_ALI14XX is not set
--# CONFIG_BLK_DEV_DTC2278 is not set
--# CONFIG_BLK_DEV_HT6560B is not set
--# CONFIG_BLK_DEV_QD65XX is not set
--# CONFIG_BLK_DEV_UMC8672 is not set
- # CONFIG_BLK_DEV_IDEDMA is not set
--# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
- # CONFIG_BLK_DEV_HD is not set
-
- #
-@@ -626,6 +614,7 @@ CONFIG_APNE=m
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- # CONFIG_PLIP is not set
- CONFIG_PPP=m
-@@ -779,6 +768,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -861,17 +851,12 @@ CONFIG_HIDRAW=y
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
- # CONFIG_AUXDISPLAY is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
+@@ -803,7 +803,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
+@@ -871,7 +871,6 @@ CONFIG_HIDRAW=y
# Character devices
#
CONFIG_AMIGA_BUILTIN_SERIAL=y
@@ -131,1702 +41,1411 @@
CONFIG_MULTIFACE_III_TTY=m
# CONFIG_SERIAL_CONSOLE is not set
-@@ -894,16 +879,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -1073,53 +1056,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=m
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=m
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=m
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=m
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=m
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1129,7 +1141,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:07 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:52:44 2008
++# Fri Apr 4 14:56:27 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -220,8 +220,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -237,6 +239,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -315,6 +318,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -408,8 +413,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -539,6 +542,7 @@ CONFIG_APOLLO_ELPLUS=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -665,6 +669,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -738,10 +743,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -769,16 +770,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -948,53 +947,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1004,7 +1032,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
+@@ -689,7 +689,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:09 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:47:46 2008
++# Fri Apr 4 14:56:29 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -218,8 +218,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -235,6 +237,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -313,6 +316,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -406,8 +411,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -469,11 +472,10 @@ CONFIG_IDE_PROC_FS=y
- #
- # IDE chipset support/bugfixes
- #
--# CONFIG_IDE_GENERIC is not set
- # CONFIG_BLK_DEV_PLATFORM is not set
- CONFIG_BLK_DEV_FALCON_IDE=y
- # CONFIG_BLK_DEV_IDEDMA is not set
--# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
- # CONFIG_BLK_DEV_HD is not set
-
- #
-@@ -572,6 +574,7 @@ CONFIG_ATARILANCE=m
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- # CONFIG_PLIP is not set
- CONFIG_PPP=m
-@@ -709,6 +712,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -786,10 +790,6 @@ CONFIG_HIDRAW=y
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
- # CONFIG_AUXDISPLAY is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -821,16 +821,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -999,53 +997,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=m
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=m
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=m
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=m
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=m
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1055,7 +1082,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=y
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
+@@ -113,12 +113,15 @@ CONFIG_CLASSIC_RCU=y
+ # CONFIG_SUN3 is not set
+ # CONFIG_AMIGA is not set
+ CONFIG_ATARI=y
++CONFIG_ATARI_ROM_ISA=y
+ # CONFIG_MAC is not set
+ # CONFIG_APOLLO is not set
+ # CONFIG_VME is not set
+ # CONFIG_HP300 is not set
+ # CONFIG_SUN3X is not set
+ # CONFIG_Q40 is not set
++CONFIG_NATFEAT=y
++CONFIG_NFETH=y
+
+ #
+ # Processor type
+@@ -558,6 +561,8 @@ CONFIG_VETH=m
+ CONFIG_NET_ETHERNET=y
+ CONFIG_MII=m
+ CONFIG_ATARILANCE=m
++CONFIG_ATARI_ETHERNEC=m
++CONFIG_ATARI_ETHERNAT=m
+ # CONFIG_IBM_NEW_EMAC_ZMII is not set
+ # CONFIG_IBM_NEW_EMAC_RGMII is not set
+ # CONFIG_IBM_NEW_EMAC_TAH is not set
+@@ -733,7 +738,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:10 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:53:06 2008
++# Fri Apr 4 14:56:31 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -222,8 +222,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -239,6 +241,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -317,6 +320,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -410,8 +415,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -543,6 +546,7 @@ CONFIG_BVME6000_NET=y
+--- a/arch/m68k/configs/hp300_defconfig
++++ b/arch/m68k/configs/hp300_defconfig
+@@ -1,7 +1,7 @@
#
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -669,6 +673,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
+ # Automatically generated make config: don't edit
+ # Linux kernel version: 2.6.25-rc8
+-# Wed Apr 2 20:46:12 2008
++# Fri Apr 4 14:56:33 2008
#
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
+ CONFIG_M68K=y
+ CONFIG_MMU=y
+@@ -690,7 +690,7 @@ CONFIG_SSB_POSSIBLE=y
+ CONFIG_FB=y
+ # CONFIG_FIRMWARE_EDID is not set
+ # CONFIG_FB_DDC is not set
+-CONFIG_FB_CFB_FILLRECT=y
++# CONFIG_FB_CFB_FILLRECT is not set
+ # CONFIG_FB_CFB_COPYAREA is not set
+ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+@@ -698,7 +698,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
+--- a/arch/m68k/configs/mac_defconfig
++++ b/arch/m68k/configs/mac_defconfig
+@@ -1,7 +1,7 @@
#
- # Multimedia devices
-@@ -708,10 +713,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
+ # Automatically generated make config: don't edit
+ # Linux kernel version: 2.6.25-rc8
+-# Wed Apr 2 20:46:14 2008
++# Fri Apr 4 14:56:35 2008
#
-@@ -739,16 +740,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -919,53 +918,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
+ CONFIG_M68K=y
+ CONFIG_MMU=y
+@@ -732,7 +732,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ CONFIG_FB_MACMODES=y
+ # CONFIG_FB_BACKLIGHT is not set
+--- /dev/null
++++ b/arch/m68k/configs/multi_defconfig
+@@ -0,0 +1,1247 @@
++#
++# Automatically generated make config: don't edit
++# Linux kernel version: 2.6.25-rc8
++# Tue Apr 1 22:50:56 2008
++#
++CONFIG_M68K=y
++CONFIG_MMU=y
++CONFIG_RWSEM_GENERIC_SPINLOCK=y
++# CONFIG_ARCH_HAS_ILOG2_U32 is not set
++# CONFIG_ARCH_HAS_ILOG2_U64 is not set
++CONFIG_GENERIC_HWEIGHT=y
++CONFIG_GENERIC_CALIBRATE_DELAY=y
++CONFIG_TIME_LOW_RES=y
++CONFIG_GENERIC_IOMAP=y
++CONFIG_NO_IOPORT=y
++# CONFIG_NO_DMA is not set
++CONFIG_ARCH_SUPPORTS_AOUT=y
++CONFIG_HZ=100
++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
++
++#
++# General setup
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_BROKEN_ON_SMP=y
++CONFIG_INIT_ENV_ARG_LIMIT=32
++CONFIG_LOCALVERSION="-multi"
++CONFIG_LOCALVERSION_AUTO=y
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_SYSVIPC_SYSCTL=y
++CONFIG_POSIX_MQUEUE=y
++CONFIG_BSD_PROCESS_ACCT=y
++# CONFIG_BSD_PROCESS_ACCT_V3 is not set
++# CONFIG_TASKSTATS is not set
++# CONFIG_AUDIT is not set
++# CONFIG_IKCONFIG is not set
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_CGROUPS is not set
++# CONFIG_GROUP_SCHED is not set
++# CONFIG_SYSFS_DEPRECATED_V2 is not set
++CONFIG_RELAY=y
++CONFIG_NAMESPACES=y
++# CONFIG_UTS_NS is not set
++# CONFIG_IPC_NS is not set
++# CONFIG_USER_NS is not set
++# CONFIG_PID_NS is not set
++CONFIG_BLK_DEV_INITRD=y
++CONFIG_INITRAMFS_SOURCE=""
++# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
++CONFIG_SYSCTL=y
++# CONFIG_EMBEDDED is not set
++CONFIG_UID16=y
++CONFIG_SYSCTL_SYSCALL=y
++CONFIG_KALLSYMS=y
++# CONFIG_KALLSYMS_EXTRA_PASS is not set
++CONFIG_HOTPLUG=y
++CONFIG_PRINTK=y
++CONFIG_BUG=y
++CONFIG_ELF_CORE=y
++# CONFIG_COMPAT_BRK is not set
++CONFIG_BASE_FULL=y
++CONFIG_FUTEX=y
++CONFIG_ANON_INODES=y
++CONFIG_EPOLL=y
++CONFIG_SIGNALFD=y
++CONFIG_TIMERFD=y
++CONFIG_EVENTFD=y
++CONFIG_SHMEM=y
++CONFIG_VM_EVENT_COUNTERS=y
++CONFIG_SLAB=y
++# CONFIG_SLUB is not set
++# CONFIG_SLOB is not set
++# CONFIG_PROFILING is not set
++# CONFIG_MARKERS is not set
++# CONFIG_HAVE_OPROFILE is not set
++# CONFIG_HAVE_KPROBES is not set
++# CONFIG_HAVE_KRETPROBES is not set
++CONFIG_PROC_PAGE_MONITOR=y
++CONFIG_SLABINFO=y
++CONFIG_RT_MUTEXES=y
++# CONFIG_TINY_SHMEM is not set
++CONFIG_BASE_SMALL=0
++CONFIG_MODULES=y
++CONFIG_MODULE_UNLOAD=y
++# CONFIG_MODULE_FORCE_UNLOAD is not set
++# CONFIG_MODVERSIONS is not set
++# CONFIG_MODULE_SRCVERSION_ALL is not set
++CONFIG_KMOD=y
++CONFIG_BLOCK=y
++# CONFIG_LBD is not set
++# CONFIG_BLK_DEV_IO_TRACE is not set
++# CONFIG_LSF is not set
++CONFIG_BLK_DEV_BSG=y
++
++#
++# IO Schedulers
++#
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++CONFIG_IOSCHED_DEADLINE=y
++CONFIG_IOSCHED_CFQ=y
++CONFIG_DEFAULT_AS=y
++# CONFIG_DEFAULT_DEADLINE is not set
++# CONFIG_DEFAULT_CFQ is not set
++# CONFIG_DEFAULT_NOOP is not set
++CONFIG_DEFAULT_IOSCHED="anticipatory"
++CONFIG_CLASSIC_RCU=y
++
++#
++# Platform dependent setup
++#
++# CONFIG_SUN3 is not set
++CONFIG_AMIGA=y
++CONFIG_ATARI=y
++CONFIG_ATARI_ROM_ISA=y
++CONFIG_MAC=y
++CONFIG_NUBUS=y
++CONFIG_M68K_L2_CACHE=y
++CONFIG_APOLLO=y
++CONFIG_VME=y
++CONFIG_MVME147=y
++CONFIG_MVME16x=y
++CONFIG_BVME6000=y
++CONFIG_HP300=y
++CONFIG_DIO=y
++CONFIG_SUN3X=y
++CONFIG_Q40=y
++CONFIG_NATFEAT=y
++CONFIG_NFETH=y
++
++#
++# Processor type
++#
++CONFIG_M68020=y
++CONFIG_M68030=y
++CONFIG_M68040=y
++CONFIG_M68060=y
++CONFIG_MMU_MOTOROLA=y
++# CONFIG_M68KFPU_EMU is not set
++# CONFIG_ADVANCED is not set
++CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
++CONFIG_NODES_SHIFT=3
++CONFIG_SELECT_MEMORY_MODEL=y
++# CONFIG_FLATMEM_MANUAL is not set
++CONFIG_DISCONTIGMEM_MANUAL=y
++# CONFIG_SPARSEMEM_MANUAL is not set
++CONFIG_DISCONTIGMEM=y
++CONFIG_FLAT_NODE_MEM_MAP=y
++CONFIG_NEED_MULTIPLE_NODES=y
++# CONFIG_SPARSEMEM_STATIC is not set
++# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
++CONFIG_SPLIT_PTLOCK_CPUS=4
++# CONFIG_RESOURCES_64BIT is not set
++CONFIG_ZONE_DMA_FLAG=1
++CONFIG_BOUNCE=y
++CONFIG_VIRT_TO_BUS=y
++
++#
++# General setup
++#
++CONFIG_BINFMT_ELF=y
++CONFIG_BINFMT_AOUT=m
++CONFIG_BINFMT_MISC=m
++CONFIG_ZORRO=y
++CONFIG_AMIGA_PCMCIA=y
++CONFIG_STRAM_PROC=y
++CONFIG_HEARTBEAT=y
++CONFIG_PROC_HARDWARE=y
++CONFIG_ISA=y
++CONFIG_GENERIC_ISA_DMA=y
++CONFIG_ZONE_DMA=y
++# CONFIG_ARCH_SUPPORTS_MSI is not set
++CONFIG_ZORRO_NAMES=y
++
++#
++# Networking
++#
++CONFIG_NET=y
++
++#
++# Networking options
++#
++CONFIG_PACKET=y
++# CONFIG_PACKET_MMAP is not set
++CONFIG_UNIX=y
++CONFIG_XFRM=y
++# CONFIG_XFRM_USER is not set
++# CONFIG_XFRM_SUB_POLICY is not set
++CONFIG_XFRM_MIGRATE=y
++# CONFIG_XFRM_STATISTICS is not set
++CONFIG_NET_KEY=y
++CONFIG_NET_KEY_MIGRATE=y
++CONFIG_INET=y
++# CONFIG_IP_MULTICAST is not set
++# CONFIG_IP_ADVANCED_ROUTER is not set
++CONFIG_IP_FIB_HASH=y
++CONFIG_IP_PNP=y
++CONFIG_IP_PNP_DHCP=y
++CONFIG_IP_PNP_BOOTP=y
++CONFIG_IP_PNP_RARP=y
++CONFIG_NET_IPIP=m
++CONFIG_NET_IPGRE=m
++# CONFIG_ARPD is not set
++CONFIG_SYN_COOKIES=y
++CONFIG_INET_AH=m
++CONFIG_INET_ESP=m
++CONFIG_INET_IPCOMP=m
++CONFIG_INET_XFRM_TUNNEL=m
++CONFIG_INET_TUNNEL=m
++CONFIG_INET_XFRM_MODE_TRANSPORT=m
++CONFIG_INET_XFRM_MODE_TUNNEL=m
++CONFIG_INET_XFRM_MODE_BEET=m
++CONFIG_INET_LRO=m
++CONFIG_INET_DIAG=m
++CONFIG_INET_TCP_DIAG=m
++# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_TCP_CONG_CUBIC=y
++CONFIG_DEFAULT_TCP_CONG="cubic"
++# CONFIG_TCP_MD5SIG is not set
++# CONFIG_IP_VS is not set
++CONFIG_IPV6=m
++CONFIG_IPV6_PRIVACY=y
++CONFIG_IPV6_ROUTER_PREF=y
++CONFIG_IPV6_ROUTE_INFO=y
++# CONFIG_IPV6_OPTIMISTIC_DAD is not set
++CONFIG_INET6_AH=m
++CONFIG_INET6_ESP=m
++CONFIG_INET6_IPCOMP=m
++# CONFIG_IPV6_MIP6 is not set
++CONFIG_INET6_XFRM_TUNNEL=m
++CONFIG_INET6_TUNNEL=m
++CONFIG_INET6_XFRM_MODE_TRANSPORT=m
++CONFIG_INET6_XFRM_MODE_TUNNEL=m
++CONFIG_INET6_XFRM_MODE_BEET=m
++CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
++CONFIG_IPV6_SIT=m
++CONFIG_IPV6_TUNNEL=m
++# CONFIG_IPV6_MULTIPLE_TABLES is not set
++# CONFIG_NETWORK_SECMARK is not set
++CONFIG_NETFILTER=y
++# CONFIG_NETFILTER_DEBUG is not set
++CONFIG_NETFILTER_ADVANCED=y
++
++#
++# Core Netfilter Configuration
++#
++CONFIG_NETFILTER_NETLINK=m
++CONFIG_NETFILTER_NETLINK_QUEUE=m
++CONFIG_NETFILTER_NETLINK_LOG=m
++CONFIG_NF_CONNTRACK=m
++CONFIG_NF_CT_ACCT=y
++CONFIG_NF_CONNTRACK_MARK=y
++# CONFIG_NF_CONNTRACK_EVENTS is not set
++CONFIG_NF_CT_PROTO_GRE=m
++CONFIG_NF_CT_PROTO_SCTP=m
++CONFIG_NF_CT_PROTO_UDPLITE=m
++CONFIG_NF_CONNTRACK_AMANDA=m
++CONFIG_NF_CONNTRACK_FTP=m
++CONFIG_NF_CONNTRACK_H323=m
++CONFIG_NF_CONNTRACK_IRC=m
++CONFIG_NF_CONNTRACK_NETBIOS_NS=m
++CONFIG_NF_CONNTRACK_PPTP=m
++CONFIG_NF_CONNTRACK_SANE=m
++CONFIG_NF_CONNTRACK_SIP=m
++CONFIG_NF_CONNTRACK_TFTP=m
++# CONFIG_NF_CT_NETLINK is not set
++CONFIG_NETFILTER_XTABLES=m
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
++CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
++CONFIG_NETFILTER_XT_TARGET_DSCP=m
++CONFIG_NETFILTER_XT_TARGET_MARK=m
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
++CONFIG_NETFILTER_XT_TARGET_NFLOG=m
++CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
++CONFIG_NETFILTER_XT_TARGET_RATEEST=m
++CONFIG_NETFILTER_XT_TARGET_TRACE=m
++CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
++CONFIG_NETFILTER_XT_MATCH_COMMENT=m
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
++CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
++CONFIG_NETFILTER_XT_MATCH_DCCP=m
++CONFIG_NETFILTER_XT_MATCH_DSCP=m
++CONFIG_NETFILTER_XT_MATCH_ESP=m
++CONFIG_NETFILTER_XT_MATCH_HELPER=m
++CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
++CONFIG_NETFILTER_XT_MATCH_LENGTH=m
++CONFIG_NETFILTER_XT_MATCH_LIMIT=m
++CONFIG_NETFILTER_XT_MATCH_MAC=m
++CONFIG_NETFILTER_XT_MATCH_MARK=m
++CONFIG_NETFILTER_XT_MATCH_OWNER=m
++CONFIG_NETFILTER_XT_MATCH_POLICY=m
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA=m
++CONFIG_NETFILTER_XT_MATCH_RATEEST=m
++CONFIG_NETFILTER_XT_MATCH_REALM=m
++CONFIG_NETFILTER_XT_MATCH_SCTP=m
++CONFIG_NETFILTER_XT_MATCH_STATE=m
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
++CONFIG_NETFILTER_XT_MATCH_STRING=m
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
++CONFIG_NETFILTER_XT_MATCH_TIME=m
++CONFIG_NETFILTER_XT_MATCH_U32=m
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
++
++#
++# IP: Netfilter Configuration
++#
++CONFIG_NF_CONNTRACK_IPV4=m
++CONFIG_NF_CONNTRACK_PROC_COMPAT=y
++CONFIG_IP_NF_QUEUE=m
++CONFIG_IP_NF_IPTABLES=m
++CONFIG_IP_NF_MATCH_RECENT=m
++CONFIG_IP_NF_MATCH_ECN=m
++CONFIG_IP_NF_MATCH_AH=m
++CONFIG_IP_NF_MATCH_TTL=m
++CONFIG_IP_NF_MATCH_ADDRTYPE=m
++CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_TARGET_REJECT=m
++CONFIG_IP_NF_TARGET_LOG=m
++CONFIG_IP_NF_TARGET_ULOG=m
++CONFIG_NF_NAT=m
++CONFIG_NF_NAT_NEEDED=y
++CONFIG_IP_NF_TARGET_MASQUERADE=m
++CONFIG_IP_NF_TARGET_REDIRECT=m
++CONFIG_IP_NF_TARGET_NETMAP=m
++CONFIG_NF_NAT_SNMP_BASIC=m
++CONFIG_NF_NAT_PROTO_GRE=m
++CONFIG_NF_NAT_FTP=m
++CONFIG_NF_NAT_IRC=m
++CONFIG_NF_NAT_TFTP=m
++CONFIG_NF_NAT_AMANDA=m
++CONFIG_NF_NAT_PPTP=m
++CONFIG_NF_NAT_H323=m
++CONFIG_NF_NAT_SIP=m
++CONFIG_IP_NF_MANGLE=m
++CONFIG_IP_NF_TARGET_ECN=m
++CONFIG_IP_NF_TARGET_TTL=m
++CONFIG_IP_NF_TARGET_CLUSTERIP=m
++CONFIG_IP_NF_RAW=m
++CONFIG_IP_NF_ARPTABLES=m
++CONFIG_IP_NF_ARPFILTER=m
++CONFIG_IP_NF_ARP_MANGLE=m
++
++#
++# IPv6: Netfilter Configuration
++#
++CONFIG_NF_CONNTRACK_IPV6=m
++CONFIG_IP6_NF_QUEUE=m
++CONFIG_IP6_NF_IPTABLES=m
++CONFIG_IP6_NF_MATCH_RT=m
++CONFIG_IP6_NF_MATCH_OPTS=m
++CONFIG_IP6_NF_MATCH_FRAG=m
++CONFIG_IP6_NF_MATCH_HL=m
++CONFIG_IP6_NF_MATCH_IPV6HEADER=m
++CONFIG_IP6_NF_MATCH_AH=m
++CONFIG_IP6_NF_MATCH_MH=m
++CONFIG_IP6_NF_MATCH_EUI64=m
++CONFIG_IP6_NF_FILTER=m
++CONFIG_IP6_NF_TARGET_LOG=m
++CONFIG_IP6_NF_TARGET_REJECT=m
++CONFIG_IP6_NF_MANGLE=m
++CONFIG_IP6_NF_TARGET_HL=m
++CONFIG_IP6_NF_RAW=m
++CONFIG_IP_DCCP=m
++CONFIG_INET_DCCP_DIAG=m
++CONFIG_IP_DCCP_ACKVEC=y
++
++#
++# DCCP CCIDs Configuration (EXPERIMENTAL)
++#
++CONFIG_IP_DCCP_CCID2=m
++# CONFIG_IP_DCCP_CCID2_DEBUG is not set
++CONFIG_IP_DCCP_CCID3=m
++# CONFIG_IP_DCCP_CCID3_DEBUG is not set
++CONFIG_IP_DCCP_CCID3_RTO=100
++CONFIG_IP_DCCP_TFRC_LIB=m
++CONFIG_IP_SCTP=m
++# CONFIG_SCTP_DBG_MSG is not set
++# CONFIG_SCTP_DBG_OBJCNT is not set
++# CONFIG_SCTP_HMAC_NONE is not set
++# CONFIG_SCTP_HMAC_SHA1 is not set
++CONFIG_SCTP_HMAC_MD5=y
++# CONFIG_TIPC is not set
++# CONFIG_ATM is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_VLAN_8021Q is not set
++# CONFIG_DECNET is not set
++CONFIG_LLC=m
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++CONFIG_ATALK=m
++CONFIG_DEV_APPLETALK=m
++# CONFIG_COPS is not set
++CONFIG_IPDDP=m
++CONFIG_IPDDP_ENCAP=y
++CONFIG_IPDDP_DECAP=y
++# CONFIG_X25 is not set
++# CONFIG_LAPB is not set
++# CONFIG_ECONET is not set
++# CONFIG_WAN_ROUTER is not set
++# CONFIG_NET_SCHED is not set
++CONFIG_NET_CLS_ROUTE=y
++
++#
++# Network testing
++#
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_CAN is not set
++# CONFIG_IRDA is not set
++# CONFIG_BT is not set
++# CONFIG_AF_RXRPC is not set
++
++#
++# Wireless
++#
++# CONFIG_CFG80211 is not set
++CONFIG_WIRELESS_EXT=y
++# CONFIG_MAC80211 is not set
++CONFIG_IEEE80211=m
++# CONFIG_IEEE80211_DEBUG is not set
++CONFIG_IEEE80211_CRYPT_WEP=m
++CONFIG_IEEE80211_CRYPT_CCMP=m
++CONFIG_IEEE80211_CRYPT_TKIP=m
++CONFIG_IEEE80211_SOFTMAC=m
++# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
++# CONFIG_RFKILL is not set
++# CONFIG_NET_9P is not set
++
++#
++# Device Drivers
++#
++
++#
++# Generic Driver Options
++#
++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
++CONFIG_STANDALONE=y
++CONFIG_PREVENT_FIRMWARE_BUILD=y
++CONFIG_FW_LOADER=m
++# CONFIG_SYS_HYPERVISOR is not set
++CONFIG_CONNECTOR=m
++# CONFIG_MTD is not set
++CONFIG_PARPORT=m
++# CONFIG_PARPORT_PC is not set
++CONFIG_PARPORT_AMIGA=m
++CONFIG_PARPORT_MFC3=m
++CONFIG_PARPORT_ATARI=m
++# CONFIG_PARPORT_GSC is not set
++# CONFIG_PARPORT_AX88796 is not set
++CONFIG_PARPORT_1284=y
++CONFIG_PARPORT_NOT_PC=y
++# CONFIG_PNP is not set
++CONFIG_BLK_DEV=y
++CONFIG_AMIGA_FLOPPY=y
++CONFIG_ATARI_FLOPPY=y
++CONFIG_AMIGA_Z2RAM=y
++# CONFIG_BLK_DEV_COW_COMMON is not set
++CONFIG_BLK_DEV_LOOP=y
++CONFIG_BLK_DEV_CRYPTOLOOP=m
++CONFIG_BLK_DEV_NBD=m
++CONFIG_BLK_DEV_RAM=y
++CONFIG_BLK_DEV_RAM_COUNT=16
++CONFIG_BLK_DEV_RAM_SIZE=4096
++# CONFIG_BLK_DEV_XIP is not set
++CONFIG_CDROM_PKTCDVD=m
++CONFIG_CDROM_PKTCDVD_BUFFERS=8
++# CONFIG_CDROM_PKTCDVD_WCACHE is not set
++CONFIG_ATA_OVER_ETH=m
++CONFIG_MISC_DEVICES=y
++# CONFIG_EEPROM_93CX6 is not set
++# CONFIG_ENCLOSURE_SERVICES is not set
++CONFIG_HAVE_IDE=y
++CONFIG_IDE=y
++CONFIG_BLK_DEV_IDE=y
++
++#
++# Please see Documentation/ide/ide.txt for help/info on IDE drives
++#
++# CONFIG_BLK_DEV_IDE_SATA is not set
++CONFIG_BLK_DEV_IDEDISK=y
++# CONFIG_IDEDISK_MULTI_MODE is not set
++CONFIG_BLK_DEV_IDECD=y
++CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
++# CONFIG_BLK_DEV_IDETAPE is not set
++CONFIG_BLK_DEV_IDEFLOPPY=m
++# CONFIG_BLK_DEV_IDESCSI is not set
++# CONFIG_IDE_TASK_IOCTL is not set
++CONFIG_IDE_PROC_FS=y
++
++#
++# IDE chipset support/bugfixes
++#
++# CONFIG_IDE_GENERIC is not set
++# CONFIG_BLK_DEV_PLATFORM is not set
++CONFIG_BLK_DEV_GAYLE=y
++CONFIG_BLK_DEV_IDEDOUBLER=y
++CONFIG_BLK_DEV_BUDDHA=y
++CONFIG_BLK_DEV_FALCON_IDE=y
++CONFIG_BLK_DEV_MAC_IDE=y
++CONFIG_BLK_DEV_Q40IDE=y
++
++#
++# Other IDE chipsets support
++#
++
++#
++# Note: most of these also require special kernel boot parameters
++#
++# CONFIG_BLK_DEV_4DRIVES is not set
++# CONFIG_BLK_DEV_ALI14XX is not set
++# CONFIG_BLK_DEV_DTC2278 is not set
++# CONFIG_BLK_DEV_HT6560B is not set
++# CONFIG_BLK_DEV_QD65XX is not set
++# CONFIG_BLK_DEV_UMC8672 is not set
++# CONFIG_BLK_DEV_IDEDMA is not set
++# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
++# CONFIG_BLK_DEV_HD is not set
++
++#
++# SCSI device support
++#
++CONFIG_RAID_ATTRS=m
++CONFIG_SCSI=y
++CONFIG_SCSI_DMA=y
++CONFIG_SCSI_TGT=m
++# CONFIG_SCSI_NETLINK is not set
++CONFIG_SCSI_PROC_FS=y
++
++#
++# SCSI support type (disk, tape, CD-ROM)
++#
++CONFIG_BLK_DEV_SD=y
++CONFIG_CHR_DEV_ST=m
++CONFIG_CHR_DEV_OSST=m
++CONFIG_BLK_DEV_SR=y
++CONFIG_BLK_DEV_SR_VENDOR=y
++CONFIG_CHR_DEV_SG=m
++# CONFIG_CHR_DEV_SCH is not set
++
++#
++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
++#
++# CONFIG_SCSI_MULTI_LUN is not set
++CONFIG_SCSI_CONSTANTS=y
++# CONFIG_SCSI_LOGGING is not set
++# CONFIG_SCSI_SCAN_ASYNC is not set
++CONFIG_SCSI_WAIT_SCAN=m
++
++#
++# SCSI Transports
++#
++CONFIG_SCSI_SPI_ATTRS=y
++# CONFIG_SCSI_FC_ATTRS is not set
++CONFIG_SCSI_ISCSI_ATTRS=m
++CONFIG_SCSI_SAS_ATTRS=m
++CONFIG_SCSI_SAS_LIBSAS=m
++CONFIG_SCSI_SAS_HOST_SMP=y
++# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
++CONFIG_SCSI_SRP_ATTRS=m
++CONFIG_SCSI_SRP_TGT_ATTRS=y
++CONFIG_SCSI_LOWLEVEL=y
++CONFIG_ISCSI_TCP=m
++# CONFIG_SCSI_AHA152X is not set
++# CONFIG_SCSI_AIC7XXX_OLD is not set
++# CONFIG_SCSI_ADVANSYS is not set
++# CONFIG_SCSI_IN2000 is not set
++# CONFIG_SCSI_DTC3280 is not set
++# CONFIG_SCSI_FUTURE_DOMAIN is not set
++# CONFIG_SCSI_GENERIC_NCR5380 is not set
++# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
++# CONFIG_SCSI_NCR53C406A is not set
++CONFIG_53C700_BE_BUS=y
++# CONFIG_SCSI_PAS16 is not set
++# CONFIG_SCSI_QLOGIC_FAS is not set
++# CONFIG_SCSI_SYM53C416 is not set
++# CONFIG_SCSI_T128 is not set
++# CONFIG_SCSI_DEBUG is not set
++CONFIG_A3000_SCSI=y
++CONFIG_A2091_SCSI=y
++CONFIG_GVP11_SCSI=y
++CONFIG_SCSI_A4000T=y
++CONFIG_SCSI_ZORRO7XX=y
++CONFIG_ATARI_SCSI=y
++# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
++# CONFIG_ATARI_SCSI_RESET_BOOT is not set
++CONFIG_MAC_SCSI=y
++CONFIG_MVME147_SCSI=y
++CONFIG_MVME16x_SCSI=y
++CONFIG_BVME6000_SCSI=y
++CONFIG_SUN3X_ESP=y
++CONFIG_MD=y
++CONFIG_BLK_DEV_MD=m
++CONFIG_MD_LINEAR=m
++CONFIG_MD_RAID0=m
++CONFIG_MD_RAID1=m
++# CONFIG_MD_RAID10 is not set
++CONFIG_MD_RAID456=m
++CONFIG_MD_RAID5_RESHAPE=y
++CONFIG_MD_MULTIPATH=m
++# CONFIG_MD_FAULTY is not set
++CONFIG_BLK_DEV_DM=m
++# CONFIG_DM_DEBUG is not set
++CONFIG_DM_CRYPT=m
++CONFIG_DM_SNAPSHOT=m
++CONFIG_DM_MIRROR=m
++CONFIG_DM_ZERO=m
++CONFIG_DM_MULTIPATH=m
++CONFIG_DM_MULTIPATH_EMC=m
++CONFIG_DM_MULTIPATH_RDAC=m
++CONFIG_DM_MULTIPATH_HP=m
++# CONFIG_DM_DELAY is not set
++CONFIG_DM_UEVENT=y
++CONFIG_MACINTOSH_DRIVERS=y
++CONFIG_ADB=y
++CONFIG_ADB_MACII=y
++CONFIG_ADB_MACIISI=y
++CONFIG_ADB_IOP=y
++CONFIG_ADB_PMU68K=y
++CONFIG_ADB_CUDA=y
++CONFIG_INPUT_ADBHID=y
++CONFIG_MAC_EMUMOUSEBTN=y
++CONFIG_NETDEVICES=y
++# CONFIG_NETDEVICES_MULTIQUEUE is not set
++CONFIG_DUMMY=m
++# CONFIG_BONDING is not set
++CONFIG_MACVLAN=m
++CONFIG_EQUALIZER=m
++# CONFIG_TUN is not set
++CONFIG_VETH=m
++# CONFIG_ARCNET is not set
++# CONFIG_PHYLIB is not set
++CONFIG_NET_ETHERNET=y
++CONFIG_MII=m
++CONFIG_ARIADNE=m
++CONFIG_A2065=m
++CONFIG_HYDRA=m
++CONFIG_ZORRO8390=m
++CONFIG_APNE=m
++CONFIG_APOLLO_ELPLUS=y
++CONFIG_MAC8390=y
++CONFIG_MAC89x0=m
++CONFIG_MACSONIC=m
++CONFIG_MACMACE=y
++CONFIG_MVME147_NET=y
++CONFIG_MVME16x_NET=y
++CONFIG_BVME6000_NET=y
++CONFIG_ATARILANCE=m
++CONFIG_ATARI_ETHERNEC=m
++CONFIG_ATARI_ETHERNAT=m
++CONFIG_SUN3LANCE=y
++CONFIG_HPLANCE=y
++# CONFIG_NET_VENDOR_3COM is not set
++# CONFIG_NET_VENDOR_SMC is not set
++# CONFIG_NET_VENDOR_RACAL is not set
++# CONFIG_AT1700 is not set
++# CONFIG_DEPCA is not set
++# CONFIG_HP100 is not set
++# CONFIG_NET_ISA is not set
++CONFIG_NE2000=m
++# CONFIG_IBM_NEW_EMAC_ZMII is not set
++# CONFIG_IBM_NEW_EMAC_RGMII is not set
++# CONFIG_IBM_NEW_EMAC_TAH is not set
++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
++# CONFIG_NET_PCI is not set
++# CONFIG_B44 is not set
++# CONFIG_NET_POCKET is not set
++# CONFIG_NETDEV_1000 is not set
++# CONFIG_NETDEV_10000 is not set
++# CONFIG_TR is not set
++
++#
++# Wireless LAN
++#
++# CONFIG_WLAN_PRE80211 is not set
++# CONFIG_WLAN_80211 is not set
++# CONFIG_WAN is not set
++# CONFIG_PLIP is not set
++CONFIG_PPP=m
++# CONFIG_PPP_MULTILINK is not set
++CONFIG_PPP_FILTER=y
++CONFIG_PPP_ASYNC=m
++CONFIG_PPP_SYNC_TTY=m
++CONFIG_PPP_DEFLATE=m
++CONFIG_PPP_BSDCOMP=m
++CONFIG_PPP_MPPE=m
++CONFIG_PPPOE=m
++CONFIG_PPPOL2TP=m
++CONFIG_SLIP=m
++CONFIG_SLIP_COMPRESSED=y
++CONFIG_SLHC=m
++CONFIG_SLIP_SMART=y
++CONFIG_SLIP_MODE_SLIP6=y
++CONFIG_NETCONSOLE=m
++CONFIG_NETCONSOLE_DYNAMIC=y
++CONFIG_NETPOLL=y
++# CONFIG_NETPOLL_TRAP is not set
++CONFIG_NET_POLL_CONTROLLER=y
++# CONFIG_ISDN is not set
++# CONFIG_PHONE is not set
++
++#
++# Input device support
++#
++CONFIG_INPUT=y
++CONFIG_INPUT_FF_MEMLESS=m
++# CONFIG_INPUT_POLLDEV is not set
++
++#
++# Userland interfaces
++#
++CONFIG_INPUT_MOUSEDEV=y
++CONFIG_INPUT_MOUSEDEV_PSAUX=y
++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_INPUT_JOYDEV is not set
++# CONFIG_INPUT_EVDEV is not set
++# CONFIG_INPUT_EVBUG is not set
++
++#
++# Input Device Drivers
++#
++CONFIG_INPUT_KEYBOARD=y
++# CONFIG_KEYBOARD_ATKBD is not set
++CONFIG_KEYBOARD_SUNKBD=y
++# CONFIG_KEYBOARD_LKKBD is not set
++# CONFIG_KEYBOARD_XTKBD is not set
++# CONFIG_KEYBOARD_NEWTON is not set
++# CONFIG_KEYBOARD_STOWAWAY is not set
++CONFIG_KEYBOARD_AMIGA=y
++CONFIG_ATARI_KBD_CORE=y
++CONFIG_KEYBOARD_ATARI=y
++CONFIG_KEYBOARD_HIL_OLD=y
++CONFIG_KEYBOARD_HIL=y
++CONFIG_INPUT_MOUSE=y
++CONFIG_MOUSE_PS2=y
++CONFIG_MOUSE_PS2_ALPS=y
++CONFIG_MOUSE_PS2_LOGIPS2PP=y
++CONFIG_MOUSE_PS2_SYNAPTICS=y
++CONFIG_MOUSE_PS2_LIFEBOOK=y
++CONFIG_MOUSE_PS2_TRACKPOINT=y
++# CONFIG_MOUSE_PS2_TOUCHKIT is not set
++CONFIG_MOUSE_SERIAL=m
++# CONFIG_MOUSE_INPORT is not set
++# CONFIG_MOUSE_LOGIBM is not set
++# CONFIG_MOUSE_PC110PAD is not set
++CONFIG_MOUSE_AMIGA=m
++CONFIG_MOUSE_ATARI=m
++# CONFIG_MOUSE_VSXXXAA is not set
++CONFIG_MOUSE_HIL=m
++CONFIG_INPUT_JOYSTICK=y
++# CONFIG_JOYSTICK_ANALOG is not set
++# CONFIG_JOYSTICK_A3D is not set
++# CONFIG_JOYSTICK_ADI is not set
++# CONFIG_JOYSTICK_COBRA is not set
++# CONFIG_JOYSTICK_GF2K is not set
++# CONFIG_JOYSTICK_GRIP is not set
++# CONFIG_JOYSTICK_GRIP_MP is not set
++# CONFIG_JOYSTICK_GUILLEMOT is not set
++# CONFIG_JOYSTICK_INTERACT is not set
++# CONFIG_JOYSTICK_SIDEWINDER is not set
++# CONFIG_JOYSTICK_TMDC is not set
++# CONFIG_JOYSTICK_IFORCE is not set
++# CONFIG_JOYSTICK_WARRIOR is not set
++# CONFIG_JOYSTICK_MAGELLAN is not set
++# CONFIG_JOYSTICK_SPACEORB is not set
++# CONFIG_JOYSTICK_SPACEBALL is not set
++# CONFIG_JOYSTICK_STINGER is not set
++# CONFIG_JOYSTICK_TWIDJOY is not set
++# CONFIG_JOYSTICK_DB9 is not set
++# CONFIG_JOYSTICK_GAMECON is not set
++# CONFIG_JOYSTICK_TURBOGRAFX is not set
++CONFIG_JOYSTICK_AMIGA=m
++# CONFIG_JOYSTICK_JOYDUMP is not set
++# CONFIG_INPUT_TABLET is not set
++# CONFIG_INPUT_TOUCHSCREEN is not set
++CONFIG_INPUT_MISC=y
++CONFIG_INPUT_M68K_BEEP=m
++# CONFIG_INPUT_UINPUT is not set
++CONFIG_HP_SDC_RTC=m
++
++#
++# Hardware I/O ports
++#
++CONFIG_SERIO=y
++# CONFIG_SERIO_SERPORT is not set
++CONFIG_SERIO_Q40KBD=m
++# CONFIG_SERIO_PARKBD is not set
++CONFIG_HP_SDC=y
++CONFIG_HIL_MLC=y
++CONFIG_SERIO_LIBPS2=y
++# CONFIG_SERIO_RAW is not set
++# CONFIG_GAMEPORT is not set
++
++#
++# Character devices
++#
++CONFIG_VT=y
++CONFIG_VT_CONSOLE=y
++CONFIG_HW_CONSOLE=y
++CONFIG_VT_HW_CONSOLE_BINDING=y
++# CONFIG_SERIAL_NONSTANDARD is not set
++CONFIG_A2232=m
++
++#
++# Serial drivers
++#
++# CONFIG_SERIAL_8250 is not set
++
++#
++# Non-8250 serial port support
++#
++CONFIG_UNIX98_PTYS=y
++CONFIG_LEGACY_PTYS=y
++CONFIG_LEGACY_PTY_COUNT=256
++CONFIG_PRINTER=m
++# CONFIG_LP_CONSOLE is not set
++# CONFIG_PPDEV is not set
++# CONFIG_IPMI_HANDLER is not set
++# CONFIG_HW_RANDOM is not set
++CONFIG_NVRAM=y
++CONFIG_GEN_RTC=m
++CONFIG_GEN_RTC_X=y
++# CONFIG_DTLK is not set
++# CONFIG_R3964 is not set
++# CONFIG_RAW_DRIVER is not set
++# CONFIG_TCG_TPM is not set
++# CONFIG_I2C is not set
++
++#
++# SPI support
++#
++# CONFIG_SPI is not set
++# CONFIG_SPI_MASTER is not set
++# CONFIG_W1 is not set
++# CONFIG_POWER_SUPPLY is not set
++# CONFIG_HWMON is not set
++# CONFIG_THERMAL is not set
++# CONFIG_WATCHDOG is not set
++
++#
++# Sonics Silicon Backplane
++#
++CONFIG_SSB_POSSIBLE=y
++# CONFIG_SSB is not set
++
++#
++# Multifunction device drivers
++#
++# CONFIG_MFD_SM501 is not set
++
++#
++# Multimedia devices
++#
++# CONFIG_VIDEO_DEV is not set
++# CONFIG_DVB_CORE is not set
++# CONFIG_DAB is not set
++
++#
++# Graphics support
++#
++# CONFIG_VGASTATE is not set
++# CONFIG_VIDEO_OUTPUT_CONTROL is not set
++CONFIG_FB=y
++# CONFIG_FIRMWARE_EDID is not set
++# CONFIG_FB_DDC is not set
++CONFIG_FB_CFB_FILLRECT=y
++CONFIG_FB_CFB_COPYAREA=y
++CONFIG_FB_CFB_IMAGEBLIT=y
++# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
++# CONFIG_FB_SYS_FILLRECT is not set
++# CONFIG_FB_SYS_COPYAREA is not set
++# CONFIG_FB_SYS_IMAGEBLIT is not set
++# CONFIG_FB_SYS_FOPS is not set
++# CONFIG_FB_DEFERRED_IO is not set
++# CONFIG_FB_SVGALIB is not set
++CONFIG_FB_MACMODES=y
++# CONFIG_FB_BACKLIGHT is not set
++# CONFIG_FB_MODE_HELPERS is not set
++# CONFIG_FB_TILEBLITTING is not set
++
++#
++# Frame buffer hardware drivers
++#
++CONFIG_FB_CIRRUS=y
++CONFIG_FB_APOLLO=y
++CONFIG_FB_Q40=y
++CONFIG_FB_AMIGA=y
++CONFIG_FB_AMIGA_OCS=y
++CONFIG_FB_AMIGA_ECS=y
++CONFIG_FB_AMIGA_AGA=y
++CONFIG_FB_FM2=y
++CONFIG_FB_ATARI=y
++CONFIG_FB_VALKYRIE=y
++CONFIG_FB_MAC=y
++CONFIG_FB_HP300=y
++# CONFIG_FB_UVESA is not set
++# CONFIG_FB_S1D13XXX is not set
++# CONFIG_FB_ATY is not set
++# CONFIG_FB_VIRTUAL is not set
++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
++
++#
++# Display device support
++#
++# CONFIG_DISPLAY_SUPPORT is not set
++
++#
++# Console display driver support
++#
++CONFIG_DUMMY_CONSOLE=y
++CONFIG_FRAMEBUFFER_CONSOLE=y
++# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
++# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
++# CONFIG_FONTS is not set
++CONFIG_FONT_8x8=y
++CONFIG_FONT_8x16=y
++CONFIG_FONT_6x11=y
++CONFIG_FONT_PEARL_8x8=y
++CONFIG_LOGO=y
++CONFIG_LOGO_LINUX_MONO=y
++CONFIG_LOGO_LINUX_VGA16=y
++CONFIG_LOGO_LINUX_CLUT224=y
++CONFIG_LOGO_MAC_CLUT224=y
++
++#
++# Sound
++#
++CONFIG_SOUND=m
++CONFIG_DMASOUND_ATARI=m
++CONFIG_DMASOUND_PAULA=m
++CONFIG_DMASOUND_Q40=m
++CONFIG_DMASOUND=m
++CONFIG_HID_SUPPORT=y
++CONFIG_HID=m
++# CONFIG_HID_DEBUG is not set
++CONFIG_HIDRAW=y
++# CONFIG_USB_SUPPORT is not set
++# CONFIG_MMC is not set
++# CONFIG_MEMSTICK is not set
++# CONFIG_NEW_LEDS is not set
++# CONFIG_RTC_CLASS is not set
++# CONFIG_AUXDISPLAY is not set
++
++#
++# Userspace I/O
++#
++# CONFIG_UIO is not set
++
++#
++# Character devices
++#
++CONFIG_ATARI_MFPSER=m
++CONFIG_ATARI_SCC=y
++CONFIG_ATARI_SCC_DMA=y
++CONFIG_ATARI_MIDI=m
++CONFIG_ATARI_DSP56K=m
++CONFIG_AMIGA_BUILTIN_SERIAL=y
++CONFIG_MULTIFACE_III_TTY=m
++CONFIG_MAC_SCC=y
++CONFIG_MAC_HID=y
++CONFIG_MVME147_SCC=y
++CONFIG_SERIAL167=y
++CONFIG_MVME162_SCC=y
++CONFIG_BVME6000_SCC=y
++CONFIG_DN_SERIAL=y
++CONFIG_SERIAL_CONSOLE=y
++
++#
++# File systems
++#
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XIP is not set
++CONFIG_EXT3_FS=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT4DEV_FS is not set
++CONFIG_JBD=y
++CONFIG_REISERFS_FS=m
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_REISERFS_FS_XATTR is not set
++CONFIG_JFS_FS=m
++# CONFIG_JFS_POSIX_ACL is not set
++# CONFIG_JFS_SECURITY is not set
++# CONFIG_JFS_DEBUG is not set
++# CONFIG_JFS_STATISTICS is not set
++CONFIG_FS_POSIX_ACL=y
++CONFIG_XFS_FS=m
++# CONFIG_XFS_QUOTA is not set
++# CONFIG_XFS_SECURITY is not set
++# CONFIG_XFS_POSIX_ACL is not set
++# CONFIG_XFS_RT is not set
++CONFIG_GFS2_FS=m
++CONFIG_GFS2_FS_LOCKING_NOLOCK=m
++CONFIG_GFS2_FS_LOCKING_DLM=m
++CONFIG_OCFS2_FS=m
++# CONFIG_OCFS2_DEBUG_MASKLOG is not set
++# CONFIG_OCFS2_DEBUG_FS is not set
++CONFIG_DNOTIFY=y
++CONFIG_INOTIFY=y
++CONFIG_INOTIFY_USER=y
++CONFIG_QUOTA=y
++CONFIG_QUOTA_NETLINK_INTERFACE=y
++# CONFIG_PRINT_QUOTA_WARNING is not set
++# CONFIG_QFMT_V1 is not set
++# CONFIG_QFMT_V2 is not set
++CONFIG_QUOTACTL=y
++CONFIG_AUTOFS_FS=m
++CONFIG_AUTOFS4_FS=m
++CONFIG_FUSE_FS=m
++
++#
++# CD-ROM/DVD Filesystems
++#
++CONFIG_ISO9660_FS=y
++CONFIG_JOLIET=y
++CONFIG_ZISOFS=y
++CONFIG_UDF_FS=m
++CONFIG_UDF_NLS=y
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=m
++CONFIG_FAT_DEFAULT_CODEPAGE=437
++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_PROC_KCORE=y
++CONFIG_PROC_SYSCTL=y
++CONFIG_SYSFS=y
++CONFIG_TMPFS=y
++# CONFIG_TMPFS_POSIX_ACL is not set
++# CONFIG_HUGETLB_PAGE is not set
++CONFIG_CONFIGFS_FS=m
++
++#
++# Miscellaneous filesystems
++#
++# CONFIG_ADFS_FS is not set
++CONFIG_AFFS_FS=m
++CONFIG_HFS_FS=y
++CONFIG_HFSPLUS_FS=y
++# CONFIG_BEFS_FS is not set
++# CONFIG_BFS_FS is not set
++# CONFIG_EFS_FS is not set
++CONFIG_CRAMFS=m
++# CONFIG_VXFS_FS is not set
++CONFIG_MINIX_FS=y
++CONFIG_HPFS_FS=m
++# CONFIG_QNX4FS_FS is not set
++# CONFIG_ROMFS_FS is not set
++CONFIG_SYSV_FS=m
++CONFIG_UFS_FS=m
++# CONFIG_UFS_FS_WRITE is not set
++# CONFIG_UFS_DEBUG is not set
++CONFIG_NETWORK_FILESYSTEMS=y
++CONFIG_NFS_FS=y
++CONFIG_NFS_V3=y
++# CONFIG_NFS_V3_ACL is not set
++CONFIG_NFS_V4=y
++# CONFIG_NFS_DIRECTIO is not set
++CONFIG_NFSD=m
++CONFIG_NFSD_V3=y
++# CONFIG_NFSD_V3_ACL is not set
++# CONFIG_NFSD_V4 is not set
++CONFIG_NFSD_TCP=y
++CONFIG_ROOT_NFS=y
++CONFIG_LOCKD=y
++CONFIG_LOCKD_V4=y
++CONFIG_EXPORTFS=m
++CONFIG_NFS_COMMON=y
++CONFIG_SUNRPC=y
++CONFIG_SUNRPC_GSS=y
++CONFIG_SUNRPC_BIND34=y
++CONFIG_RPCSEC_GSS_KRB5=y
++# CONFIG_RPCSEC_GSS_SPKM3 is not set
++CONFIG_SMB_FS=m
++CONFIG_SMB_NLS_DEFAULT=y
++CONFIG_SMB_NLS_REMOTE="cp437"
++# CONFIG_CIFS is not set
++# CONFIG_NCP_FS is not set
++CONFIG_CODA_FS=m
++# CONFIG_CODA_FS_OLD_API is not set
++# CONFIG_AFS_FS is not set
++
++#
++# Partition Types
++#
++# CONFIG_PARTITION_ADVANCED is not set
++CONFIG_AMIGA_PARTITION=y
++CONFIG_ATARI_PARTITION=y
++CONFIG_MAC_PARTITION=y
++CONFIG_MSDOS_PARTITION=y
++CONFIG_SUN_PARTITION=y
++CONFIG_SYSV68_PARTITION=y
++CONFIG_NLS=y
++CONFIG_NLS_DEFAULT="iso8859-1"
++CONFIG_NLS_CODEPAGE_437=y
++CONFIG_NLS_CODEPAGE_737=m
++CONFIG_NLS_CODEPAGE_775=m
++CONFIG_NLS_CODEPAGE_850=m
++CONFIG_NLS_CODEPAGE_852=m
++CONFIG_NLS_CODEPAGE_855=m
++CONFIG_NLS_CODEPAGE_857=m
++CONFIG_NLS_CODEPAGE_860=m
++CONFIG_NLS_CODEPAGE_861=m
++CONFIG_NLS_CODEPAGE_862=m
++CONFIG_NLS_CODEPAGE_863=m
++CONFIG_NLS_CODEPAGE_864=m
++CONFIG_NLS_CODEPAGE_865=m
++CONFIG_NLS_CODEPAGE_866=m
++CONFIG_NLS_CODEPAGE_869=m
++CONFIG_NLS_CODEPAGE_936=m
++CONFIG_NLS_CODEPAGE_950=m
++CONFIG_NLS_CODEPAGE_932=m
++CONFIG_NLS_CODEPAGE_949=m
++CONFIG_NLS_CODEPAGE_874=m
++CONFIG_NLS_ISO8859_8=m
++CONFIG_NLS_CODEPAGE_1250=m
++CONFIG_NLS_CODEPAGE_1251=m
++CONFIG_NLS_ASCII=m
++CONFIG_NLS_ISO8859_1=y
++CONFIG_NLS_ISO8859_2=m
++CONFIG_NLS_ISO8859_3=m
++CONFIG_NLS_ISO8859_4=m
++CONFIG_NLS_ISO8859_5=m
++CONFIG_NLS_ISO8859_6=m
++CONFIG_NLS_ISO8859_7=m
++CONFIG_NLS_ISO8859_9=m
++CONFIG_NLS_ISO8859_13=m
++CONFIG_NLS_ISO8859_14=m
++CONFIG_NLS_ISO8859_15=m
++CONFIG_NLS_KOI8_R=m
++CONFIG_NLS_KOI8_U=m
++CONFIG_NLS_UTF8=y
++CONFIG_DLM=m
++# CONFIG_DLM_DEBUG is not set
++
++#
++# Kernel hacking
++#
++# CONFIG_PRINTK_TIME is not set
++CONFIG_ENABLE_WARN_DEPRECATED=y
++CONFIG_ENABLE_MUST_CHECK=y
++CONFIG_MAGIC_SYSRQ=y
++# CONFIG_UNUSED_SYMBOLS is not set
++# CONFIG_DEBUG_FS is not set
++# CONFIG_HEADERS_CHECK is not set
++# CONFIG_DEBUG_KERNEL is not set
++CONFIG_DEBUG_BUGVERBOSE=y
++# CONFIG_SAMPLES is not set
++
++#
++# Security options
++#
++# CONFIG_KEYS is not set
++# CONFIG_SECURITY is not set
++# CONFIG_SECURITY_FILE_CAPABILITIES is not set
++CONFIG_XOR_BLOCKS=m
++CONFIG_ASYNC_CORE=m
++CONFIG_ASYNC_MEMCPY=m
++CONFIG_ASYNC_XOR=m
++CONFIG_CRYPTO=y
++CONFIG_CRYPTO_ALGAPI=y
++CONFIG_CRYPTO_AEAD=m
++CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
++CONFIG_CRYPTO_HASH=y
++CONFIG_CRYPTO_MANAGER=y
++CONFIG_CRYPTO_HMAC=y
++CONFIG_CRYPTO_XCBC=m
++CONFIG_CRYPTO_NULL=m
++CONFIG_CRYPTO_MD4=m
++CONFIG_CRYPTO_MD5=y
++CONFIG_CRYPTO_SHA1=m
++CONFIG_CRYPTO_SHA256=m
++CONFIG_CRYPTO_SHA512=m
++CONFIG_CRYPTO_WP512=m
++CONFIG_CRYPTO_TGR192=m
++CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
++CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
++CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
++CONFIG_CRYPTO_CTR=m
++CONFIG_CRYPTO_GCM=m
++CONFIG_CRYPTO_CCM=m
++CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
++CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
++CONFIG_CRYPTO_SERPENT=m
++CONFIG_CRYPTO_AES=m
++CONFIG_CRYPTO_CAST5=m
++CONFIG_CRYPTO_CAST6=m
++CONFIG_CRYPTO_TEA=m
++CONFIG_CRYPTO_ARC4=m
++CONFIG_CRYPTO_KHAZAD=m
++CONFIG_CRYPTO_ANUBIS=m
++CONFIG_CRYPTO_SEED=m
++CONFIG_CRYPTO_SALSA20=m
++CONFIG_CRYPTO_DEFLATE=m
++CONFIG_CRYPTO_MICHAEL_MIC=m
++CONFIG_CRYPTO_CRC32C=m
++CONFIG_CRYPTO_CAMELLIA=m
++CONFIG_CRYPTO_TEST=m
++CONFIG_CRYPTO_AUTHENC=m
++CONFIG_CRYPTO_LZO=m
++# CONFIG_CRYPTO_HW is not set
+
+#
-+# Compression
++# Library routines
+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -975,7 +1003,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=m
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=m
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
---- a/arch/m68k/configs/hp300_defconfig
-+++ b/arch/m68k/configs/hp300_defconfig
++CONFIG_BITREVERSE=y
++CONFIG_CRC_CCITT=m
++CONFIG_CRC16=y
++# CONFIG_CRC_ITU_T is not set
++CONFIG_CRC32=y
++# CONFIG_CRC7 is not set
++CONFIG_LIBCRC32C=m
++CONFIG_ZLIB_INFLATE=y
++CONFIG_ZLIB_DEFLATE=m
++CONFIG_LZO_COMPRESS=m
++CONFIG_LZO_DECOMPRESS=m
++CONFIG_TEXTSEARCH=y
++CONFIG_TEXTSEARCH_KMP=m
++CONFIG_TEXTSEARCH_BM=m
++CONFIG_TEXTSEARCH_FSM=m
++CONFIG_PLIST=y
++CONFIG_HAS_IOMEM=y
++CONFIG_HAS_DMA=y
+--- a/arch/m68k/configs/mvme147_defconfig
++++ b/arch/m68k/configs/mvme147_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
--# Wed Apr 2 20:46:12 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:53:36 2008
+ # Linux kernel version: 2.6.25-rc8
+-# Wed Apr 2 20:46:17 2008
++# Fri Apr 4 14:56:38 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -221,8 +221,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -238,6 +240,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -316,6 +319,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -409,8 +414,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -540,6 +543,7 @@ CONFIG_HPLANCE=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -674,6 +678,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -690,7 +695,7 @@ CONFIG_SSB_POSSIBLE=y
- CONFIG_FB=y
- # CONFIG_FIRMWARE_EDID is not set
- # CONFIG_FB_DDC is not set
--CONFIG_FB_CFB_FILLRECT=y
-+# CONFIG_FB_CFB_FILLRECT is not set
- # CONFIG_FB_CFB_COPYAREA is not set
- CONFIG_FB_CFB_IMAGEBLIT=y
- # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-@@ -747,10 +752,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -776,16 +777,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -955,53 +954,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1011,7 +1039,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
---- a/arch/m68k/configs/mac_defconfig
-+++ b/arch/m68k/configs/mac_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
--# Wed Apr 2 20:46:14 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:54:06 2008
- #
- CONFIG_M68K=y
- CONFIG_MMU=y
-@@ -219,8 +219,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -236,6 +238,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -314,6 +317,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -410,8 +415,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -467,11 +470,10 @@ CONFIG_IDE_PROC_FS=y
- #
- # IDE chipset support/bugfixes
- #
--# CONFIG_IDE_GENERIC is not set
- # CONFIG_BLK_DEV_PLATFORM is not set
- CONFIG_BLK_DEV_MAC_IDE=y
- # CONFIG_BLK_DEV_IDEDMA is not set
--# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
- # CONFIG_BLK_DEV_HD is not set
-
- #
-@@ -580,6 +582,7 @@ CONFIG_MACMACE=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -708,6 +711,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -784,10 +788,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -816,16 +816,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -995,53 +993,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=m
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=m
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=m
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=m
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=m
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1051,7 +1078,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
---- a/arch/m68k/configs/mvme147_defconfig
-+++ b/arch/m68k/configs/mvme147_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
--# Wed Apr 2 20:46:17 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:54:29 2008
- #
- CONFIG_M68K=y
- CONFIG_MMU=y
-@@ -222,8 +222,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -239,6 +241,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -317,6 +320,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -410,8 +415,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -542,6 +545,7 @@ CONFIG_MVME147_NET=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -668,6 +672,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -707,10 +712,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -738,16 +739,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -918,53 +917,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -974,7 +1002,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:19 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:54:50 2008
++# Fri Apr 4 14:56:40 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -222,8 +222,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -239,6 +241,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -317,6 +320,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -410,8 +415,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -543,6 +546,7 @@ CONFIG_MVME16x_NET=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -669,6 +673,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -708,10 +713,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -740,16 +741,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -920,53 +919,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -976,7 +1004,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:20 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:55:49 2008
++# Fri Apr 4 14:56:42 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
@@ -1838,44 +1457,7 @@
CONFIG_NO_IOPORT=y
# CONFIG_NO_DMA is not set
CONFIG_ARCH_SUPPORTS_AOUT=y
-@@ -220,8 +219,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -237,6 +238,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -315,6 +317,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -408,8 +412,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -430,7 +432,6 @@ CONFIG_CONNECTOR=m
+@@ -430,7 +429,6 @@ CONFIG_CONNECTOR=m
# CONFIG_PARPORT is not set
# CONFIG_PNP is not set
CONFIG_BLK_DEV=y
@@ -1883,629 +1465,52 @@
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_CRYPTOLOOP=m
-@@ -467,25 +468,10 @@ CONFIG_IDE_PROC_FS=y
- #
- # IDE chipset support/bugfixes
- #
--# CONFIG_IDE_GENERIC is not set
- # CONFIG_BLK_DEV_PLATFORM is not set
- CONFIG_BLK_DEV_Q40IDE=y
--
--#
--# Other IDE chipsets support
--#
--
--#
--# Note: most of these also require special kernel boot parameters
--#
--# CONFIG_BLK_DEV_4DRIVES is not set
--# CONFIG_BLK_DEV_ALI14XX is not set
--# CONFIG_BLK_DEV_DTC2278 is not set
--# CONFIG_BLK_DEV_HT6560B is not set
--# CONFIG_BLK_DEV_QD65XX is not set
--# CONFIG_BLK_DEV_UMC8672 is not set
- # CONFIG_BLK_DEV_IDEDMA is not set
--# CONFIG_IDE_ARCH_OBSOLETE_INIT is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
- # CONFIG_BLK_DEV_HD is not set
-
- #
-@@ -603,6 +589,7 @@ CONFIG_NE2000=m
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -736,6 +723,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -811,10 +799,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -840,16 +824,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -1018,53 +1000,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1074,7 +1085,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
+@@ -760,7 +758,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:22 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:56:22 2008
++# Fri Apr 4 14:56:44 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -208,8 +208,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -225,6 +227,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -303,6 +306,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -396,8 +401,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -529,6 +532,7 @@ CONFIG_SUN3_82586=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -655,6 +659,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -727,10 +732,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -756,16 +757,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -936,53 +935,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -992,7 +1020,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
+@@ -679,7 +679,7 @@ CONFIG_FB=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc8
+ # Linux kernel version: 2.6.25-rc8
-# Wed Apr 2 20:46:23 2008
-+# Linux kernel version: 2.6.25
-+# Wed Apr 23 22:56:41 2008
++# Fri Apr 4 14:56:46 2008
#
CONFIG_M68K=y
CONFIG_MMU=y
-@@ -219,8 +219,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -236,6 +238,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- # CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- CONFIG_NF_CT_PROTO_UDPLITE=m
-@@ -314,6 +317,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_UDPLITE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -407,8 +412,6 @@ CONFIG_IEEE80211=m
- CONFIG_IEEE80211_CRYPT_WEP=m
- CONFIG_IEEE80211_CRYPT_CCMP=m
- CONFIG_IEEE80211_CRYPT_TKIP=m
--CONFIG_IEEE80211_SOFTMAC=m
--# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
- # CONFIG_RFKILL is not set
- # CONFIG_NET_9P is not set
-
-@@ -539,6 +542,7 @@ CONFIG_SUN3LANCE=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_WAN is not set
- CONFIG_PPP=m
- # CONFIG_PPP_MULTILINK is not set
-@@ -665,6 +669,7 @@ CONFIG_SSB_POSSIBLE=y
- # Multifunction device drivers
- #
- # CONFIG_MFD_SM501 is not set
-+# CONFIG_HTC_PASIC3 is not set
-
- #
- # Multimedia devices
-@@ -737,10 +742,6 @@ CONFIG_HIDRAW=y
- # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
- # CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
- # CONFIG_UIO is not set
-
- #
-@@ -766,16 +767,14 @@ CONFIG_JFS_FS=m
- # CONFIG_JFS_SECURITY is not set
- # CONFIG_JFS_DEBUG is not set
- # CONFIG_JFS_STATISTICS is not set
--CONFIG_FS_POSIX_ACL=y
-+# CONFIG_FS_POSIX_ACL is not set
- CONFIG_XFS_FS=m
- # CONFIG_XFS_QUOTA is not set
--# CONFIG_XFS_SECURITY is not set
- # CONFIG_XFS_POSIX_ACL is not set
- # CONFIG_XFS_RT is not set
--CONFIG_GFS2_FS=m
--CONFIG_GFS2_FS_LOCKING_NOLOCK=m
--CONFIG_GFS2_FS_LOCKING_DLM=m
- CONFIG_OCFS2_FS=m
-+# CONFIG_OCFS2_FS_O2CB is not set
-+# CONFIG_OCFS2_FS_USERSPACE_CLUSTER is not set
- # CONFIG_OCFS2_DEBUG_MASKLOG is not set
- # CONFIG_OCFS2_DEBUG_FS is not set
- CONFIG_DNOTIFY=y
-@@ -946,53 +945,82 @@ CONFIG_ASYNC_CORE=m
- CONFIG_ASYNC_MEMCPY=m
- CONFIG_ASYNC_XOR=m
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_SEQIV=m
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+CONFIG_CRYPTO_CCM=m
-+CONFIG_CRYPTO_GCM=m
-+CONFIG_CRYPTO_SEQIV=m
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=m
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_XTS=m
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--CONFIG_CRYPTO_XTS=m
--CONFIG_CRYPTO_CTR=m
--CONFIG_CRYPTO_GCM=m
--CONFIG_CRYPTO_CCM=m
--CONFIG_CRYPTO_CRYPTD=m
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_SEED=m
- CONFIG_CRYPTO_SALSA20=m
-+CONFIG_CRYPTO_SEED=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- CONFIG_CRYPTO_LZO=m
- # CONFIG_CRYPTO_HW is not set
-
-@@ -1002,7 +1030,7 @@ CONFIG_CRYPTO_LZO=m
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=m
- CONFIG_CRC32=y
- # CONFIG_CRC7 is not set
- CONFIG_LIBCRC32C=m
+@@ -689,7 +689,7 @@ CONFIG_FB=y
+ # CONFIG_FB_SYS_COPYAREA is not set
+ # CONFIG_FB_SYS_IMAGEBLIT is not set
+ # CONFIG_FB_SYS_FOPS is not set
+-CONFIG_FB_DEFERRED_IO=y
++# CONFIG_FB_DEFERRED_IO is not set
+ # CONFIG_FB_SVGALIB is not set
+ # CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_BACKLIGHT is not set
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-vmlinux-std_sun3.lds.S_cleanup_use_PAGE_SIZE_macro.diff
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-vmlinux-std_sun3.lds.S_cleanup_use_PAGE_SIZE_macro.diff (original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/2.6.25/m68k-vmlinux-std_sun3.lds.S_cleanup_use_PAGE_SIZE_macro.diff Sun May 4 14:16:39 2008
@@ -1,4 +1,4 @@
-Subject: m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro
+Subject: [RFC 03/10] m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro
From: Cyrill Gorcunov <gorcunov at gmail.com>
@@ -6,7 +6,6 @@
allow us to use PAGE_SIZE macro instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
-Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
WARNING: COMPLETELY UNTESTED !!!
Modified: dists/sid/linux-2.6/debian/patches/series/2-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2-extra (original)
+++ dists/sid/linux-2.6/debian/patches/series/2-extra Sun May 4 14:16:39 2008
@@ -1,31 +1,17 @@
-# --- integrated in 2.6.26-rc1 ---
-# fails to apply + bugfix/m68k/2.6.25/HTC_PASIC3-depends-on-ARCH_PXA.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-new-mac_esp-driver.diff arch=m68k
-+ bugfix/m68k/2.6.25/proc-convert-proc-bus-nubus-to-seq_file-interface.diff arch=m68k
-+ bugfix/m68k/2.6.25/proc-switch-proc-bus-zorro-devices-to-seq_file-interface.diff arch=m68k
-
# --- submitted for 2.6.26 ---
+ bugfix/m68k/2.6.25/m68k-convert-access_ok-to-inline-func.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-kill-CONFIG_FB_DAFB.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-correct-FB_HP300-dependencies.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-FB_HP300-does-not-need-FB_CFB_FILLRECT.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-whippet-serial-no-longer-exists.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-vme_scc-globals.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-silence-BUG-can-return-warnings.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-hp300-breaks-multi-platform.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-macide-breaks-multi-platform.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-dnfb-breaks-multi-platform.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-net-drivers-break-multiplatform.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-input-drivers-break-multiplatform.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-initcalls-should-return-ENODEV-if-device-not-found.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-q40-floppy-is-broken.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-update-defconfig.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-add-multi_defconfig.diff arch=m68k
# --- pending ---
+ bugfix/m68k/2.6.25/m68k-initrd-fix.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-replace-linux-68k-by-linux-m68k.diff arch=m68k
+ bugfix/m68k/2.6.25/633-atari_scc.diff arch=m68k
+
+ bugfix/m68k/2.6.25/130-adbraw.diff arch=m68k
+# never submit 133-arch!
+ bugfix/m68k/2.6.25/134-atari-fat.diff arch=m68k
+ bugfix/m68k/2.6.25/141-ide.diff arch=m68k
+ bugfix/m68k/2.6.25/143-ioext.diff arch=m68k
@@ -36,8 +22,10 @@
+ bugfix/m68k/2.6.25/atari-ethernec.diff arch=m68k
+ bugfix/m68k/2.6.25/atari-aranym.diff arch=m68k
+ bugfix/m68k/2.6.25/atari-ethernat.diff arch=m68k
+
+ bugfix/m68k/2.6.25/falconide_intr_lock-ratelimit.diff arch=m68k
+ bugfix/m68k/2.6.25/zorro-module-device-table.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-q40ints.c-needs-asm-floppy.h.diff arch=m68k
+ bugfix/m68k/2.6.25/blinux-list-is-subscribers-only.diff arch=m68k
+ bugfix/m68k/2.6.25/b43-depends-on-HAS_DMA.diff arch=m68k
+ bugfix/m68k/2.6.25/amiga-debug=mem.diff arch=m68k
@@ -45,7 +33,9 @@
+ bugfix/m68k/2.6.25/amiga-platform-device.diff arch=m68k
+ bugfix/m68k/2.6.25/atari-platform-device.diff arch=m68k
+ bugfix/m68k/2.6.25/mac-platform-device.diff arch=m68k
+
+ bugfix/m68k/2.6.25/amiga-platform-device2.diff arch=m68k
+
+ bugfix/m68k/2.6.25/ext4-bitops-fix.diff arch=m68k
+ bugfix/m68k/2.6.25/net-b44-no-pci.diff arch=m68k
+ bugfix/m68k/2.6.25/amifb-add-ami_modedb-to-modelist.diff arch=m68k
@@ -55,16 +45,30 @@
+ bugfix/m68k/2.6.25/m68k-allnoconfig.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-noswap-linux-swap-h-needs-linux-pagemap-h.diff arch=m68k
+ bugfix/m68k/2.6.25/fb-CONFIG_FB_DEFERRED_IO-should-default-to-n.diff arch=m68k
+
++ bugfix/m68k/2.6.25/m68k-update-defconfig.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-isa-type-name-conflicts.diff arch=m68k
-+ bugfix/m68k/2.6.25/ext4-adilger-bounces.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-ethernec-dynamic.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-kill-CONFIG_FB_DAFB.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-FB_HP300-depends-on-DIO.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-hp300-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-dnfb-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-sun3lance-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-macmace-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-macide-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-initcalls-should-return-ENODEV-if-device-not-found.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-mac89x0-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-apne-breaks-multi-platform.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-ethernat-breaks-multi-platform.diff arch=m68k
-+ bugfix/m68k/2.6.25/atari-ethernat-updates.diff arch=m68k
-# fails to apply + bugfix/m68k/2.6.25/m68k-remove-traditional.diff arch=m68k
-+ bugfix/m68k/2.6.25/drivers-input-serio-hp_sdc.c-needs-linux-semaphore.h.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-update-defconfig-latest.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-82596-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-ethernec-dynamic.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-q40kbd-breaks-multi-platform.diff arch=m68k
++ bugfix/m68k/2.6.25/ext4-adilger-bounces.diff arch=m68k
++ bugfix/m68k/2.6.25/proc-switch-proc-bus-zorro-devices-to-seq_file-interface.diff arch=m68k
++ bugfix/m68k/2.6.25/proc-convert-proc-bus-nubus-to-seq_file-interface.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-hp_sdc-breaks-multi-platform.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-handle-68040-bus-faults.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-skip-writebacks-for-bus-errors.diff arch=m68k
++ bugfix/m68k/2.6.25/m68k-new-mac_esp-driver.diff arch=m68k
+ bugfix/m68k/2.6.25/m68k-remove-old-mac_esp-cruft.diff arch=m68k
-+ bugfix/m68k/2.6.25/serial167-switch-to-int-put_char-method-update.diff arch=m68k
-+ bugfix/m68k/2.6.25/m68k-export-m68k_mmutype.diff arch=m68k
++ bugfix/m68k/2.6.25/SCSI_MAC_ESP-needs-SCSI_SPI_ATTRS.diff arch=m68k
+
+
More information about the Kernel-svn-changes
mailing list