diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-28 16:07:18 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-28 16:07:18 +0200 |
| commit | 8bee65a9cbd1905e356ff468a48e90608a08a8e6 (patch) | |
| tree | afdb76c6fa9e0e91482680497f0f5c27c56a9d4b /target/linux | |
| parent | 98c4842cbff9e4802092c5011feb0ecbb8e4881d (diff) | |
| parent | bf5f8fc2eaded785753175367f7f1a52192c2d62 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.fs | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.multimedia | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 11 |
3 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 1378c3528..cc07d71d7 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -1,5 +1,9 @@ menu "Filesystems support" +config ADK_KERNEL_MISC_FILESYSTEMS + boolean + default n + config ADK_KERNEL_EXT3_FS_XATTR boolean default n @@ -88,6 +92,7 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS tristate select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KPACKAGE_KMOD_NLS_UTF8 + select ADK_KERNEL_MISC_FILESYSTEMS default n help If you say Y here, you will be able to mount extended format diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 01e837dca..f224dc31b 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -82,7 +82,7 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver (ALIX1C)" depends on ADK_KPACKAGE_KMOD_SND select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - depends on ADK_LINUX_X86_ALIX1C + depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS64_LEMOTE tristate default n help diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 986d9627e..bbe039d4b 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -1,10 +1,6 @@ menu "USB support" depends on ADK_TARGET_WITH_USB -config ADK_KERNEL_USB_DEVICEFS - boolean - default n - config ADK_KERNEL_USB_LIBUSUAL tristate default n @@ -17,10 +13,10 @@ config ADK_KPACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" tristate default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_MIPS64_LEMOTE default n - depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXBOARD || ADK_LINUX_MIPS64_LEMOTE ) + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXBOARD) select ADK_KERNEL_NLS - select ADK_KERNEL_USB_DEVICEFS help Universal Serial Bus (USB) is a specification for a serial bus subsystem which offers higher speeds and more features than the @@ -70,6 +66,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD prompt "kmod-usb-ohci................... Support for OHCI controllers" tristate default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_MIPS64_LEMOTE default n depends on !ADK_LINUX_CRIS_FOXBOARD depends on ADK_KPACKAGE_KMOD_USB @@ -116,6 +113,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD tristate depends on !ADK_LINUX_CRIS_FOXBOARD default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_MIPS64_LEMOTE default n depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER @@ -141,7 +139,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD config ADK_PACKAGE_KMOD_USB_CONTROLLER tristate depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD - select ADK_KERNEL_USB_DEVICEFS default n config ADK_KPACKAGE_KMOD_USB_ACM |