amd64, i386: one more fb

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

debian/arch/amd64/config

@@ -930,6 +930,8 @@ CONFIG_FB_NVIDIA=m
 # 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_K8_NB=y
 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

debian/arch/i386/config

@@ -1113,6 +1113,7 @@ CONFIG_FB_NVIDIA_I2C=y
 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

debian/changelog

@@ -19,7 +19,7 @@ linux-2.6 (2.6.22~rc4-1~experimental.1) UNRELEASED; urgency=low
     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 @@ linux-2.6 (2.6.22~rc4-1~experimental.1) UNRELEASED; urgency=low
   * 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@debian.org>  Thu, 07 Jun 2007 12:53:16 +0200
+ -- maximilian attems <maks@debian.org>  Fri, 08 Jun 2007 10:35:25 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low