2002-12-30 00:06:13

by Steven Barnhart

[permalink] [raw]
Subject: [PATCH] vlsi_ir.h, add #define for KERNEL_VERSION

This patch defines (what seems to be missing) KERNEL_VERSION for the
header file, include/net/irda/vlsi_ir.h to use. This fixes the bug that
the compiler spits out saying "no binary before (" or something of the
like. drivers/net/irda/vlsi_ir.c now compiles flawlessly.

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.975 -> 1.976
# include/net/irda/vlsi_ir.h 1.5 -> 1.6
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/29 [email protected] 1.976
# [PATCH] Allows /drivers/net/irda/vlsi_ir.c to compile by adding
missing
# #define to the include file include/net/irda/vlsi_ir.h.
# --------------------------------------------
#
diff -Nru a/include/net/irda/vlsi_ir.h b/include/net/irda/vlsi_ir.h
--- a/include/net/irda/vlsi_ir.h Sun Dec 29 19:02:54 2002
+++ b/include/net/irda/vlsi_ir.h Sun Dec 29 19:02:54 2002
@@ -26,8 +26,8 @@

#ifndef IRDA_VLSI_FIR_H
#define IRDA_VLSI_FIR_H
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
+#define KERNEL_VERSION
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
#ifdef CONFIG_PROC_FS
/* PDE() introduced in 2.5.4 */
#define PDE(inode) ((inode)->u.generic_ip)




Attachments:
vlsi_ir.h-patch (1.07 kB)

2002-12-30 00:13:48

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [PATCH] vlsi_ir.h, add #define for KERNEL_VERSION

On Sun, Dec 29, 2002 at 07:14:38PM -0500, Steven Barnhart wrote:
> This patch defines (what seems to be missing) KERNEL_VERSION for the
> header file, include/net/irda/vlsi_ir.h to use. This fixes the bug that
> the compiler spits out saying "no binary before (" or something of the
> like. drivers/net/irda/vlsi_ir.c now compiles flawlessly.

What about including <linux/version.h> instead? :)

2002-12-30 00:52:55

by Steven Barnhart

[permalink] [raw]
Subject: Re: [PATCH] vlsi_ir.h, add #define for KERNEL_VERSION

On Sun, 2002-12-29 at 19:22, Christoph Hellwig wrote:

> What about including <linux/version.h> instead? :)
>

Ok that obviously is better so here is the updated patch. Please apply
and comment on any other problems with that :)

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.976 -> 1.977
# drivers/net/irda/vlsi_ir.c 1.14 -> 1.15
# include/net/irda/vlsi_ir.h 1.6 -> 1.7
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/29 [email protected] 1.977
# [PATCH] Add missing include <linux/version.h> to vlsi_ir.c in place of
previous patch.
# --------------------------------------------
#
diff -Nru a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
--- a/drivers/net/irda/vlsi_ir.c Sun Dec 29 19:59:26 2002
+++ b/drivers/net/irda/vlsi_ir.c Sun Dec 29 19:59:26 2002
@@ -49,7 +49,7 @@
#include <net/irda/irda.h>
#include <net/irda/irda_device.h>
#include <net/irda/wrapper.h>
-
+#include <linux/version.h>
#include <net/irda/vlsi_ir.h>

/********************************************************/
diff -Nru a/include/net/irda/vlsi_ir.h b/include/net/irda/vlsi_ir.h
--- a/include/net/irda/vlsi_ir.h Sun Dec 29 19:59:26 2002
+++ b/include/net/irda/vlsi_ir.h Sun Dec 29 19:59:26 2002
@@ -26,7 +26,7 @@

#ifndef IRDA_VLSI_FIR_H
#define IRDA_VLSI_FIR_H
-#define KERNEL_VERSION
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
#ifdef CONFIG_PROC_FS
/* PDE() introduced in 2.5.4 */


Attachments:
vlsi.c-patch (1.40 kB)