Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c2f036 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  gfs2: Drop __TIME__ usage
  isdn/diva: Drop __TIME__ usage
  atm: Drop __TIME__ usage
  dlm: Drop __TIME__ usage
  wan/pc300: Drop __TIME__ usage
  parport: Drop __TIME__ usage
  hdlcdrv: Drop __TIME__ usage
  baycom: Drop __TIME__ usage
  pmcraid: Drop __DATE__ usage
  edac: Drop __DATE__ usage
  rio: Drop __DATE__ usage
  scsi/wd33c93: Drop __TIME__ usage
  scsi/in2000: Drop __TIME__ usage
  aacraid: Drop __TIME__ usage
  media/cx231xx: Drop __TIME__ usage
  media/radio-maxiradio: Drop __TIME__ usage
  nozomi: Drop __TIME__ usage
  cyclades: Drop __TIME__ usage
parents 14587a2a 8d2c50e3

drivers/edac/amd76x_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/edac.h>

#include "edac_core.h"



#define AMD76X_REVISION	" Ver: 2.0.2 "  __DATE__

#define AMD76X_REVISION	" Ver: 2.0.2"

#define EDAC_MOD_STR	"amd76x_edac"



#define amd76x_printk(level, fmt, arg...) \

drivers/edac/amd8111_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "edac_module.h"

#include "amd8111_edac.h"



#define AMD8111_EDAC_REVISION	" Ver: 1.0.0 " __DATE__

#define AMD8111_EDAC_REVISION	" Ver: 1.0.0"

#define AMD8111_EDAC_MOD_STR	"amd8111_edac"



#define PCI_DEVICE_ID_AMD_8111_PCI	0x7460

drivers/edac/amd8131_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "edac_module.h"

#include "amd8131_edac.h"



#define AMD8131_EDAC_REVISION	" Ver: 1.0.0 " __DATE__

#define AMD8131_EDAC_REVISION	" Ver: 1.0.0"

#define AMD8131_EDAC_MOD_STR	"amd8131_edac"



/* Wrapper functions for accessing PCI configuration space */

drivers/edac/cpc925_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "edac_core.h"

#include "edac_module.h"



#define CPC925_EDAC_REVISION	" Ver: 1.0.0 " __DATE__

#define CPC925_EDAC_REVISION	" Ver: 1.0.0"

#define CPC925_EDAC_MOD_STR	"cpc925_edac"



#define cpc925_printk(level, fmt, arg...) \

drivers/edac/e752x_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/edac.h>

#include "edac_core.h"



#define E752X_REVISION	" Ver: 2.0.2 " __DATE__

#define E752X_REVISION	" Ver: 2.0.2"

#define EDAC_MOD_STR	"e752x_edac"



static int report_non_memory_errors;