blob: b7a28d1decfdb0dfbf288b25d92cad08d694a10c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- linux-2.6.34/drivers/staging/mrst/drv/psb_intel_display2.c~ 2010-07-26 11:39:36.000000000 -0400
+++ linux-2.6.34/drivers/staging/mrst/drv/psb_intel_display2.c 2010-07-26 12:17:17.904000652 -0400
@@ -798,7 +798,7 @@
static const struct mrst_limit_t *mdfld_limit(struct drm_crtc *crtc)
{
- const struct mrst_limit_t *limit;
+ const struct mrst_limit_t *limit = NULL;
struct drm_device *dev = crtc->dev;
DRM_DRIVER_PRIVATE_T *dev_priv = dev->dev_private;
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index a918553..4759062 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -480,6 +480,10 @@ static void __init pci_mmcfg_reject_broken(int early)
{
struct pci_mmcfg_region *cfg;
+#ifdef CONFIG_X86_MRST
+ return;
+#endif
+
list_for_each_entry(cfg, &pci_mmcfg_list, list) {
int valid = 0;
|
