KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: fix some problems with kernel 2.6.38

Browse source 
In some places LINUX_2_6_38 was just missing.
Some kernel modules were moved.

SVN-Revision: 26239
This commit is contained in:
Hauke Mehrtens 2011-03-19 17:42:48 +00:00
parent 782dd1689b
commit aadec1ec97
4 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kernel/modules/netsupport.mk
View file

@ -489,9 +489,9 @@ $(eval $(call KernelPackage,pptp))
define KernelPackage/pppol2tp define KernelPackage/pppol2tp
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPPoL2TP support TITLE:=PPPoL2TP support
DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-l2tp DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-l2tp
KCONFIG:=CONFIG_PPPOL2TP KCONFIG:=CONFIG_PPPOL2TP
ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37),) ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37)$(CONFIG_LINUX_2_6_38),)
FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko
AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp) AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp)
else else
@ -651,7 +651,7 @@ $(eval $(call KernelPackage,pktgen))
define KernelPackage/l2tp define KernelPackage/l2tp
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38
TITLE:=Layer Two Tunneling Protocol (L2TP) TITLE:=Layer Two Tunneling Protocol (L2TP)
KCONFIG:=CONFIG_L2TP \ KCONFIG:=CONFIG_L2TP \
CONFIG_L2TP_V3=y \ CONFIG_L2TP_V3=y \

15
package/kernel/modules/pcmcia.mk
View file

@ -78,17 +78,12 @@ define KernelPackage/pcmcia-serial
KCONFIG:= \ KCONFIG:= \
CONFIG_PCMCIA_SERIAL_CS \ CONFIG_PCMCIA_SERIAL_CS \
CONFIG_SERIAL_8250_CS CONFIG_SERIAL_8250_CS
AUTOLOAD:=$(call AutoLoad,45,serial_cs) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1)
endef FILES:=$(LINUX_DIR)/drivers/tty/serial/serial_cs.ko
else
define KernelPackage/pcmcia-serial/2.4
# KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.ko
endef
define KernelPackage/pcmcia-serial/2.6
# KCONFIG:=CONFIG_SERIAL_8250_CS
FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko
endif
AUTOLOAD:=$(call AutoLoad,45,serial_cs)
endef endef
define KernelPackage/pcmcia-serial/description define KernelPackage/pcmcia-serial/description

4
package/kernel/modules/usb.mk
View file

@ -544,7 +544,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan))
define KernelPackage/usb-serial-wwan define KernelPackage/usb-serial-wwan
TITLE:=Support for GSM and CDMA modems TITLE:=Support for GSM and CDMA modems
DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38
KCONFIG:=CONFIG_USB_SERIAL_WWAN KCONFIG:=CONFIG_USB_SERIAL_WWAN
FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
AUTOLOAD:=$(call AutoLoad,61,usb_wwan) AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
@ -560,7 +560,7 @@ $(eval $(call KernelPackage,usb-serial-wwan))
define KernelPackage/usb-serial-option define KernelPackage/usb-serial-option
TITLE:=Support for Option HSDPA modems TITLE:=Support for Option HSDPA modems
DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-usb-serial-wwan DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-usb-serial-wwan
KCONFIG:=CONFIG_USB_SERIAL_OPTION KCONFIG:=CONFIG_USB_SERIAL_OPTION
FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
AUTOLOAD:=$(call AutoLoad,65,option) AUTOLOAD:=$(call AutoLoad,65,option)

21
package/kernel/modules/video.mk
View file

@ -19,23 +19,18 @@ define KernelPackage/video-core
CONFIG_VIDEO_ALLOW_V4L1=y \ CONFIG_VIDEO_ALLOW_V4L1=y \
CONFIG_VIDEO_CAPTURE_DRIVERS=y \ CONFIG_VIDEO_CAPTURE_DRIVERS=y \
CONFIG_V4L_USB_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y
endef ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1)
FILES:= \
define KernelPackage/video-core/2.4 $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \
FILES:=$(LINUX_DIR)/drivers/media/video/videodev.ko $(LINUX_DIR)/drivers/media/video/videodev.ko
AUTOLOAD:=$(call AutoLoad,60,videodev) AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common)
endef else
define KernelPackage/video-core/2.6
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/media/video/v4l2-common.ko \ $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \
$(LINUX_DIR)/drivers/media/video/v4l1-compat.ko \ $(LINUX_DIR)/drivers/media/video/v4l1-compat.ko \
$(LINUX_DIR)/drivers/media/video/videodev.ko $(LINUX_DIR)/drivers/media/video/videodev.ko
AUTOLOAD:=$(call AutoLoad,60, \ AUTOLOAD:=$(call AutoLoad,60, v4l1-compat videodev v4l2-common)
v4l1-compat \ endif
videodev \
v4l2-common \
)
endef endef
define KernelPackage/video-core/description define KernelPackage/video-core/description