diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-10-31 13:35:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-10-31 13:35:10 +0000 |
| commit | acbaf6a6eb1e9263639fd40212643f053c6b41ec (patch) | |
| tree | f84818ef09b6c15e90d39b7832e0c20804885c9a | |
| parent | b73d010b76cb77fc0f0a9382789536dfa65b79fb (diff) | |
| download | poky-acbaf6a6eb1e9263639fd40212643f053c6b41ec.tar.gz | |
linux-openzaurus-2.6.17: Sync defconfigs with OE (tosa, akita, c7x0, collie)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@847 311d38ba-8fff-0310-9ca6-ca027cbcb966
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-akita b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-akita index 967371c661..f2be7e270e 100644 --- a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-akita +++ b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-akita | |||
| @@ -1012,7 +1012,7 @@ CONFIG_SND_PXA2XX_AC97=m | |||
| 1012 | # | 1012 | # |
| 1013 | # USB devices | 1013 | # USB devices |
| 1014 | # | 1014 | # |
| 1015 | # CONFIG_SND_USB_AUDIO is not set | 1015 | CONFIG_SND_USB_AUDIO=m |
| 1016 | 1016 | ||
| 1017 | # | 1017 | # |
| 1018 | # PCMCIA devices | 1018 | # PCMCIA devices |
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 index 602e69ee34..759338cb56 100644 --- a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 +++ b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 | |||
| @@ -1048,7 +1048,7 @@ CONFIG_SND_PXA2XX_AC97=m | |||
| 1048 | # | 1048 | # |
| 1049 | # USB devices | 1049 | # USB devices |
| 1050 | # | 1050 | # |
| 1051 | # CONFIG_SND_USB_AUDIO is not set | 1051 | CONFIG_SND_USB_AUDIO=m |
| 1052 | 1052 | ||
| 1053 | # | 1053 | # |
| 1054 | # PCMCIA devices | 1054 | # PCMCIA devices |
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-collie b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-collie index 181eb228ed..7ae7c0ecfb 100644 --- a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-collie +++ b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-collie | |||
| @@ -587,7 +587,7 @@ CONFIG_CHR_DEV_SG=m | |||
| 587 | # | 587 | # |
| 588 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 588 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
| 589 | # | 589 | # |
| 590 | # CONFIG_SCSI_MULTI_LUN is not set | 590 | CONFIG_SCSI_MULTI_LUN=y |
| 591 | # CONFIG_SCSI_CONSTANTS is not set | 591 | # CONFIG_SCSI_CONSTANTS is not set |
| 592 | # CONFIG_SCSI_LOGGING is not set | 592 | # CONFIG_SCSI_LOGGING is not set |
| 593 | 593 | ||
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa index 4302f47e15..48501c8a76 100644 --- a/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa +++ b/meta/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa | |||
| @@ -591,7 +591,7 @@ CONFIG_CHR_DEV_SG=m | |||
| 591 | # | 591 | # |
| 592 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 592 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
| 593 | # | 593 | # |
| 594 | # CONFIG_SCSI_MULTI_LUN is not set | 594 | CONFIG_SCSI_MULTI_LUN=y |
| 595 | # CONFIG_SCSI_CONSTANTS is not set | 595 | # CONFIG_SCSI_CONSTANTS is not set |
| 596 | # CONFIG_SCSI_LOGGING is not set | 596 | # CONFIG_SCSI_LOGGING is not set |
| 597 | 597 | ||