diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 19:53:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 19:53:11 -0400 |
commit | e0e170bd7ded2ec16e2813d63c0faff43193fde8 (patch) | |
tree | 2f06008b61ef2eedf8f77d1326e286a64e426ef6 /arch/microblaze/platform/platform.c | |
parent | b20f9e5bddddb5ef0d743d6e0d409ffc8cf9fc56 (diff) | |
parent | b843e4ec01991a386a9e0e9030703524446e03da (diff) |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits)
microblaze: Fix build with make 3.82
fbdev/xilinxfb: Microblaze driver support
microblaze: Support C optimized lib functions for little-endian
microblaze: Separate library optimized functions
microblaze: Support timer on AXI lite
microblaze: Add support for little-endian Microblaze
microblaze: KGDB little endian support
microblaze: Add PVR for endians plus detection
net: emaclite: Add support for little-endian platforms
microblaze: trivial: Add comment for AXI pvr
microblaze: pci-common cleanup
microblaze: Support early console on uart16550
microblaze: Do not compile early console support for uartlite if is disabled
microblaze: Setup early console dynamically
microblaze: Rename all uartlite early printk functions
microblaze: remove early printk uarlite console dependency from header
microblaze: Remove additional compatible properties
microblaze: Remove hardcoded asm instraction for PVR loading
microblaze: Use static const char * const where possible
microblaze: Define VMALLOC_START/END
...
Diffstat (limited to 'arch/microblaze/platform/platform.c')
-rw-r--r-- | arch/microblaze/platform/platform.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/platform/platform.c b/arch/microblaze/platform/platform.c index 5b89b58c5ae..b9529caa507 100644 --- a/arch/microblaze/platform/platform.c +++ b/arch/microblaze/platform/platform.c | |||
@@ -17,9 +17,6 @@ | |||
17 | 17 | ||
18 | static struct of_device_id xilinx_of_bus_ids[] __initdata = { | 18 | static struct of_device_id xilinx_of_bus_ids[] __initdata = { |
19 | { .compatible = "simple-bus", }, | 19 | { .compatible = "simple-bus", }, |
20 | { .compatible = "xlnx,plb-v46-1.00.a", }, | ||
21 | { .compatible = "xlnx,opb-v20-1.10.c", }, | ||
22 | { .compatible = "xlnx,opb-v20-1.10.b", }, | ||
23 | { .compatible = "xlnx,compound", }, | 20 | { .compatible = "xlnx,compound", }, |
24 | {} | 21 | {} |
25 | }; | 22 | }; |