diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 16:23:52 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 16:23:52 (GMT) |
| commit | 1bc38a1d33a09949cfb6a12349e3c8dac867a5ab (patch) | |
| tree | e3fa41f522857e3416854368b59e2e08c571f55d /drivers/net/can/flexcan.c | |
| parent | ddf2965d77558eefee745c9dce22ad7ef5c7b88e (diff) | |
| parent | a92444c6b2225a9115d661c950cb48a22aeace20 (diff) | |
| download | linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.tar.xz | |
Merge branch 'irq/for-arm' into irq/core
Pull the functionality which is required to cleanup sdhci/sdio
in. It's in a separate branch so it can be pulled from others
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index aaed97b..320bef2 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -235,9 +235,12 @@ static const struct can_bittiming_const flexcan_bittiming_const = { }; /* - * Abstract off the read/write for arm versus ppc. + * Abstract off the read/write for arm versus ppc. This + * assumes that PPC uses big-endian registers and everything + * else uses little-endian registers, independent of CPU + * endianess. */ -#if defined(__BIG_ENDIAN) +#if defined(CONFIG_PPC) static inline u32 flexcan_read(void __iomem *addr) { return in_be32(addr); |