From 8443831d25d29562c09c225bfb27a7f1fcdd16f7 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@mindspring.com>
Date: Thu, 12 Jul 2007 18:31:08 -0400
Subject: [PATCH] --- yaml --- r: 61404 b: refs/heads/master c:
 f3e26984f1794f3472a50f330c5561766faa477b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/avr32/kernel/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97bd25722d67..91f815b738bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa15f63790cfd4110ff57c37aa1c6c34133d8a09
+refs/heads/master: f3e26984f1794f3472a50f330c5561766faa477b
diff --git a/trunk/arch/avr32/kernel/setup.c b/trunk/arch/avr32/kernel/setup.c
index bf1f01600c24..d08b0bc6b2bb 100644
--- a/trunk/arch/avr32/kernel/setup.c
+++ b/trunk/arch/avr32/kernel/setup.c
@@ -313,7 +313,7 @@ __tagtable(ATAG_MEM, parse_tag_mem);
 
 static int __init parse_tag_rdimg(struct tag *tag)
 {
-#ifdef CONFIG_INITRD
+#ifdef CONFIG_BLK_DEV_INITRD
 	struct tag_mem_range *mem = &tag->u.mem_range;
 	int ret;