From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 21 Sep 2007 12:01:22 +0000 (+0000)
Subject: revert [8907] and rename kmod-soundcore and kmod-ipip modules in 7.09 as well
X-Git-Tag: kamikaze_7.09~18
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=52dccd18c0d33d909f60defac3927c75033cfa75;p=openwrt%2Fsvn-archive%2Fopenwrt.git

revert [8907] and rename kmod-soundcore and kmod-ipip modules in 7.09 as well

SVN-Revision: 8910
---

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 45063fc6fa..d3414de073 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -46,7 +46,7 @@ define KernelPackage/bonding
 endef
 $(eval $(call KernelPackage,bonding))
 
-define KernelPackage/ipip
+define KernelPackage/iptunnel4
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
 	Kernel modules for IP in IP encapsulation
@@ -55,18 +55,18 @@ define KernelPackage/ipip
   PROVIDES:=iptunnel4
 endef
 
-define KernelPackage/ipip/2.4
+define KernelPackage/iptunnel4/2.4
   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip)
 endef
 
-define KernelPackage/ipip/2.6
+define KernelPackage/iptunnel4/2.6
   FILES:= \
 	$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
 endef
-$(eval $(call KernelPackage,ipip))
+$(eval $(call KernelPackage,iptunnel4))
 
 
 define KernelPackage/ipsec
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 36683dde97..241833deab 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -101,7 +101,7 @@ endef
 $(eval $(call KernelPackage,lp))
 
 
-define KernelPackage/soundcore
+define KernelPackage/sound-core
   TITLE:=Sound support
   DESCRIPTION:=Kernel modules for sound support
   KCONFIG:=$(CONFIG_SOUND)
@@ -109,12 +109,12 @@ define KernelPackage/soundcore
   PROVIDES:=kmod-sound-core
 endef
 
-define KernelPackage/soundcore/2.4
+define KernelPackage/sound-core/2.4
   FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
-define KernelPackage/soundcore/2.6
+define KernelPackage/sound-core/2.6
   FILES:= \
 	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \
@@ -122,14 +122,14 @@ define KernelPackage/soundcore/2.6
   AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss)
 endef
 
-define KernelPackage/soundcore/uml-2.6
+define KernelPackage/sound-core/uml-2.6
   FILES:= \
 	$(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
 endef
 
-$(eval $(call KernelPackage,soundcore))
+$(eval $(call KernelPackage,sound-core))
 
 
 define KernelPackage/loop
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 957ef851b1..9cd08dc1e7 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -128,7 +128,7 @@ $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio
-  $(call usbdep,+kmod-soundcore)
+  $(call usbdep,+kmod-sound-core)
   TITLE:=Support for audio devices
   DESCRIPTION:=Kernel support for USB audio devices
 endef