From: Hauke Mehrtens <hauke@hauke-m.de>
To: lrodriguez@atheros.com
Cc: linux-wireless@vger.kernel.org, mcgrof@infradead.org,
Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 2/4] compat: move va_format to compat-2.6.36.h
Date: Sat, 7 Aug 2010 15:32:19 +0200 [thread overview]
Message-ID: <1281187941-7168-3-git-send-email-hauke@hauke-m.de> (raw)
In-Reply-To: <1281187941-7168-1-git-send-email-hauke@hauke-m.de>
This struct was introduced in kernel 2.6.36 and not 2.6.35.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
include/linux/compat-2.6.35.h | 5 -----
include/linux/compat-2.6.36.h | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/compat-2.6.35.h b/include/linux/compat-2.6.35.h
index d2e82cc..f0562cd 100644
--- a/include/linux/compat-2.6.35.h
+++ b/include/linux/compat-2.6.35.h
@@ -8,11 +8,6 @@
#include <net/sock.h>
#include <linux/types.h>
-struct va_format {
- const char *fmt;
- va_list *va;
-};
-
/* added on linux/kernel.h */
#define USHRT_MAX ((u16)(~0U))
#define SHRT_MAX ((s16)(USHRT_MAX>>1))
diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
index 0307108..b14c772 100644
--- a/include/linux/compat-2.6.36.h
+++ b/include/linux/compat-2.6.36.h
@@ -8,6 +8,11 @@
#define kparam_block_sysfs_write(a)
#define kparam_unblock_sysfs_write(a)
+struct va_format {
+ const char *fmt;
+ va_list *va;
+};
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */
#endif /* LINUX_26_36_COMPAT_H */
--
1.7.0.4
next prev parent reply other threads:[~2010-08-07 13:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-07 13:32 [PATCH 0/4] compat: miscellaneous updates for compat Hauke Mehrtens
2010-08-07 13:32 ` [PATCH 1/4] compat: backport n_tty_ioctl_helper Hauke Mehrtens
2010-08-07 13:32 ` Hauke Mehrtens [this message]
2010-08-07 15:50 ` [PATCH 2/4] compat: move va_format to compat-2.6.36.h Johannes Berg
2010-08-07 17:20 ` Hauke Mehrtens
2010-08-08 8:01 ` Johannes Berg
2010-08-07 13:32 ` [PATCH 3/4] compat: fix compiler warning Hauke Mehrtens
2010-08-07 13:32 ` [PATCH 4/4] compat: update compat_firmware_class.c Hauke Mehrtens
2010-08-10 1:18 ` [PATCH 0/4] compat: miscellaneous updates for compat Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281187941-7168-3-git-send-email-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=linux-wireless@vger.kernel.org \
--cc=lrodriguez@atheros.com \
--cc=mcgrof@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).