From eda158fc7b8192a1bead181561169ff245c0e04c Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 26 May 2008 22:57:51 +0000
Subject: 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)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11272 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/other.mk | 6 ++----
 package/kernel/modules/sound.mk | 5 ++---
 package/kernel/modules/video.mk | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'package/kernel')

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index d7d078d37..a096552bd 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 a69780701..547fddc83 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 bd950e343..da19de657 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 \
-- 
cgit v1.2.3