diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2012-04-03 17:05:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-04-03 17:05:35 +0200 |
commit | affdd5dff82289e9da4c29737ec66b563e14daa7 (patch) | |
tree | 0525fb417f409467e558baa7a22df6ab818ce67c /mk | |
parent | b9cc51c4c2c315f508459cea7da1d8433333d7a1 (diff) | |
parent | 41db567455a283a26e9fda82a5da3d44288122f3 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r-- | mk/kernel-ver.mk | 4 | ||||
-rw-r--r-- | mk/modules.mk | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index c0b93d549..731017a9f 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -14,7 +14,7 @@ ifeq ($(ADK_KERNEL_VERSION_3_0_25),y) KERNEL_VERSION:= 3.0.25 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 0cb510da24d9cf7bd17091ed49176178 +KERNEL_MD5SUM:= 919df2dd67e6fe3e4c70436493995d14 endif ifeq ($(ADK_KERNEL_VERSION_3_1_10),y) KERNEL_VERSION:= 3.1.10 @@ -26,7 +26,7 @@ ifeq ($(ADK_KERNEL_VERSION_3_2_12),y) KERNEL_VERSION:= 3.2.12 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 9c9ab852e069fef357e2a29a98cf03e7 +KERNEL_MD5SUM:= e3dd3772f0cf14d444a3fb474bd624fe endif ifeq ($(ADK_KERNEL_VERSION_3_3),y) KERNEL_VERSION:= 3.3 diff --git a/mk/modules.mk b/mk/modules.mk index c07f58d3d..87266124f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1250,9 +1250,13 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ USBMODULES:= ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),3) USBMODULES+=drivers/usb/usb-common -endif USBMODULES+=drivers/usb/core/usbcore +else +USBMODULES+=drivers/usb/core/usbcore +endif +endif ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),) $(eval $(call KMOD_template,USB,usb,\ |