public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Barnhart <sbarn03@softhome.net>
To: alan@redhat.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2.5] Enable ALIGN #undef for drivers/net/defxx.c
Date: 29 Dec 2002 17:59:12 -0500	[thread overview]
Message-ID: <1041202757.19002.3.camel@sbarn.net> (raw)

[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]

The following patch #undef's the variable ALIGN in include/linux/cache.h
so that drivers/net/defxx.c can use the same variable. Patch has been
tested and defxx.c compiles. Please apply.

Steven

--------

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or
higher.
# This patch includes the following deltas:
#	           ChangeSet	1.974   -> 1.975  
#	include/linux/cache.h	1.5     -> 1.6    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/29	steven@sbarn.net	1.975
# [PATCH] This patch allows drivers/net/defxx.c to compile and use the
variable ALIGN which was left defined by include/linux/cache.h.
# --------------------------------------------
#
diff -Nru a/include/linux/cache.h b/include/linux/cache.h
--- a/include/linux/cache.h	Sun Dec 29 17:39:44 2002
+++ b/include/linux/cache.h	Sun Dec 29 17:39:44 2002
@@ -52,5 +52,5 @@
 #define ____cacheline_maxaligned_in_smp
 #endif
 #endif
-
+#undef ALIGN
 #endif /* __LINUX_CACHE_H */


[-- Attachment #2: cache.h-patch --]
[-- Type: text/plain, Size: 927 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.974   -> 1.975  
#	include/linux/cache.h	1.5     -> 1.6    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/29	steven@sbarn.net	1.975
# [PATCH] This patch allows drivers/net/defxx.c to compile and use the variable ALIGN which was left defined by include/linux/cache.h.
# --------------------------------------------
#
diff -Nru a/include/linux/cache.h b/include/linux/cache.h
--- a/include/linux/cache.h	Sun Dec 29 17:39:44 2002
+++ b/include/linux/cache.h	Sun Dec 29 17:39:44 2002
@@ -52,5 +52,5 @@
 #define ____cacheline_maxaligned_in_smp
 #endif
 #endif
-
+#undef ALIGN
 #endif /* __LINUX_CACHE_H */

             reply	other threads:[~2002-12-29 22:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-12-29 22:59 Steven Barnhart [this message]
2002-12-30  0:06 ` [PATCH 2.5] Enable ALIGN #undef for drivers/net/defxx.c Andrew Morton
2002-12-30  0:10   ` Steven Barnhart

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=1041202757.19002.3.camel@sbarn.net \
    --to=sbarn03@softhome.net \
    --cc=alan@redhat.com \
    --cc=linux-kernel@vger.kernel.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