linux-openzaurus-2.6.17: Sync defconfigs with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@970 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
bcedd690f7
commit
b8cc2cd7e6
|
@ -609,7 +609,14 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -622,7 +622,14 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -631,7 +631,14 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -631,7 +631,14 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -490,7 +490,14 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -610,7 +610,14 @@ CONFIG_SCSI_IPR=m
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -618,7 +618,14 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -622,7 +622,14 @@ CONFIG_SCSI_MULTI_LUN=y
|
|||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
CONFIG_DM_CRYPT=m
|
||||
CONFIG_DM_SNAPSHOT=m
|
||||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
|
||||
#
|
||||
# Fusion MPT device support
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
|
||||
|
||||
Few cards informations submitted by OpenZaurus users.
|
||||
|
||||
Seagate 8GB microdrive:
|
||||
product info: "SEAGATE", "ST1"
|
||||
manfid 0x0111, 0x0000
|
||||
|
||||
One CF card:
|
||||
product info: "SAMSUNG", "04/05/06", "", ""
|
||||
manfid : 0x0000, 0x0000
|
||||
|
||||
Ridata 8GB Pro 150X Compact Flash Card:
|
||||
product info: "SMI VENDOR", "SMI PRODUCT", ""
|
||||
manfid: 0x000a, 0x0000
|
||||
|
||||
product info: "M-Systems", "CF500", ""
|
||||
manfid: 0x000a, 0x0000
|
||||
|
||||
product info: "TRANSCEND", "TS4GCF120", ""
|
||||
manfid: 0x000a, 0x0000
|
||||
|
||||
Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
|
||||
|
||||
---
|
||||
Patch follow kernel version 2.6.18
|
||||
|
||||
Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
|
||||
|
||||
ide-cs.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
Index: linux-2.6/drivers/ide/legacy/ide-cs.c
|
||||
===================================================================
|
||||
--- linux-2.6.orig/drivers/ide/legacy/ide-cs.c 2006-08-23 11:02:37.958306000 +0200
|
||||
+++ linux-2.6/drivers/ide/legacy/ide-cs.c 2006-09-25 16:45:35.765780000 +0200
|
||||
@@ -398,12 +398,17 @@
|
||||
PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
|
||||
PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
|
||||
PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
|
||||
PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
|
||||
PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
|
||||
PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
|
||||
PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
|
||||
PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
|
||||
PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
|
||||
PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
|
||||
PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
|
||||
PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
|
|
@ -533,7 +533,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
|
|||
+ *s, long long start_block,
|
||||
+ int length)
|
||||
+{
|
||||
+ int i, n;
|
||||
+ int i, n, nf;
|
||||
+ struct squashfs_sb_info *msblk = s->s_fs_info;
|
||||
+
|
||||
+ while ( 1 ) {
|
||||
|
@ -543,6 +543,8 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
|
|||
+ msblk->fragment[i].block != start_block; i++);
|
||||
+
|
||||
+ if (i == SQUASHFS_CACHED_FRAGMENTS) {
|
||||
+ nf = (msblk->next_fragment + 1) %
|
||||
+ SQUASHFS_CACHED_FRAGMENTS;
|
||||
+ for (i = msblk->next_fragment, n =
|
||||
+ SQUASHFS_CACHED_FRAGMENTS; n &&
|
||||
+ msblk->fragment[i].locked; n--, i = (i + 1) %
|
||||
|
@ -562,8 +564,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
|
|||
+ &wait);
|
||||
+ continue;
|
||||
+ }
|
||||
+ msblk->next_fragment = (msblk->next_fragment + 1) %
|
||||
+ SQUASHFS_CACHED_FRAGMENTS;
|
||||
+ msblk->next_fragment = nf;
|
||||
+
|
||||
+ if (msblk->fragment[i].data == NULL)
|
||||
+ if (!(msblk->fragment[i].data = SQUASHFS_ALLOC
|
||||
|
|
Loading…
Reference in New Issue