diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:33:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:33:21 -0700 |
| commit | 3230ca9dc656a2354b679e2e62ee7740485563a9 (patch) | |
| tree | b5659a952454efe7ef18e6f34bf123e948ae413e /arch/unicore32/kernel/puv3-core.c | |
| parent | 7dbb25a579fe1f068358a19928ada4f9be62e60d (diff) | |
| parent | 6b794743b2c5e21825d35b5d5dd57d6fcc388198 (diff) | |
Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32
* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
unicore32 framebuffer fix: get videomemory by __get_free_pages() and make it floatable
unicore32 core architecture: remove duplicated #include
unicore32 rtc driver fix: cleanup irq_set_freq and irq_set_state
unicore32 fix: remove arch-specific futex support
unicore32 ldscript fix: add cacheline parameter to PERCPU() macro
Diffstat (limited to 'arch/unicore32/kernel/puv3-core.c')
| -rw-r--r-- | arch/unicore32/kernel/puv3-core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c index 8b1b6beb858e..1a505a787765 100644 --- a/arch/unicore32/kernel/puv3-core.c +++ b/arch/unicore32/kernel/puv3-core.c @@ -99,11 +99,6 @@ static struct resource puv3_unigfx_resources[] = { .end = io_v2p(PKUNITY_UNIGFX_BASE) + 0xfff, .flags = IORESOURCE_MEM, }, - [1] = { - .start = PKUNITY_UNIGFX_MMAP_BASE, - .end = PKUNITY_UNIGFX_MMAP_BASE + PKUNITY_UNIGFX_MMAP_SIZE, - .flags = IORESOURCE_MEM, - }, }; static struct resource puv3_rtc_resources[] = { |