diff -ur mpt-status-1.2.0-RC2/Makefile mpt-status-1.2.0-RC3/Makefile --- mpt-status-1.2.0-RC2/Makefile 2006-04-20 23:27:56.000000000 +0200 +++ mpt-status-1.2.0-RC3/Makefile 2006-04-21 00:33:13.000000000 +0200 @@ -1,27 +1,20 @@ PROG := mpt-status -KERNEL_PATH := /usr/src/linux PREFIX := /usr -CFLAGS := -I${KERNEL_PATH}/drivers/message/fusion -Iincl -Wall -W -O2 +CFLAGS := -Iincl -Wall -W -O2 DFLAGS := -DSANITIZED_KERNEL_HEADERS #-DVAR_DIV LDFLAGS := DESTDIR := CC := gcc INSTALL := install ARCH := $(shell uname -m) -REDHAT := $(shell if [ -e /etc/redhat-release ]; \ - then echo "true"; else echo "false"; fi) -ifeq "${REDHAT}" "true" - DFLAGS := -DREDHAT -endif ifeq "${ARCH}" "sparc64" - CFLAGS := -I${KERNEL_PATH}/drivers/message/fusion -Iincl -Wall -W -O2 \ - -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow + CFLAGS := -Iincl -Wall -W -O2 -m64 -pipe \ + -mcpu=ultrasparc -mcmodel=medlow endif # This part is for the 1.2.0 version of mpt-status #ifeq "${ARCH}" "x86_64" -# CFLAGS := -I${KERNEL_PATH}/drivers/message/fusion -Iincl -Wall -W -O2 \ -# -m64 +# CFLAGS := -Iincl -Wall -W -O2 -m64 #endif ${PROG}: ${PROG}.c ${PROG}.h diff -ur mpt-status-1.2.0-RC2/mpt-status.h mpt-status-1.2.0-RC3/mpt-status.h --- mpt-status-1.2.0-RC2/mpt-status.h 2006-04-20 23:14:49.000000000 +0200 +++ mpt-status-1.2.0-RC3/mpt-status.h 2006-04-21 00:35:05.000000000 +0200 @@ -1,40 +1,18 @@ #ifndef _MPT_STATUS_H #define _MPT_STATUS_H -#ifdef REDHAT -# define __user -# define __kernel -#endif - -/* This is for version 1.2.0 of mpt-status -#ifndef __x86_64__ -#include "pci.h" // config.h and header.h from pciutils package -#include "lsi/mpi_type.h" -#include "lsi/mpi.h" -#include "lsi/mpi_ioc.h" -#include "lsi/mpi_cnfg.h" -#include "mptctl.h" -#else -#include -#include "pci.h" // config.h and header.h from pciutils package -#include "sles.h" -#endif // __x86_64__ -*/ - -#include "pci.h" // config.h and header.h from pciutils package #ifdef SANITIZED_KERNEL_HEADERS #include "mpt-sanitized.h" -/* #else +#include "pci.h" // config.h and header.h from pciutils package #include "lsi/mpi_type.h" #include "lsi/mpi.h" #include "lsi/mpi_ioc.h" #include "lsi/mpi_cnfg.h" #include "mptctl.h" -*/ #endif // SANITIZED_KERNEL_HEADERS -#define VERSION "1.2.0-RC2" +#define VERSION "1.2.0-RC3" #define BIG 1024 #define REALLYBIG 10240