diff options
author | Nicolas Thill <nico@openwrt.org> | 2008-05-26 22:57:51 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2008-05-26 22:57:51 +0000 |
commit | ae879baa574b32015b069b2d1d4eb9027c5e0dd0 (patch) | |
tree | 81c6b4a300a5db3950f481aa9106182ab3fcd7ac /package/kernel | |
parent | 7e9f396980a2e8680e1ebf9131b758a3bc562f53 (diff) | |
download | upstream-ae879baa574b32015b069b2d1d4eb9027c5e0dd0.tar.gz upstream-ae879baa574b32015b069b2d1d4eb9027c5e0dd0.tar.bz2 upstream-ae879baa574b32015b069b2d1d4eb9027c5e0dd0.zip |
remove hacks to disable modules on some targets now that we do have proper PCI & USB support detected on all targets at config-time, mark p54 as broken (for too long)
SVN-Revision: 11272
Diffstat (limited to 'package/kernel')
-rw-r--r-- | package/kernel/modules/other.mk | 6 | ||||
-rw-r--r-- | package/kernel/modules/sound.mk | 5 | ||||
-rw-r--r-- | package/kernel/modules/video.mk | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index d7d078d370..a096552bdd 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -154,11 +154,10 @@ endef $(eval $(call KernelPackage,pcmcia-serial)) -# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT @!TARGET_uml + DEPENDS:=@USB_SUPPORT KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -306,7 +305,6 @@ endef $(eval $(call KernelPackage,softdog)) -# XXX: remove @TARGET_* later when we are able to detect the exact version of the kernel define KernelPackage/leds-gpio SUBMENU:=$(OTHER_MENU) TITLE:=GPIO LED support diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index a697807016..547fddc830 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,10 @@ SOUND_MENU:=Sound Support -# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets define KernelPackage/sound-core SUBMENU:=$(SOUND_MENU) TITLE:=Sound support - DEPENDS:=@USB_SUPPORT||PCI_SUPPORT + DEPENDS:=@PCI_SUPPORT||USB_SUPPORT KCONFIG:= \ CONFIG_SOUND \ CONFIG_SND \ diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index bd950e3436..da19de6571 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,7 +11,7 @@ VIDEO_MENU:=Video Support define KernelPackage/video-core SUBMENU:=$(VIDEO_MENU) TITLE=Video4Linux support - DEPENDS:= @!TARGET_uml + DEPENDS:=@PCI_SUPPORT||USB_SUPPORT KCONFIG:= \ CONFIG_VIDEO_DEV \ CONFIG_VIDEO_V4L1=y \ |