aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 20:50:50 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 20:50:50 -0400
commit6585b572402e5ec7936422123b44b65fef7a5ea6 (patch)
tree52eef1d14bcf6f6ad6226fca02e8198a30d7abe3 /drivers/net/bnx2.h
parent2ee8099f2c2bc74a7c2fac7f83e12a5d651681d3 (diff)
parentedf03fb0575cbee2595a63374b17dc0921f2094a (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Rework AGPv3 modesetting fallback. [AGPGART] Add suspend callback for i965 [AGPGART] Fix number of aperture sizes in 830 gart structs. [AGPGART] Intel 965 Express support. [AGPGART] agp.h: constify struct agp_bridge_data::version [AGPGART] const'ify VIA AGP PCI table. [AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c [AGPGART] CONFIG_PM=n slim: drivers/char/agp/efficeon-agp.c [AGPGART] Const'ify the agpgart driver version. [AGPGART] remove private page protection map
Diffstat (limited to 'drivers/net/bnx2.h')
0 files changed, 0 insertions, 0 deletions