Merge /dists/sid/linux-2.6.
r5897: jurij-guest | 2006-02-15 04:02:29 +0000 Bump build-dep on kernel-package to 10.035, required to fix 352000. r5909: fs | 2006-02-17 13:21:29 +0000 Activate CONFIG_DVB_AV7110_OSD on alpha amd64 and ia64. r5936: jurij-guest | 2006-02-20 07:21:37 +0000 Add Closes for #348332 to the latest changelog entry as it is the same issue as #352000 and is going to be fixed by the next upload. r5939: cts | 2006-02-20 22:56:18 +0000 [m68k] build in cirrusfb driver svn path=/dists/trunk/linux-2.6/; revision=5960
This commit is contained in:
parent
6c66903823
commit
df263e9375
|
@ -1161,7 +1161,6 @@ CONFIG_FB_ATY128=m
|
|||
CONFIG_FB_ATY=m
|
||||
CONFIG_FB_ATY_CT=y
|
||||
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
||||
CONFIG_FB_ATY_XL_INIT=y
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_SAVAGE=m
|
||||
# CONFIG_FB_SAVAGE_I2C is not set
|
||||
|
|
|
@ -1105,7 +1105,6 @@ CONFIG_FB_ATY128=m
|
|||
CONFIG_FB_ATY=m
|
||||
CONFIG_FB_ATY_CT=y
|
||||
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
||||
CONFIG_FB_ATY_XL_INIT=y
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_SAVAGE=m
|
||||
# CONFIG_FB_SAVAGE_I2C is not set
|
||||
|
|
|
@ -1722,7 +1722,6 @@ CONFIG_FONT_8x16=y
|
|||
# CONFIG_FB_3DFX_ACCEL is not set
|
||||
CONFIG_FB_ATY_GX=y
|
||||
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
||||
# CONFIG_FB_ATY_XL_INIT is not set
|
||||
CONFIG_FB_VOODOO1=m
|
||||
# CONFIG_MTD_BLOCK2MTD is not set
|
||||
# CONFIG_MTD_MTDRAM is not set
|
||||
|
|
|
@ -1310,7 +1310,6 @@ CONFIG_FB_ATY128=m
|
|||
CONFIG_FB_ATY=m
|
||||
CONFIG_FB_ATY_CT=y
|
||||
CONFIG_FB_ATY_GENERIC_LCD=y
|
||||
CONFIG_FB_ATY_XL_INIT=y
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_SAVAGE=m
|
||||
CONFIG_FB_SAVAGE_I2C=y
|
||||
|
|
|
@ -912,7 +912,6 @@ CONFIG_FB_ATY128=m
|
|||
CONFIG_FB_ATY=m
|
||||
CONFIG_FB_ATY_CT=y
|
||||
CONFIG_FB_ATY_GENERIC_LCD=y
|
||||
# CONFIG_FB_ATY_XL_INIT is not set
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_SAVAGE=m
|
||||
CONFIG_FB_SAVAGE_I2C=y
|
||||
|
|
|
@ -153,7 +153,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
|
|||
# CONFIG_FB_MACMODES is not set
|
||||
# CONFIG_FB_MODE_HELPERS is not set
|
||||
# CONFIG_FB_TILEBLITTING is not set
|
||||
CONFIG_FB_CIRRUS=m
|
||||
CONFIG_FB_CIRRUS=y
|
||||
# CONFIG_FB_PM2 is not set
|
||||
CONFIG_FB_AMIGA=y
|
||||
CONFIG_FB_AMIGA_OCS=y
|
||||
|
|
|
@ -892,7 +892,6 @@ CONFIG_FB_ATY128=y
|
|||
CONFIG_FB_ATY=y
|
||||
CONFIG_FB_ATY_CT=y
|
||||
CONFIG_FB_ATY_GENERIC_LCD=y
|
||||
# CONFIG_FB_ATY_XL_INIT is not set
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_SAVAGE=m
|
||||
CONFIG_FB_SAVAGE_I2C=y
|
||||
|
|
|
@ -37,7 +37,6 @@ CONFIG_FB_ATY128=y
|
|||
CONFIG_FB_ATY=y
|
||||
CONFIG_FB_ATY_CT=y
|
||||
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
||||
# CONFIG_FB_ATY_XL_INIT is not set
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_FFB=y
|
||||
# CONFIG_FB_TCX is not set
|
||||
|
|
|
@ -41,7 +41,6 @@ CONFIG_FB_ATY128=y
|
|||
CONFIG_FB_ATY=y
|
||||
CONFIG_FB_ATY_CT=y
|
||||
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
||||
# CONFIG_FB_ATY_XL_INIT is not set
|
||||
CONFIG_FB_ATY_GX=y
|
||||
CONFIG_FB_FFB=y
|
||||
# CONFIG_FB_TCX is not set
|
||||
|
|
|
@ -36,7 +36,7 @@ linux-2.6 (2.6.15+2.6.16-rc4-0experimental.1) UNRELEASED; urgency=low
|
|||
|
||||
-- Bastian Blank <waldi@debian.org> Mon, 20 Feb 2006 16:55:53 +0000
|
||||
|
||||
linux-2.6 (2.6.15-7) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.15-7) unstable; urgency=low
|
||||
|
||||
[ Norbert Tretkowski ]
|
||||
* [alpha] Disabled CONFIG_ALPHA_LEGACY_START_ADDRESS for -alpha-generic and
|
||||
|
@ -47,7 +47,22 @@ linux-2.6 (2.6.15-7) UNRELEASED; urgency=low
|
|||
* [i386] 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.
|
||||
|
||||
-- Norbert Tretkowski <nobse@debian.org> Sun, 12 Feb 2006 11:55:30 +0100
|
||||
[ Jurij Smakov ]
|
||||
* Bump build-dependency on kernel-package to 10.035, which is fixed
|
||||
to build the documentation packages again.
|
||||
Closes: #352000, #348332
|
||||
|
||||
[ Frederik Schüler ]
|
||||
* Activate CONFIG_DVB_AV7110_OSD on alpha amd64 and ia64.
|
||||
Closes: #353292
|
||||
* Deactivate CONFIG_FB_ATY_XL_INIT on all architectures: it is broken and
|
||||
already removed in 2.6.16-rc.
|
||||
Closes: #353310
|
||||
|
||||
[ Christian T. Steigies ]
|
||||
* [m68k] build in cirrusfb driver
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Tue, 21 Feb 2006 17:35:21 +0000
|
||||
|
||||
linux-2.6 (2.6.15-6) unstable; urgency=low
|
||||
|
||||
|
|
Loading…
Reference in New Issue