diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 09:48:14 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 18:14:29 -0400 |
| commit | 94c0931983ee9d1cd96c32d52ac64c17464f0bbd (patch) | |
| tree | 188c9d7ef9dfb560563078d6d2f3872291686f58 /arch/microblaze/kernel/Makefile | |
| parent | 5fd200f3b351183b5489cef69961c60af9cead2f (diff) | |
of: Merge of_device_alloc() and of_device_make_bus_id()
This patch merges the common routines of_device_alloc() and
of_device_make_bus_id() from powerpc and microblaze.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: Michal Simek <monstr@monstr.eu>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: microblaze-uclinux@itee.uq.edu.au
CC: linuxppc-dev@ozlabs.org
CC: devicetree-discuss@lists.ozlabs.org
Diffstat (limited to 'arch/microblaze/kernel/Makefile')
| -rw-r--r-- | arch/microblaze/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile index e51bc1520825..727e2cbff9c6 100644 --- a/arch/microblaze/kernel/Makefile +++ b/arch/microblaze/kernel/Makefile | |||
| @@ -15,7 +15,7 @@ endif | |||
| 15 | extra-y := head.o vmlinux.lds | 15 | extra-y := head.o vmlinux.lds |
| 16 | 16 | ||
| 17 | obj-y += dma.o exceptions.o \ | 17 | obj-y += dma.o exceptions.o \ |
| 18 | hw_exception_handler.o init_task.o intc.o irq.o of_device.o \ | 18 | hw_exception_handler.o init_task.o intc.o irq.o \ |
| 19 | of_platform.o process.o prom.o prom_parse.o ptrace.o \ | 19 | of_platform.o process.o prom.o prom_parse.o ptrace.o \ |
| 20 | setup.o signal.o sys_microblaze.o timer.o traps.o reset.o | 20 | setup.o signal.o sys_microblaze.o timer.o traps.o reset.o |
| 21 | 21 | ||