rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge with ARM

This commit is contained in:
Peter Robinson 2012-10-22 10:16:09 +01:00
parent aeb97b1a00 9580bc3940
commit 1fc4e2217f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-generic
View File

@ -2461,7 +2461,7 @@ CONFIG_DRM_NOUVEAU_DEBUG=y
# CONFIG_DRM_PSB is not set
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
CONFIG_DRM_UDL=m
# CONFIG_DRM_UDL is not set
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_FBCON is not set
CONFIG_DRM_VGEM=m
@ -2796,7 +2796,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_PRE_INIT_FB is not set
# CONFIG_FB_TMIO is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_UDL is not set
CONFIG_FB_UDL=m
# CONFIG_FIRMWARE_EDID is not set

3
kernel.spec
View File

@ -2327,6 +2327,9 @@ fi
- Add highbank sata patch
- add patch to revert ARM misaligned access check to stop kernel OOPS
* Sun Oct 21 2012 Josh Boyer <jwboyer@redhat.com>
- Don't enable UDL per Dave Airlie
* Thu Oct 18 2012 Josh Boyer <jwboyer@redhat.com>
- Patch to have mac80211 connect with HT20 if HT40 is not allowed (rhbz 866013)
- Enable VFIO (rhbz 867152)