diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-17 21:08:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-17 21:08:26 +0100 |
| commit | 94913f481ffb7b1be59ee175863b094dfbfb91c7 (patch) | |
| tree | 82e0decc34bcadcf15a6a04cf7066024aed46624 | |
| parent | b83c514e2e2c0b1706a17c504307d806e159647d (diff) | |
| parent | 70ca73afb20cbe250503cc2ac51ccb883349ee85 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 954df54ef..bdb8fa897 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -123,8 +123,8 @@ $(eval $(call KMOD_template,PPPOATM,pppoatm,\ ,60)) $(eval $(call KMOD_template,PPPOE,pppoe,\ - $(MODULES_DIR)/kernel/drivers/net/pppoe \ $(MODULES_DIR)/kernel/drivers/net/pppox \ + $(MODULES_DIR)/kernel/drivers/net/pppoe \ ,60)) $(eval $(call KMOD_template,TUN,tun,\ diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 2efab411b..f66fbeee0 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -17,6 +17,7 @@ config ADK_KPACKAGE_KMOD_USB tristate default y if ADK_LINUX_X86_ALIX1C || ADK_LINUX_CRIS_FOXBOARD default n + select ADK_KERNEL_NLS select ADK_KERNEL_USB_DEVICEFS help Universal Serial Bus (USB) is a specification for a serial bus |