Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297645
b: refs/heads/master
c: 17d971e
h: refs/heads/master
i:
  297643: abc4852
v: v3
  • Loading branch information
Rob Herring committed Mar 7, 2012
1 parent aa0f0ad commit 396b60e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21a5365b03975e2425e030ad072f32a9dd3387fb
refs/heads/master: 17d971e5dceef87bb6fe179a942c8f6191afbab9
4 changes: 0 additions & 4 deletions trunk/arch/arm/mach-iop13xx/include/mach/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,5 @@
#define __mem_isa(a) (a)

extern void __iomem * __iop13xx_io(unsigned long io_addr);
extern u32 iop13xx_atue_mem_base;
extern u32 iop13xx_atux_mem_base;
extern size_t iop13xx_atue_mem_size;
extern size_t iop13xx_atux_mem_size;

#endif
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-iop13xx/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <linux/io.h>
#include <mach/hardware.h>

#include "pci.h"

void * __iomem __iop13xx_io(unsigned long io_addr)
{
void __iomem * io_virt;
Expand Down
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-iop13xx/pci.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include <linux/types.h>

extern u32 iop13xx_atue_mem_base;
extern u32 iop13xx_atux_mem_base;
extern size_t iop13xx_atue_mem_size;
extern size_t iop13xx_atux_mem_size;

0 comments on commit 396b60e

Please sign in to comment.