Revert r9182-9184. Unchecked changes.
svn path=/dists/trunk/linux-2.6/; revision=9185
This commit is contained in:
parent
f68951297a
commit
faafbb77f3
|
@ -3,7 +3,7 @@ flavours: alpha-generic alpha-smp alpha-legacy
|
|||
kernel-arch: alpha
|
||||
kernel-header-dirs: alpha
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
suggests: aboot, fdutils
|
||||
|
|
|
@ -4,7 +4,7 @@ flavours:
|
|||
kernel-arch: x86_64
|
||||
kernel-header-dirs: x86_64 i386
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
# xen
|
||||
# xen-vserver
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ flavours:
|
|||
kernel-arch: i386
|
||||
kernel-header-dirs: i386 x86_64
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
# xen
|
||||
# xen-vserver
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ flavours:
|
|||
kernel-arch: ia64
|
||||
kernel-header-dirs: ia64
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
suggests: elilo, fdutils
|
||||
|
|
|
@ -10,7 +10,7 @@ kernel-header-dirs: powerpc ppc m68k
|
|||
kernel-arch: powerpc
|
||||
kpkg-subarch: ppc
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
type: plain
|
||||
|
|
|
@ -6,7 +6,7 @@ flavours:
|
|||
kernel-arch: s390
|
||||
kernel-header-dirs: s390
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
|
||||
|
|
|
@ -5,7 +5,7 @@ flavours:
|
|||
sparc64-smp
|
||||
kernel-header-dirs: sparc sparc64
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
suggests: silo, fdutils
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
linux-2.6 (2.6.23~rc1-1~experimental.1) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.22-trunk.1) UNRELEASED; urgency=low
|
||||
|
||||
[ Bastian Blank ]
|
||||
*
|
||||
|
||||
-- maximilian attems <maks@debian.org> Mon, 23 Jul 2007 15:33:15 +0200
|
||||
-- Bastian Blank <waldi@debian.org> Tue, 17 Jul 2007 11:42:51 +0200
|
||||
|
||||
linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
|
||||
|
||||
|
|
|
@ -24,16 +24,16 @@ index e6499db..c16974c 100644
|
|||
+updateoldconfig: $(obj)/conf
|
||||
+ $< -U arch/$(ARCH)/Kconfig
|
||||
+
|
||||
# Create new linux.po file
|
||||
# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
|
||||
# The symlink is used to repair a deficiency in arch/um
|
||||
update-po-config: $(obj)/kxgettext
|
||||
xgettext --default-domain=linux \
|
||||
--add-comments --keyword=_ --keyword=N_ \
|
||||
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
|
||||
index 4dcb886..b5e1b25 100644
|
||||
--- a/scripts/kconfig/conf.c
|
||||
+++ b/scripts/kconfig/conf.c
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
+#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
+ debian/version.patch
|
||||
+ debian/kernelvariables.patch
|
||||
+ debian/doc-build-parallel.patch
|
||||
#+ debian/scripts-kconfig-reportoldconfig.patch
|
||||
+ debian/scripts-kconfig-reportoldconfig.patch
|
||||
+ debian/powerpc-mkvmlinuz-support-ppc.patch
|
||||
#+ debian/powerpc-mkvmlinuz-support-powerpc.patch
|
||||
+ debian/powerpc-mkvmlinuz-support-powerpc.patch
|
||||
|
||||
#+ debian/drivers-ata-ata_piix-postpone-pata.patch
|
||||
+ debian/drivers-ata-ata_piix-postpone-pata.patch
|
||||
|
||||
+ bugfix/powerpc/build-links.patch
|
||||
+ bugfix/powerpc/mv643xx-hotplug-support.patch
|
||||
|
@ -13,28 +13,28 @@
|
|||
+ bugfix/powerpc/prep-utah-ide-interrupt.patch
|
||||
+ bugfix/powerpc/serial.patch
|
||||
+ bugfix/mips/ide-scan.patch
|
||||
#+ bugfix/mips/ip22-zilog-console.patch
|
||||
+ bugfix/mips/ip22-zilog-console.patch
|
||||
+ bugfix/mips/sgi-ioc3.patch
|
||||
+ bugfix/mips/64bit-tulip.patch
|
||||
+ bugfix/mips/tulip_dc21143.patch
|
||||
+ bugfix/mips/cobalt-ide-resources.patch
|
||||
+ features/mips/qemu-vga.patch
|
||||
#+ features/mips/sb1-duart.patch
|
||||
#+ features/arm/ixp4xx-npe-driver-0.3.1.patch
|
||||
#+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
|
||||
+ features/mips/sb1-duart.patch
|
||||
+ features/arm/ixp4xx-npe-driver-0.3.1.patch
|
||||
+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
|
||||
+ features/arm/nslu2-i2c-gpio-driver-support.patch
|
||||
+ features/arm/nas100d-i2c-gpio-driver-support.patch
|
||||
+ features/arm/nslu2-mac_plat_info.patch
|
||||
+ features/arm/nas100d-mac_plat_info.patch
|
||||
+ features/arm/nslu2-setup-mac.patch
|
||||
+ features/arm/nas100d-setup-mac.patch
|
||||
#+ bugfix/drivers-bus_to_virt.patch
|
||||
+ bugfix/drivers-bus_to_virt.patch
|
||||
+ bugfix/sparc/drivers_net-broken.patch
|
||||
#+ bugfix/arm/rtc-rs5c372-n2100.patch
|
||||
+ bugfix/arm/rtc-rs5c372-n2100.patch
|
||||
+ bugfix/forcedeth-napi-broken.patch
|
||||
#+ bugfix/powerpc/drivers_macintosh-broken.patch
|
||||
+ bugfix/ia64/hardcode-arch-script-output.patch
|
||||
+ features/fintek-f75375.patch
|
||||
#+ features/alpha/isa-mapping-support.patch
|
||||
+ features/alpha/isa-mapping-support.patch
|
||||
+ bugfix/powerpc/libgcc-__ucmpdi2.patch
|
||||
#+ bugfix/arm/disable-broken-config-options-1.patch
|
||||
+ bugfix/arm/disable-broken-config-options-1.patch
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
+ bugfix/m68k/m68k-page.h-needs-compiler.h.diff m68k
|
||||
+ bugfix/m68k/630-extern-cleanup.diff.1 m68k
|
||||
#+ bugfix/m68k/633-atari_scc.diff m68k
|
||||
+ bugfix/m68k/633-atari_scc.diff m68k
|
||||
+ bugfix/m68k/130-adbraw.diff m68k
|
||||
#+ bugfix/m68k/133-arch.diff m68k
|
||||
#+ bugfix/m68k/134-atari-fat.diff m68k
|
||||
|
@ -19,33 +19,33 @@
|
|||
+ bugfix/m68k/448-ide.diff m68k
|
||||
+ bugfix/m68k/478-serial.diff m68k
|
||||
#+ bugfix/m68k/631-thread_stack.diff m68k
|
||||
#+ bugfix/m68k/atari-rom-isa.diff m68k
|
||||
#+ bugfix/m68k/atari-ethernec.diff m68k
|
||||
+ bugfix/m68k/atari-rom-isa.diff m68k
|
||||
+ bugfix/m68k/atari-ethernec.diff m68k
|
||||
+ bugfix/m68k/unnecessary-m68k_memoffset.diff m68k
|
||||
#+ bugfix/m68k/atari-aranym.diff m68k
|
||||
#+ bugfix/m68k/ethernec-work.diff m68k
|
||||
#+ bugfix/m68k/nfeth-virt_to_phys.diff m68k
|
||||
#+ bugfix/m68k/ethernec-kill-ETHERNEC_USE_POLL.diff m68k
|
||||
+ bugfix/m68k/atari-aranym.diff m68k
|
||||
+ bugfix/m68k/ethernec-work.diff m68k
|
||||
+ bugfix/m68k/nfeth-virt_to_phys.diff m68k
|
||||
+ bugfix/m68k/ethernec-kill-ETHERNEC_USE_POLL.diff m68k
|
||||
#+ bugfix/m68k/sun3-3x-cg3-bw2.diff m68k
|
||||
#+ bugfix/m68k/sun3-3x-serial.diff m68k
|
||||
#+ bugfix/m68k/m68k-generic-io.diff m68k
|
||||
#+ bugfix/m68k/m68k-mvme-scsi-rename.diff m68k
|
||||
#+ bugfix/m68k/m68k-53c700-scsi.diff m68k
|
||||
+ bugfix/m68k/m68k-generic-io.diff m68k
|
||||
+ bugfix/m68k/m68k-mvme-scsi-rename.diff m68k
|
||||
+ bugfix/m68k/m68k-53c700-scsi.diff m68k
|
||||
+ bugfix/m68k/via-pmu68k-dead-code.diff m68k
|
||||
+ bugfix/m68k/m68k-use-_AC.diff m68k
|
||||
#+ bugfix/m68k/m68k-amiga-z2ram-kill-TRUE-FALSE.diff m68k
|
||||
#+ bugfix/m68k/add-termios2.diff m68k
|
||||
+ bugfix/m68k/m68k-amiga-z2ram-kill-TRUE-FALSE.diff m68k
|
||||
+ bugfix/m68k/add-termios2.diff m68k
|
||||
+ bugfix/m68k/m68k-arbitary-speed-tty-support.diff m68k
|
||||
+ bugfix/m68k/m68k-do-not-include-RODATA-in-text-segment.diff m68k
|
||||
#+ bugfix/m68k/m68k-53c700-cleanups.diff m68k
|
||||
#+ bugfix/m68k/split-amiga7xx.diff m68k
|
||||
+ bugfix/m68k/m68k-53c700-cleanups.diff m68k
|
||||
+ bugfix/m68k/split-amiga7xx.diff m68k
|
||||
+ bugfix/m68k/m68k-scsi-Kconfig-hickups.diff m68k
|
||||
#+ bugfix/m68k/zorro_config_attr-read-only.diff m68k
|
||||
+ bugfix/m68k/zorro_config_attr-read-only.diff m68k
|
||||
+ bugfix/m68k/zorro-module-device-table.diff m68k
|
||||
+ bugfix/m68k/falconide_intr_lock-ratelimit.diff m68k
|
||||
|
||||
+ bugfix/m68k/dmasound_paula.diff m68k
|
||||
#+ bugfix/m68k/disable-mac-broken-config-options.diff m68k
|
||||
+ bugfix/m68k/disable-mac-broken-config-options.diff m68k
|
||||
|
||||
#+ bugfix/m68k/debian-2.6.21-2-atari-scsi.diff m68k
|
||||
#+ bugfix/m68k/debian-2.6.21-2-rom-isa.diff m68k
|
||||
+ bugfix/m68k/debian-2.6.21-2-rom-isa.diff m68k
|
||||
|
|
Loading…
Reference in New Issue