summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Cole <jnc@unknown.openembedded.org>2006-02-26 04:17:48 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-26 04:17:48 +0000
commit13e80da35d72de5b04cf2cb4195529d2da885434 (patch)
treec2341509721bfa6493d40cfe3c57584880859832
parentba1f81ba6dea91931c8da3399f522a421b812ae3 (diff)
parent4bc3f80ffb9a25b20b8980b187edaac3508bce3a (diff)
merge of 931370684daa1b1fc8aac0ef4e41d0ba46bb6517
and b0535ae5d884f64c3f25212755c0dbbd607a4984
-rw-r--r--packages/linux/unslung-kernel/defconfig8
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r63.bb2
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index 52864f46f6..877397cb02 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -334,7 +334,7 @@ CONFIG_MTD_IXP425=y
# CONFIG_CISS_SCSI_TAPE is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -900,8 +900,8 @@ CONFIG_JFFS2_FS_DEBUG=0
# CONFIG_CRAMFS is not set
CONFIG_TMPFS=y
CONFIG_RAMFS=y
-# CONFIG_ISO9660_FS is not set
-# CONFIG_JOLIET is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
# CONFIG_JFS_FS is not set
# CONFIG_JFS_DEBUG is not set
@@ -1182,7 +1182,7 @@ CONFIG_USB_SERIAL_VISOR=m
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 170651afab..3332e54d4e 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb
DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r8"
+PR = "r9"
KERNEL_SUFFIX = "unslung"