From dbd097ead22b0640007e2a20e9af460d0af48a16 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 21 Jan 2012 02:08:26 -0800 Subject: [PATCH] --- yaml --- r: 294703 b: refs/heads/master c: 2934a0de095f277a7bbc15a72ecf61af31a45163 h: refs/heads/master i: 294701: 2dd6a563d1b646065bd234c439dc09f3aa7d2472 294699: de0ee912b7e442a8de3935bd0b034c5dee69e5c2 294695: 3c8793c6c9bd490f032d501b0eff8a7d6b5316a3 294687: ba17b23bb7c63283acb7cc70dacbf62e1ac7a635 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 6 ++++++ trunk/include/linux/ioport.h | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bf5f6a45ae9d..146f9cdf26e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78c3b329b9dd7097781cb900146e503e499cccfe +refs/heads/master: 2934a0de095f277a7bbc15a72ecf61af31a45163 diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index f233d127ca89..b067a4cdce43 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/trunk/drivers/pci/setup-bus.c @@ -27,6 +27,12 @@ #include #include "pci.h" +struct resource_list { + struct resource_list *next; + struct resource *res; + struct pci_dev *dev; +}; + struct resource_list_x { struct resource_list_x *next; struct resource *res; diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h index 9d57a71775b5..e885ba23de70 100644 --- a/trunk/include/linux/ioport.h +++ b/trunk/include/linux/ioport.h @@ -23,12 +23,6 @@ struct resource { struct resource *parent, *sibling, *child; }; -struct resource_list { - struct resource_list *next; - struct resource *res; - struct pci_dev *dev; -}; - /* * IO resources have these defined flags. */