From 7432f557be790f385caceea01bd0e6b79d0bf612 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 21 Dec 2007 15:19:59 +1100 Subject: [PATCH] --- yaml --- r: 81159 b: refs/heads/master c: 92d1616ec0302266dd753a6c2fc5b2f6e7d36a72 h: refs/heads/master i: 81157: 9a6eb3b9d91b3ac570d6f169666d9fa15c34a12e 81155: 1f064eb61ac84cd5795949d214b7202a6864087e 81151: 3ef13a0506408c08f10c7be38116777f12d5366e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/ibmebus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a8ac603dc4bc..f0beb3d324ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ce890e036338e866922820c075506f25f7abfec +refs/heads/master: 92d1616ec0302266dd753a6c2fc5b2f6e7d36a72 diff --git a/trunk/arch/powerpc/kernel/ibmebus.c b/trunk/arch/powerpc/kernel/ibmebus.c index 72fd87156b24..caae49ff0668 100644 --- a/trunk/arch/powerpc/kernel/ibmebus.c +++ b/trunk/arch/powerpc/kernel/ibmebus.c @@ -52,7 +52,7 @@ static struct device ibmebus_bus_device = { /* fake "parent" device */ struct bus_type ibmebus_bus_type; /* These devices will automatically be added to the bus during init */ -static struct of_device_id builtin_matches[] = { +static struct of_device_id __initdata builtin_matches[] = { { .compatible = "IBM,lhca" }, { .compatible = "IBM,lhea" }, {},