Merge /dists/sid/linux-2.6.

r5536:  luther | 2006-01-21 00:41:44 +0000
Added linux-headers-<major>-all virtual package, to make building of out-of-tree modules easier.

r5595:  maks-guest | 2006-01-25 20:02:49 +0000
take care of latest klibc status

r5596:  maks-guest | 2006-01-25 20:06:50 +0000
too quick ci, corrected ia64 dep drop

r5597:  maks-guest | 2006-01-25 20:11:07 +0000
me goes for a coffee, fixing the fix

r5610:  tbm | 2006-01-28 00:15:28 +0000
Build PPP as a module.

r5611:  tbm | 2006-01-28 01:25:36 +0000
[arm/nslu2] Enable wireless.

r5612:  tbm | 2006-01-28 01:33:39 +0000
[arm/nslu2] Enable most USB modules.

r5613:  tbm | 2006-01-28 01:53:25 +0000
[arm/nslu2] Enable ALSA and USB sound modules.

r5615:  fs | 2006-01-28 13:35:23 +0000
New option for arch/$arch/defines: if setting initrd=no, make-kpkg will be called without --initrd.

r5618:  tbm | 2006-01-28 19:38:52 +0000
[arm/nslu2] Set 4 MB as the size of the initrd in the kernel cmd line.

r5619:  tbm | 2006-01-28 23:04:45 +0000
Add support for big-endian ARM.

r5620:  luther | 2006-01-29 08:45:23 +0000
Fixed apus config so it is more in line with the rest of the configs.
This enables parallel port, so loads of stuff is pulled in.
We should maybe enable parallel port on a higher level, as PReP, IBM CHRP
or Pegasos do have a real parallel port. Not sure if the this will break
apple hardware right now though

r5622:  luther | 2006-01-29 11:25:28 +0000
Adapted apus config files. Disabling scsi drivers for now as they don't build cleanly.
Makes initramfs-tools the default on powerpc, now that i fixed the klibc build :).

r5648:  maks-guest | 2006-01-31 09:59:05 +0000
klibc on sparc is fixed

r5680:  waldi | 2006-02-01 09:50:32 +0000
* debian/changelog: Update.
* debian/arch/powerpc/defines: Fix depends settings, they are not additive.

r5684:  tbm | 2006-02-01 19:26:09 +0000
[arm/footbridge] Set CONFIG_BLK_DEV_RAM_SIZE to 8192.

r5714:  tbm | 2006-02-07 02:19:36 +0000
mention the CVE (CVE-2006-0454)

r5806:  cts | 2006-02-10 11:10:03 +0000
document changes

r5813:  cts | 2006-02-10 15:29:10 +0000
correct VME description

r5815:  nobse | 2006-02-10 20:50:47 +0000
Disabled CONFIG_ALPHA_LEGACY_START_ADDRESS for -alpha-generic and
-alpha-smp flavours, and introduced a new -alpha-legacy flavour for MILO
based machines, which has CONFIG_ALPHA_LEGACY_START_ADDRESS enabled.

r5829:  nobse | 2006-02-12 10:49:29 +0000
Removed commented out alpha part.

r5830:  nobse | 2006-02-12 10:56:38 +0000
Renamed kernel-image-2.6-486 to kernel-image-2.6-386, it's meant for
transition only, and kernel-image-2.6-386 is the package name in sarge.

svn path=/dists/trunk/linux-2.6/; revision=5878

5 files changed, 58 insertions, 2 deletions

diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config
index 11efeaf342b9..e12f895b320a 100644
--- a/debian/arch/alpha/config
+++ b/debian/arch/alpha/config
@@ -1684,7 +1684,6 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_RWLOCK is not set
 # CONFIG_DEBUG_SEMAPHORE is not set
-CONFIG_ALPHA_LEGACY_START_ADDRESS=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=m
 # CONFIG_MTD_OTP is not set
