diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
commit | 3b8d7f4db34913c8e2ea0177723784b646f7424e (patch) | |
tree | 1c28a8a8c273dffd031935f5ee509db5c5e0f386 /drivers/bus | |
parent | f669f023e2ce45ab6e289bd980d435e1dae0e362 (diff) | |
parent | c2f7eb8029e23c4f5445340d8fc0d05367538e6d (diff) |
Merge tag v3.10.42 into linux-linaro-lsk
This is the 3.10.42 stable release
Diffstat (limited to 'drivers/bus')
-rw-r--r-- | drivers/bus/mvebu-mbus.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 8740f46b4d0d..5dcc8305abd1 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -250,12 +250,6 @@ static int mvebu_mbus_window_conflicts(struct mvebu_mbus_state *mbus, */ if ((u64)base < wend && end > wbase) return 0; - - /* - * Check if target/attribute conflicts - */ - if (target == wtarget && attr == wattr) - return 0; } return 1; |