diff options
| -rw-r--r-- | conf/distro/ludeos.conf | 2 | ||||
| -rw-r--r-- | packages/linux/nas100d-kernel/2.6.15/defconfig | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf index 4544281607..d03e8dd409 100644 --- a/conf/distro/ludeos.conf +++ b/conf/distro/ludeos.conf @@ -15,7 +15,7 @@ FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/$ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}" PREFERRED_PROVIDER_virtual/kernel = "nas100d-kernel" -PREFERRED_VERSION_nas100d-kernel ?= "2.6.15-rc1" +# PREFERRED_VERSION_nas100d-kernel ?= "2.6.15-rc2" # This removes the dependency on upslug2-native. SLUGOS_NATIVE_DEPENDS = "" diff --git a/packages/linux/nas100d-kernel/2.6.15/defconfig b/packages/linux/nas100d-kernel/2.6.15/defconfig index ef9276a55b..46634df1d5 100644 --- a/packages/linux/nas100d-kernel/2.6.15/defconfig +++ b/packages/linux/nas100d-kernel/2.6.15/defconfig @@ -157,7 +157,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc console=ttyS0,115200n8 hctosys=1" +CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc console=ttyS0,115200n8 pcf8563.hctosys=1" # CONFIG_XIP_KERNEL is not set # @@ -576,7 +576,7 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m @@ -626,7 +626,7 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_IPR is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set -CONFIG_SCSI_QLA2XXX=y +CONFIG_SCSI_QLA2XXX=n # CONFIG_SCSI_QLA21XX is not set # CONFIG_SCSI_QLA22XX is not set # CONFIG_SCSI_QLA2300 is not set |