x86: fix mismerge in arch/x86/include/asm/timer.h
[linux-2.6] / drivers / platform /
drwxr-xr-x   ..
-rw-r--r-- 79 Kconfig
-rw-r--r-- 70 Makefile
drwxr-xr-x - x86