From 96fcf2b599c3179120cfb6a8d898f39c4075b41a Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Tue, 8 Jul 2008 08:42:09 +1000 Subject: [PATCH] --- yaml --- r: 101777 b: refs/heads/master c: 1b17adf19b4d66858f366acd82b4e81cba5edc93 h: refs/heads/master i: 101775: efbbbe700674bc18427ad60309523a1f4607293d v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/ibmebus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b769d97c18dd..0822c2618307 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05781ccd74c63c6c8567f99101587d5c07c163e0 +refs/heads/master: 1b17adf19b4d66858f366acd82b4e81cba5edc93 diff --git a/trunk/arch/powerpc/kernel/ibmebus.c b/trunk/arch/powerpc/kernel/ibmebus.c index e3b1fcd6d991..9d42eb57aea3 100644 --- a/trunk/arch/powerpc/kernel/ibmebus.c +++ b/trunk/arch/powerpc/kernel/ibmebus.c @@ -53,7 +53,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 __initdata builtin_matches[] = { +static struct of_device_id __initdata ibmebus_matches[] = { { .compatible = "IBM,lhca" }, { .compatible = "IBM,lhea" }, {}, @@ -354,7 +354,7 @@ static int __init ibmebus_bus_init(void) return err; } - err = ibmebus_create_devices(builtin_matches); + err = ibmebus_create_devices(ibmebus_matches); if (err) { device_unregister(&ibmebus_bus_device); bus_unregister(&ibmebus_bus_type);