diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-24 22:01:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-24 22:01:33 -0700 |
| commit | 9eed28679282238210ad5e80bb91df30fec6d7db (patch) | |
| tree | e94e88cb57861c7820371fc8038f87c3631ee178 /drivers | |
| parent | 2099c99e3b24f86b131566aa9854249189ae9ea2 (diff) | |
| parent | 0e64e94e477f8ed04e9295b11a5898d443c28a47 (diff) | |
| download | talos-obmc-linux-9eed28679282238210ad5e80bb91df30fec6d7db.tar.gz talos-obmc-linux-9eed28679282238210ad5e80bb91df30fec6d7db.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DCCP]: Update documentation references.
[ATM] horizon: read_bia() needs to be __devinit
[NETFILTER]: Fix ip6_tables extension header bypass bug
[NETFILTER]: Fix ip6_tables protocol bypass bug
[XFRM]: Fix xfrm_state accounting
[IPV4] ipconfig: fix RARP ic_servaddr breakage
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atm/horizon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 44268cba5a5a..4dc10105d610 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c @@ -1789,7 +1789,7 @@ static inline void CLOCK_IT (const hrz_dev *dev, u32 ctrl) WRITE_IT_WAIT(dev, ctrl | SEEPROM_SK); } -static u16 __init read_bia (const hrz_dev * dev, u16 addr) +static u16 __devinit read_bia (const hrz_dev * dev, u16 addr) { u32 ctrl = rd_regl (dev, CONTROL_0_REG); |