diff --git a/debian/arch/alpha/config.alpha-generic b/debian/arch/alpha/config.alpha-generic
index bb3cc0a8d0fc..c58ee2884a57 100644
--- a/debian/arch/alpha/config.alpha-generic
+++ b/debian/arch/alpha/config.alpha-generic
@@ -50,3 +50,4 @@ CONFIG_I2C_ELEKTOR=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_MATHEMU=m
+# CONFIG_ALPHA_LEGACY_START_ADDRESS is not set
diff --git a/debian/arch/alpha/config.alpha-legacy b/debian/arch/alpha/config.alpha-legacy
new file mode 100644
index 000000000000..f5ac06dbbc6e
--- /dev/null
+++ b/debian/arch/alpha/config.alpha-legacy
@@ -0,0 +1,53 @@
+CONFIG_BROKEN_ON_SMP=y
+# CONFIG_SMP is not set
+CONFIG_MTD_XIP=y
+CONFIG_SBPCD=m
+CONFIG_CM206=m
+CONFIG_CDU31A=m
+CONFIG_DMASCC=m
+CONFIG_IRPORT_SIR=m
+CONFIG_DONGLE_OLD=y
+CONFIG_ESI_DONGLE_OLD=m
+CONFIG_ACTISYS_DONGLE_OLD=m
+CONFIG_TEKRAM_DONGLE_OLD=m
+CONFIG_GIRBIL_DONGLE_OLD=m
+CONFIG_LITELINK_DONGLE_OLD=m
+CONFIG_MCP2120_DONGLE_OLD=m
+CONFIG_OLD_BELKIN_DONGLE_OLD=m
+CONFIG_ACT200L_DONGLE_OLD=m
+CONFIG_MA600_DONGLE_OLD=m
+CONFIG_NI5010=m
+CONFIG_PCMCIA_XIRTULIP=m
+CONFIG_ISDN_DRV_LOOP=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_COMPUTONE=m
+# CONFIG_DIGIEPCA is not set
+CONFIG_ESPSERIAL=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_RISCOM8=m
+# CONFIG_RIO is not set
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_FTAPE=m
+CONFIG_ZFTAPE=m
+CONFIG_ZFT_DFLT_BLK_SZ=10240
+CONFIG_ZFT_COMPRESSOR=m
+CONFIG_FT_NR_BUFFERS=3
+CONFIG_FT_PROC_FS=y
+CONFIG_FT_NORMAL_DEBUG=y
+# CONFIG_FT_FULL_DEBUG is not set
+# CONFIG_FT_NO_TRACE is not set
+# CONFIG_FT_NO_TRACE_AT_ALL is not set
+CONFIG_FT_STD_FDC=y
+# CONFIG_FT_MACH2 is not set
+# CONFIG_FT_PROBE_FC10 is not set
+# CONFIG_FT_ALT_FDC is not set
+CONFIG_FT_FDC_THR=8
+CONFIG_FT_FDC_MAX_RATE=2000
+CONFIG_FT_ALPHA_CLOCK=0
+CONFIG_I2C_ELEKTOR=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_MATHEMU=m
+CONFIG_ALPHA_LEGACY_START_ADDRESS=y
diff --git a/debian/arch/alpha/config.alpha-smp b/debian/arch/alpha/config.alpha-smp
index fc46aade3a49..f9d1751741f4 100644
--- a/debian/arch/alpha/config.alpha-smp
+++ b/debian/arch/alpha/config.alpha-smp
@@ -7,3 +7,4 @@ CONFIG_NR_CPUS=64
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_MATHEMU=y
 # CONFIG_DIGIEPCA is not set
+# CONFIG_ALPHA_LEGACY_START_ADDRESS is not set
diff --git a/debian/arch/alpha/defines b/debian/arch/alpha/defines
index f27526eb0e72..9b3626eae0dc 100644
--- a/debian/arch/alpha/defines
+++ b/debian/arch/alpha/defines
@@ -1,6 +1,6 @@
 [base]
 depends: initramfs-tools | yaird | linux-initramfs-tool
-flavours: alpha-generic alpha-smp
+flavours: alpha-generic alpha-smp alpha-legacy
 suggests: aboot, fdutils
 
 kernel-arch: alpha
@@ -12,3 +12,5 @@ class = Alpha
 [alpha-smp]
 class = Alpha SMP
 
+[alpha-legacy]
+class = Alpha Legacy