diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-19 14:52:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-23 00:37:52 +0200 |
| commit | 01d0383398d239511563a76645b50c4497ddb3b4 (patch) | |
| tree | 0381ed7aa910b9cb2b58e8fc99b0a4f94da68b3f /recipes/linux | |
| parent | f01209eab43ed716be60527add2c6ae85a4d82d1 (diff) | |
| download | openembedded-01d0383398d239511563a76645b50c4497ddb3b4.tar.gz | |
linux_git: bump SRCREV for rc6, enable PLATFORM_PATA for spitz
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux/spitz/defconfig | 8 | ||||
| -rw-r--r-- | recipes/linux/linux_git.bb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig index f098d75d1a..312952f1ae 100644 --- a/recipes/linux/linux/spitz/defconfig +++ b/recipes/linux/linux/spitz/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35-rc4 -# Thu Jul 8 10:27:47 2010 +# Linux kernel version: 2.6.35-rc6 +# Thu Jul 22 23:22:01 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1015,7 +1015,7 @@ CONFIG_ATA_BMDMA=y # PIO-only SFF controllers # CONFIG_PATA_PCMCIA=y -# CONFIG_PATA_PLATFORM is not set +CONFIG_PATA_PLATFORM=y # # Generic fallback / legacy drivers @@ -1161,7 +1161,7 @@ CONFIG_INPUT_APMPOWER=y CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_TCA6416 is not set diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb index 231383e972..2b029d361a 100644 --- a/recipes/linux/linux_git.bb +++ b/recipes/linux/linux_git.bb @@ -1,7 +1,7 @@ require linux.inc -KERNEL_RELEASE = "2.6.35-rc5" -SRCREV = "f469461df6ff822f71b8737bda86eea20f16ff93" +KERNEL_RELEASE = "2.6.35-rc6" +SRCREV = "b37fa16e78d6f9790462b3181602a26b5af36260" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ |