2.5.24-dj2 doesn't compile with my .config:
* the declaration of intel_i815_setup was missing in agp.h
* there is a superflous '+' in front of one line, probably a leftover 
from a manual merge.


Patch attach, but not tested.

--
	Manfred