lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6

Browse Source 
* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  spi.h: missing kernel-doc notation, please fix
  of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
  of: Fix missing includes
  ata: update for of_device to platform_device replacement
  microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
  microblaze: Fix of/address: Merge all of the bus translation code
  booting-without-of: Remove nonexistent chapters from TOC, fix numbering
This commit is contained in:
Linus Torvalds
2010-08-18 09:26:17 -07:00
parent 3b89f56783 5c79a5ae23
commit 86ea51d4a2
10 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/serial/of_serial.c
View File

@ -14,11 +14,10 @@
#include <linux/slab.h>
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/nwpserial.h>
#include <asm/prom.h>
struct of_serial_info {
int type;
int line;