diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-02-09 20:00:25 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-09 20:00:25 +0000 |
| commit | c4b4ff9addf60fb438632b7cd83441bd14d41224 (patch) | |
| tree | ff00dc8ca25a846939db4a2ce6404a390ac46626 /packages | |
| parent | 63709e941cf8fbef26c91a12c7594c6c0b4c0f95 (diff) | |
| parent | f23afc6f94b871d572a403bf1cf7231fec537110 (diff) | |
merge of dc7030746547ed09bdd941871c775b044c145143
and f7940d7b4ac1dca8c38ef92949c3d012d70c9202
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/ep93xx-kernel/defconfig | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig index b92ad0f3cd..9487031705 100644 --- a/packages/linux/ep93xx-kernel/defconfig +++ b/packages/linux/ep93xx-kernel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Thu Feb 9 00:37:45 2006 +# Thu Feb 9 20:06:27 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -162,7 +162,7 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -CONFIG_PCMCIA_EP93XX=y +# CONFIG_PCMCIA_EP93XX is not set # # Kernel Features @@ -561,9 +561,9 @@ CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_EP93XX=y -CONFIG_BLK_DEV_IDEDMA_EP93XX=y +# CONFIG_BLK_DEV_IDEDMA_EP93XX is not set CONFIG_IDE_ARM=y -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set @@ -819,7 +819,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # # CONFIG_WATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_RTC=y +# CONFIG_RTC is not set CONFIG_EP93XX_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -1016,7 +1016,6 @@ CONFIG_SND_PCM=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m -CONFIG_SND_RTCTIMER=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set CONFIG_SND_GENERIC_DRIVER=y |