[oe-commits] org.oe.dev linux: select proper PATA driver for Alix board

[hrw commit]

linux: select proper PATA driver for Alix board

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 340da43485a96531933592289a8115f52a246a86
ViewMTN: http://monotone.openembedded.org/revision.psp?id=340da43485a96531933592289a8115f52a246a86
Files:
1
packages/linux/linux/alix/defconfig
packages/linux/linux_2.6.22.bb
Diffs:

#
# mt diff -rb48de28301ae8c75622f3d839c1d89befaffa384 -r340da43485a96531933592289a8115f52a246a86
#
# 
# 
# patch "packages/linux/linux/alix/defconfig"
#  from [c0f3a9c68f8fa0f1dded58b6151764cf12f0e755]
#    to [ae7429017290047c958a445063d17fcfbc5e4133]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [9efcf6fbec272f241391319f176ebde4ffd51647]
#    to [a7c4f5a30592c11bb5188d028c5c20b6ee98188e]
# 
============================================================
--- packages/linux/linux/alix/defconfig	c0f3a9c68f8fa0f1dded58b6151764cf12f0e755
+++ packages/linux/linux/alix/defconfig	ae7429017290047c958a445063d17fcfbc5e4133
@@ -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_NOHIGHMEM=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
============================================================
--- packages/linux/linux_2.6.22.bb	9efcf6fbec272f241391319f176ebde4ffd51647
+++ packages/linux/linux_2.6.22.bb	a7c4f5a30592c11bb5188d028c5c20b6ee98188e
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_avr32 = "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 \