diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-27 11:15:11 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-27 11:15:11 +0200 |
commit | 387f807fb69e4b45fd56d4ba05dc65b93bf97809 (patch) | |
tree | 7a1d1a8191a6b3d46fe49025776ecd45569676c1 /mk | |
parent | 1bd2bb0a91821025a50407f1b5a7e316e2e29eb5 (diff) | |
parent | 5b8ca9882625b354c5d935a14067568414fc369e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/modules.mk | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index 8dbd321d2..78c858f17 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -14,7 +14,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ ADK_LOCALES=n \ ADK_MAKE_PARALLEL=y \ - ADK_MAKE_JOBS=4 \ + ADK_MAKE_JOBS=1 \ ADK_USE_CCACHE=n \ ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER=n \ ADK_PACKAGE_GRUB=n \ diff --git a/mk/modules.mk b/mk/modules.mk index 78897efc3..73ecb707c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -78,7 +78,7 @@ $(eval $(call KMOD_template,P54_COMMON,p54-common,\ ,68)) $(eval $(call KMOD_template,RTL8187,rtl8187,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/rtl818x/rtl8187 \ + $(MODULES_DIR)/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187 \ ,70)) $(eval $(call KMOD_template,B43,b43,\ @@ -1120,10 +1120,10 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\ $(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \ ,55)) -V4L_COMPAT:=drivers/media/video/v4l1-compat -ifeq ($(ADK_LINUX_64),y) -V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32 -endif +#V4L_COMPAT:=drivers/media/video/v4l1-compat +#ifeq ($(ADK_LINUX_64),y) +#V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32 +#endif $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ $(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \ @@ -1273,11 +1273,11 @@ $(eval $(call KMOD_template,BT_HCIUART,bt-hciuart,\ $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart \ ,75)) -$(eval $(call KMOD_template,BT_L2CAP,bt-l2cap,\ +#$(eval $(call KMOD_template,BT_L2CAP,bt-l2cap,\ $(MODULES_DIR)/kernel/net/bluetooth/l2cap \ ,80)) -$(eval $(call KMOD_template,BT_SCO,bt-sco,\ +#$(eval $(call KMOD_template,BT_SCO,bt-sco,\ $(MODULES_DIR)/kernel/net/bluetooth/sco \ ,85)) |