diff options
author | Koen Kooi <koen@openembedded.org> | 2010-11-25 16:22:57 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-11-25 16:22:57 +0100 |
commit | 4df861b82a5e4775a20042646340d8509473a670 (patch) | |
tree | 3ed1b80ec491f62a4cef7039b82a67e4ccf71c34 | |
parent | 8ae983fb6be635aeb45c3ef48e165eb28df1fe67 (diff) | |
download | openembedded-4df861b82a5e4775a20042646340d8509473a670.tar.gz |
linux-omap4: sync with latest ubuntu git
Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r-- | recipes/linux/linux-omap4/omap4430-panda/defconfig | 2 | ||||
-rw-r--r-- | recipes/linux/linux-omap4_2.6.35.3.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/linux/linux-omap4/omap4430-panda/defconfig b/recipes/linux/linux-omap4/omap4430-panda/defconfig index 7f91a3a072..f6b8151722 100644 --- a/recipes/linux/linux-omap4/omap4430-panda/defconfig +++ b/recipes/linux/linux-omap4/omap4430-panda/defconfig @@ -2186,7 +2186,7 @@ CONFIG_SCSI_DMA=y # CONFIG_SCSI_LOGGING is not set CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_MOD=y -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_NETLINK is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_SCSI_PROC_FS=y diff --git a/recipes/linux/linux-omap4_2.6.35.3.bb b/recipes/linux/linux-omap4_2.6.35.3.bb index 352f9f938a..84d3e74520 100644 --- a/recipes/linux/linux-omap4_2.6.35.3.bb +++ b/recipes/linux/linux-omap4_2.6.35.3.bb @@ -4,7 +4,7 @@ require multi-kernel.inc CORTEXA8FIXUP = "no" -SRCREV = "6931849710b21c0688a24646b15ff9db782b21d9" +SRCREV = "6aba79f8f85b937596373cda8e266b823395996e" SRC_URI = "git://kernel.ubuntu.com/ubuntu/ubuntu-maverick.git;protocol=git;branch=ti-omap4 \ file://defconfig" |