diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-19 16:03:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-19 16:03:15 -0500 |
| commit | 32efe08d77f5902ce7315fc9003c010ffffb8268 (patch) | |
| tree | 40a88e6bae4e797cafce33f16a25e350c038f9bb /arch/arm/mach-s5p64x0/pm.c | |
| parent | da1943164677ae2cdd630196b79089d476726348 (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
| download | op-kernel-dev-32efe08d77f5902ce7315fc9003c010ffffb8268.zip op-kernel-dev-32efe08d77f5902ce7315fc9003c010ffffb8268.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-s5p64x0/pm.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c index 23f9b22..9cba18b 100644 --- a/arch/arm/mach-s5p64x0/pm.c +++ b/arch/arm/mach-s5p64x0/pm.c @@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void) } -static int s5p64x0_pm_add(struct device *dev) +static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif) { pm_cpu_prep = s5p64x0_pm_prepare; pm_cpu_sleep = s5p64x0_cpu_suspend; |
