I ran into the same problem. It looks like it is caused by the symlink between /usr/src/linux and the new 2.6.0 kernel source. /usr/include/bits/socket.h is looking for asm/socket.h

it turns out that /usr/include/asm is a symlink back to /usr/src/linux/include/asm - which is now pointing into the 2.6.0 kernel source.

I am going try pointing the symlink /usr/src/linux back to the old location, and try out 'make xconfig' - then reswitch the link back to 2.6.0 before building the kernel.