[kernel] r8936 - in dists/trunk/linux-2.6/debian: . arch/amd64 arch/i386

[Maximilian Attems]

Author: maks
Date: Fri Jun  8 08:36:12 2007
New Revision: 8936

Log:
amd64, i386: one more fb


Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Fri Jun  8 08:36:12 2007
@@ -930,6 +930,8 @@
 # CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -1331,7 +1333,6 @@
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_HW_RANDOM_AMD=m
-CONFIG_FB_INTEL=m
 CONFIG_RESOURCES_64BIT=y
 CONFIG_IOMMU=y
 CONFIG_HW_RANDOM_INTEL=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Fri Jun  8 08:36:12 2007
@@ -1113,6 +1113,7 @@
 CONFIG_FB_I810=m
 # CONFIG_FB_I810_GTF is not set
 CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
 CONFIG_FB_INTEL=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jun  8 08:36:12 2007
@@ -19,7 +19,7 @@
     MOUSE_PS2_TOUCHKIT, INPUT_POLLDEV in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM,
-    BACKLIGHT_PROGEAR, FB_HECUBA, FB_LE80578.
+    BACKLIGHT_PROGEAR, FB_HECUBA, FB_LE80578, FB_CARILLO_RANCH.
     Disable OSS_OBSOLETE.
   * Enable WLAN_PRE80211 and WLAN_80211 on all archs with NET_RADIO enabled.
   * Fix RTC_INTF_{DEV,SYSFS,PROC}=y where enabled modular.
@@ -47,7 +47,7 @@
   * arm/ixp4xx: Add support for the new generic I2C GPIO driver on the
     NSLU2 and the NAS100D. Thanks to Michael-Luke Jones and Rod Whitby.
 
- -- maximilian attems <maks at debian.org>  Thu, 07 Jun 2007 12:53:16 +0200
+ -- maximilian attems <maks at debian.org>  Fri, 08 Jun 2007 10:35:25 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low