diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/os-support/shared/stdResource.c | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/shared/stdResource.c')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/shared/stdResource.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/os-support/shared/stdResource.c b/xorg-server/hw/xfree86/os-support/shared/stdResource.c index c144211f0..8cb101488 100644 --- a/xorg-server/hw/xfree86/os-support/shared/stdResource.c +++ b/xorg-server/hw/xfree86/os-support/shared/stdResource.c @@ -77,9 +77,6 @@ xf86StdAccResFromOS(resPtr ret) ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x000f0000, 0x000fffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); - RANGE(range, 0x00100000, 0x3fffffff, - ResExcMemBlock | ResBios | ResEstimated); - ret = xf86AddResToList(ret, &range, -1); #if 0 RANGE(range, 0xfec00000, 0xfecfffff, ResExcMemBlock | ResBios); ret = xf86AddResToList(ret, &range, -1); |