[PATCH 2.5] Enable ALIGN #undef for drivers/net/defxx.c

Steven Barnhart (sbarn03@softhome.net)
29 Dec 2002 17:59:12 -0500


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_jive-405-1041202748-0001-2
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

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 */

--=_jive-405-1041202748-0001-2
Content-Type: text/plain; name="cache.h-patch"; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=cache.h-patch

# 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 =20
# include/linux/cache.h 1.5 -> 1.6 =20
#
# 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 vari=
able 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 */

--=_jive-405-1041202748-0001-2--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/