diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:31:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:31:31 +0200 |
| commit | 1a3c8bc113260f144f3e173201b9a3468a53119d (patch) | |
| tree | 362e503cd750cb8162e7b7596850d00b5747d3e4 /target/linux | |
| parent | c9d72815880524c041e37f23813ba777093a27d2 (diff) | |
| parent | 681a668edf704bbb000a49c835b3d71fa7035d86 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.misc | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.multimedia | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 68f906802..084f19112 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -120,6 +120,7 @@ config ADK_KPACKAGE_KMOD_PPDEV config ADK_KPACKAGE_KMOD_FW_LOADER prompt "kmod-fw-loader.................... userspace firmware loading support" tristate + depends on !ADK_TARGET_SYSTEM_SHARP_ZAURUS default n help This may be necessary when using drivers which require diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 92d1997c4..128f42bd3 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -159,6 +159,7 @@ config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS config ADK_KPACKAGE_KMOD_USB_GSPCA prompt "kmod-usb-gspca................... GSPCA webcam framework" + depends on ADK_TARGET_WITH_USB tristate help GSPCA webcam framework diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 1ca92886c..3949e9cf9 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -49,6 +49,7 @@ config ADK_KERNEL_MACB select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + default y if ADK_TARGET_SYSTEM_ATMEL_NGW100 default n help |