diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 05:38:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 05:38:22 -0700 |
| commit | a7b43a568bac5ac97a89f2efecef3526f2fd0be3 (patch) | |
| tree | 76c8269e9a99af43a3c155f63a646362f870d692 /include | |
| parent | 574ad93f680e0a0b3cd955ffe18e3bfb0fd0ec79 (diff) | |
| parent | 4fd065e61a4c766ad5a280fa86dca9783eaacab6 (diff) | |
Merge bk://kernel.bkbits.net/acme/net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cycx_drv.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/cycx_drv.h b/include/linux/cycx_drv.h index 30294cc00297..93e239e1bca8 100644 --- a/include/linux/cycx_drv.h +++ b/include/linux/cycx_drv.h @@ -37,10 +37,6 @@ #define DATA_OFFSET 0x0100 /* For code and data files load */ #define START_OFFSET 0x3ff0 /* 80186 starts here */ -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - /** * struct cycx_hw - Adapter hardware configuration * @fwid - firmware ID |