Merge branch 'master' of git+ssh://openadk.org/git/openadk

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,\

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