update more stuff

TODO: fix it up.

Signed-off-by: maximilian attems <maks@debian.org>

svn path=/dists/trunk/linux/; revision=22353
This commit is contained in:
Maximilian Attems 2015-02-08 20:20:12 +00:00
parent 11a6bf0679
commit f89db51cd6
2 changed files with 5 additions and 37 deletions

View File

@ -1,33 +0,0 @@
From: Arnaud Patard <arnaud.patard@rtp-net.org>
Subject: drivers/usb/musb/Kconfig: remove the 'Glue Layer' choice.
Forwarded: no
In the config.omap configuration, we're setting CONFIG_USB_MUSB_OMAP2PLUS
to 'y' but after running the script to create our configuration file, it's
set to 'm', even if 'y' is valid. This result in an invalid configuration
and build failure (missing omap_musb_mailbox symbol in our kernel binary).
Removing the choice entry make things work.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -56,9 +56,6 @@ config USB_MUSB_DUAL_ROLE
endchoice
-choice
- prompt "Platform Glue Layer"
-
config USB_MUSB_DAVINCI
tristate "DaVinci"
depends on ARCH_DAVINCI_DMx
@@ -99,8 +96,6 @@ config USB_MUSB_JZ4740
depends on USB_MUSB_GADGET
depends on USB_OTG_BLACKLIST_HUB
-endchoice
-
config USB_MUSB_AM335X_CHILD
tristate

View File

@ -24,8 +24,9 @@ debian/fs-enable-link-security-restrictions-by-default.patch
# Set various features runtime-disabled by default
debian/sched-autogroup-disabled.patch
features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
debian/cgroups-Document-the-Debian-memory-resource-controll.patch
# TODO: check 9edad6ea0f1416415f6fe31cc9d1dbc3817803ed
# features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
# debian/cgroups-Document-the-Debian-memory-resource-controll.patch
debian/yama-disable-by-default.patch
debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
@ -37,9 +38,9 @@ debian/snd-pcsp-disable-autoload.patch
bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
# Arch bug fixes
bugfix/arm/omap-musb-choice.patch
bugfix/mips/disable-advansys.patch
bugfix/m68k/ethernat-kconfig.patch
# TODO:
#bugfix/m68k/ethernat-kconfig.patch
bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
bugfix/x86/acpi-video-run-_bcl-before-deciding-registering-back.patch