From b7c2ad1d2c8d1e3e90f37cc3b3f60c52aa36feae Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sun, 8 Jun 2008 00:22:25 +0000 Subject: [PATCH] 486: enable OLPC support thanks Andres Salomon for merge. drive olpc by debian default. again everyone wants his favorite fb default build in. svn path=/dists/trunk/linux-2.6/; revision=11576 --- debian/changelog | 2 ++ debian/config/i386/config.486 | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index fbc0f1a32..86a3c8256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ linux-2.6 (2.6.26~rc5-1~experimental.1) UNRELEASED; urgency=low * iwl3945: Add monitor mode patch. (closes: #482387) * [ppc64]: Enable IBMEBUS and EHEA. (closes: #484888) * topconfig: Enable PROFILING across all flavours. (closes: #484885) + * 486: enable OLPC support thanks Andres Salomon for merge. + Kconfig variable patch by Robert Millan (closes: #485063). [ Martin Michlmayr ] * [arm/orion5x] Update the config to reflect upstream renaming this diff --git a/debian/config/i386/config.486 b/debian/config/i386/config.486 index ce87472f2..5fdc91d59 100644 --- a/debian/config/i386/config.486 +++ b/debian/config/i386/config.486 @@ -12,6 +12,9 @@ CONFIG_NOHIGHMEM=y CONFIG_MATH_EMULATION=y CONFIG_EISA=y CONFIG_MCA=y +CONFIG_OLPC=y +CONFIG_PCI_OLPC=y + ## ## file: arch/x86/Kconfig.cpu @@ -118,6 +121,10 @@ CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4 CONFIG_SCSI_NCR53C8XX_SYNC=5 CONFIG_SCSI_SIM710=m +## file: drivers/video/geode/Kconfig +## +CONFIG_FB_GEODE_LX=y + ## ## file: init/Kconfig ##