diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 08:01:14 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 08:01:14 +0200 |
commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /drivers/net/gianfar.h | |
parent | sh: plug vsyscall dir in to archclean. (diff) | |
parent | Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
download | linux-cf9fe114e3b37e14fc8434d5abb192e35df551b1.tar.xz linux-cf9fe114e3b37e14fc8434d5abb192e35df551b1.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/gianfar.h')
-rw-r--r-- | drivers/net/gianfar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 0642d52aef5c..cf352961ae9b 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h @@ -259,7 +259,7 @@ extern const char gfar_driver_version[]; (IEVENT_RXC | IEVENT_BSY | IEVENT_EBERR | IEVENT_MSRO | \ IEVENT_BABT | IEVENT_TXC | IEVENT_TXE | IEVENT_LC \ | IEVENT_CRL | IEVENT_XFUN | IEVENT_DPE | IEVENT_PERR \ - | IEVENT_MAG) + | IEVENT_MAG | IEVENT_BABR) #define IMASK_INIT_CLEAR 0x00000000 #define IMASK_BABR 0x80000000 |