From c09e29eba02439c1c3fae69085a6472a8efc8548 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 4 Aug 2009 13:07:23 -0700 Subject: [PATCH] Move p54 usb compat chagnes to 06-usb.patch Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 12 ------------ compat/diffs/06-usb.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 compat/diffs/06-usb.patch diff --git a/compat/compat.diff b/compat/compat.diff index 5e08e870beaa..7b7a88c3c000 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -192,18 +192,6 @@ obj-$(CONFIG_LIBERTAS) += libertas/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ ---- a/drivers/net/wireless/p54/p54usb.c 2009-07-07 13:36:49.523678591 -0700 -+++ b/drivers/net/wireless/p54/p54usb.c 2009-07-07 13:36:49.831718432 -0700 -@@ -1047,7 +1047,9 @@ - .resume = p54u_resume, - .reset_resume = p54u_resume, - #endif /* CONFIG_PM */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) - .soft_unbind = 1, -+#endif - }; - - static int __init p54u_init(void) --- a/drivers/net/wireless/zd1211rw/zd_chip.h 2009-07-06 16:09:14.934197004 -0700 +++ b/drivers/net/wireless/zd1211rw/zd_chip.h 2009-07-06 16:10:01.570226234 -0700 @@ -897,9 +897,9 @@ diff --git a/compat/diffs/06-usb.patch b/compat/diffs/06-usb.patch new file mode 100644 index 000000000000..3bbe439a4119 --- /dev/null +++ b/compat/diffs/06-usb.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/p54/p54usb.c 2009-07-07 13:36:49.523678591 -0700 ++++ b/drivers/net/wireless/p54/p54usb.c 2009-07-07 13:36:49.831718432 -0700 +@@ -1047,7 +1047,9 @@ + .resume = p54u_resume, + .reset_resume = p54u_resume, + #endif /* CONFIG_PM */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + .soft_unbind = 1, ++#endif + }; + + static int __init p54u_init(void) -- 2.30.2