diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2013-03-31 01:08:22 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-05-09 01:07:09 -0700 |
| commit | b06c14e5c11a7e3fb9b4d94bb83847bf1fbbdaa3 (patch) | |
| tree | 5aef759d2d707634460fa42705b6eabc96ac9f78 /arch/xtensa | |
| parent | 5e44fd012bf3366e3a4c73a06f63756f92d39f06 (diff) | |
| download | linux-stable-b06c14e5c11a7e3fb9b4d94bb83847bf1fbbdaa3.tar.gz linux-stable-b06c14e5c11a7e3fb9b4d94bb83847bf1fbbdaa3.tar.bz2 linux-stable-b06c14e5c11a7e3fb9b4d94bb83847bf1fbbdaa3.zip | |
xtensa: provide default platform_pcibios_init implementation
This fixes the following build error:
arch/xtensa/kernel/built-in.o:(.init.literal+0xe8): undefined reference
to `platform_pcibios_init'
arch/xtensa/kernel/built-in.o: In function `setup_arch':
(.init.text+0x20e): undefined reference to `platform_pcibios_init'
and allows platform to omit definition of platform_pcibios_init if it's
empty.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/platform.c | 1 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/setup.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c index 44bf21c3769a..2bd6c351f37c 100644 --- a/arch/xtensa/kernel/platform.c +++ b/arch/xtensa/kernel/platform.c @@ -36,6 +36,7 @@ _F(void, power_off, (void), { while(1); }); _F(void, idle, (void), { __asm__ __volatile__ ("waiti 0" ::: "memory"); }); _F(void, heartbeat, (void), { }); _F(int, pcibios_fixup, (void), { return 0; }); +_F(void, pcibios_init, (void), { }); #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT _F(void, calibrate_ccount, (void), diff --git a/arch/xtensa/platforms/iss/setup.c b/arch/xtensa/platforms/iss/setup.c index b68916fd0d7a..da7d18240866 100644 --- a/arch/xtensa/platforms/iss/setup.c +++ b/arch/xtensa/platforms/iss/setup.c @@ -38,12 +38,6 @@ void __init platform_init(bp_tag_t* bootparam) } -#ifdef CONFIG_PCI -void platform_pcibios_init(void) -{ -} -#endif - void platform_halt(void) { pr_info(" ** Called platform_halt() **\n"); |