summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/nhk8815/setup.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-06-06 14:11:57 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-06-06 14:11:57 +0200
commit497d1c49f4b75a6827bb400513d53a39dc8bb57c (patch)
tree3227133463cb942c4d5be45108aab82e79daa98c /arch/arm/boards/nhk8815/setup.c
parent94418c2d0d3d7dbaa6995fb53f00a5d5fc9f4028 (diff)
parent4024d9ca11295b63dd2b9b795a8f1019b9bba64a (diff)
downloadbarebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.gz
barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.xz
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/nhk8815/setup.c')
-rw-r--r--arch/arm/boards/nhk8815/setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c
index ae76124c7f..173892acd8 100644
--- a/arch/arm/boards/nhk8815/setup.c
+++ b/arch/arm/boards/nhk8815/setup.c
@@ -103,11 +103,11 @@ static int nhk8815_devices_init(void)
armlinux_set_architecture(MACH_TYPE_NOMADIK);
armlinux_set_bootparams((void *)(0x00000100));
- devfs_add_partition("nand0", 0x0000000, 0x040000, PARTITION_FIXED, "xloader_raw");
- devfs_add_partition("nand0", 0x0040000, 0x080000, PARTITION_FIXED, "meminit_raw");
- devfs_add_partition("nand0", 0x0080000, 0x200000, PARTITION_FIXED, "self_raw");
+ devfs_add_partition("nand0", 0x0000000, 0x040000, DEVFS_PARTITION_FIXED, "xloader_raw");
+ devfs_add_partition("nand0", 0x0040000, 0x080000, DEVFS_PARTITION_FIXED, "meminit_raw");
+ devfs_add_partition("nand0", 0x0080000, 0x200000, DEVFS_PARTITION_FIXED, "self_raw");
dev_add_bb_dev("self_raw", "self0");
- devfs_add_partition("nand0", 0x7FE0000, 0x020000, PARTITION_FIXED, "env_raw");
+ devfs_add_partition("nand0", 0x7FE0000, 0x020000, DEVFS_PARTITION_FIXED, "env_raw");
dev_add_bb_dev("env_raw", "env0");
return 0;