aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/boot/bootp.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-24 15:16:02 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-24 15:16:02 +0900
commitf34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch)
treee53c9e39b3149221779c10595bc59fa02de4f45f /arch/alpha/boot/bootp.c
parent76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff)
parent32b53076c31ce9159740b744d5eb5d9505312add (diff)
downloadkernel_samsung_espresso10-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.zip
kernel_samsung_espresso10-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.gz
kernel_samsung_espresso10-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.bz2
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/alpha/boot/bootp.c')
-rw-r--r--arch/alpha/boot/bootp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c
index 3af21c7..3c8d1b2 100644
--- a/arch/alpha/boot/bootp.c
+++ b/arch/alpha/boot/bootp.c
@@ -9,7 +9,7 @@
*/
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
#include <linux/mm.h>
#include <asm/system.h>