diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h | |
| parent | drivers/net: delete orphaned MCA ibmlana driver content (diff) | |
| parent | tg3: Fix crc errors on jumbo frame receive (diff) | |
| download | linux-dev-4b87f922598acf91eee18f71688a33f54f57bcde.tar.xz linux-dev-4b87f922598acf91eee18f71688a33f54f57bcde.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h index e69a8bdc6e97..ca2f6bf37f46 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h @@ -13,6 +13,7 @@ struct nvbios_init { u32 nested; u16 repeat; u16 repend; + u32 ramcfg; }; int nvbios_exec(struct nvbios_init *); |