Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / char / hpet.c

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 0833896cf6f2aeb98721441619a9fdeae0ae54bb..3845ab44c3304e1d2e4ce0f8bfc7455cd5ef6717 100644 (file)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -36,7 +36,6 @@
 #include <linux/io.h>
 
 #include <asm/current.h>
-#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/div64.h>