diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /drivers/atm/eni.h | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/atm/eni.h')
| -rw-r--r-- | drivers/atm/eni.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/atm/eni.h b/drivers/atm/eni.h index d04fefb0841f..e4c9525e60b3 100644 --- a/drivers/atm/eni.h +++ b/drivers/atm/eni.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include "midway.h" | 18 | #include "midway.h" |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | #define KERNEL_OFFSET 0xC0000000 /* kernel 0x0 is at phys 0xC0000000 */ | ||
| 22 | #define DEV_LABEL "eni" | 21 | #define DEV_LABEL "eni" |
| 23 | 22 | ||
| 24 | #define UBR_BUFFER (128*1024) /* UBR buffer size */ | 23 | #define UBR_BUFFER (128*1024) /* UBR buffer size */ |