From: Hauke Mehrtens Date: Tue, 7 Jun 2016 21:10:45 +0000 (+0200) Subject: lantiq: remove patch adding support for building without reset controller X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ecdfbeae85d7ab1eaafbed702778dae7389a58c8;p=openwrt%2Fstaging%2Fnbd.git lantiq: remove patch adding support for building without reset controller The lantiq kernel arch code selects CONFIG_RESET_CONTROLLER always, so it is always selected when the lantiq target is build. we do not need support for unselected CONFIG_RESET_CONTROLLER option. Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/lantiq/patches-4.4/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch b/target/linux/lantiq/patches-4.4/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch deleted file mode 100644 index ddbe134c1b..0000000000 --- a/target/linux/lantiq/patches-4.4/0034-reset-Fix-compile-when-reset-RESET_CONTROLLER-is-not.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b1b9fca8c317afc3f2b78bb54f877e8a830a819d Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Fri, 9 Aug 2013 18:47:27 +0200 -Subject: [PATCH 34/36] reset: Fix compile when reset RESET_CONTROLLER is not - selected - -Drivers need to protect their reset api calls with #ifdef to avoid compile -errors. - -This patch adds dummy wrappers in the same way that linux/of.h does it. - -Cc: linux-kernel@vger.kernel.org -Cc: Philipp Zabel -Cc: Gabor Juhos ---- - include/linux/reset-controller.h | 16 ++++++++++++++ - include/linux/reset.h | 43 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+) - ---- a/include/linux/reset-controller.h -+++ b/include/linux/reset-controller.h -@@ -48,7 +48,23 @@ struct reset_controller_dev { - unsigned int nr_resets; - }; - -+#if defined(CONFIG_RESET_CONTROLLER) -+ - int reset_controller_register(struct reset_controller_dev *rcdev); - void reset_controller_unregister(struct reset_controller_dev *rcdev); - -+#else -+ -+static inline int reset_controller_register(struct reset_controller_dev *rcdev) -+{ -+ return -ENOSYS; -+} -+ -+void reset_controller_unregister(struct reset_controller_dev *rcdev) -+{ -+ -+} -+ -+#endif -+ - #endif