diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-08-24 13:17:54 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-08-24 13:17:54 +0000 |
| commit | 778724cb7918c3cda2a2d23610a51dba58e7b6ba (patch) | |
| tree | ef5d6d4f16da199f48791e9f595c772f9491b4b1 | |
| parent | c748887a42f92eff887578ce1341e5b95cc50b05 (diff) | |
| parent | 866529bae981b5cdf8700ffaba239fba4e41859b (diff) | |
merge of '0135b9c8cb83a5549aee08d6ce8638b76d8230a4'
and '340da43485a96531933592289a8115f52a246a86'
| -rw-r--r-- | packages/linux/linux/alix/defconfig | 11 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.22.bb | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/packages/linux/linux/alix/defconfig b/packages/linux/linux/alix/defconfig index c1c82931bb..6d4ac6a735 100644 --- a/packages/linux/linux/alix/defconfig +++ b/packages/linux/linux/alix/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22 -# Tue Aug 7 15:04:11 2007 +# Fri Aug 24 14:54:56 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -197,11 +197,6 @@ CONFIG_VM86=y CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set -# CONFIG_VMSPLIT_3G is not set -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_2G_OPT is not set -# CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -615,14 +610,14 @@ CONFIG_ATA_ACPI=y # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set # CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set +CONFIG_PATA_AMD=y # CONFIG_PATA_ARTOP is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set -CONFIG_PATA_CS5535=y +# CONFIG_PATA_CS5535 is not set # CONFIG_PATA_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_ATA_GENERIC is not set diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb index b4e18dd5e1..6791e33014 100644 --- a/packages/linux/linux_2.6.22.bb +++ b/packages/linux/linux_2.6.22.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_alix = "1" DEFAULT_PREFERENCE_avr32 = "1" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ file://defconfig \ |