diff --git a/[refs] b/[refs] index ed95771e732a..1ef6a4f0604e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d19397860a17794a250986405890152c256cc677 +refs/heads/master: 9020dea38032ac17b096628b2e102245de3863ac diff --git a/trunk/drivers/staging/slicoss/slic.h b/trunk/drivers/staging/slicoss/slic.h index eb3a619c6a94..cab1a614e3a3 100644 --- a/trunk/drivers/staging/slicoss/slic.h +++ b/trunk/drivers/staging/slicoss/slic.h @@ -168,17 +168,6 @@ struct slic_cmdqueue { struct slic_spinlock lock; }; -#ifdef STATUS_SUCCESS -#undef STATUS_SUCCESS -#endif - -#define STATUS_SUCCESS 0 -#define STATUS_PENDING 0 -#define STATUS_FAILURE -1 -#define STATUS_ERROR -2 -#define STATUS_NOT_SUPPORTED -3 -#define STATUS_BUFFER_TOO_SHORT -4 - #define SLIC_MAX_CARDS 32 #define SLIC_MAX_PORTS 4 /* Max # of ports per card */