git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/core
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
quirks.c
diff --git
a/arch/x86/kernel/quirks.c
b/arch/x86/kernel/quirks.c
index
697d1b7
..
e95022e
100644
(file)
--- a/
arch/x86/kernel/quirks.c
+++ b/
arch/x86/kernel/quirks.c
@@
-74,8
+74,7
@@
static void ich_force_hpet_resume(void)
if (!force_hpet_address)
return;
- if (rcba_base == NULL)
- BUG();
+ BUG_ON(rcba_base == NULL);
/* read the Function Disable register, dword mode only */
val = readl(rcba_base + 0x3404);