Hopefully you have your old xorg.conf backed up. Put it into /etc/X11 and reboot and all should be fine. I had exactly that error in Xorg.0.log and all is now fine with a xorg.conf installed.