diff options
Diffstat (limited to 'arch/powerpc/platforms/pasemi')
-rw-r--r-- | arch/powerpc/platforms/pasemi/cpufreq.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pasemi/dma_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c index 58556b028a4c..86db47c1b665 100644 --- a/arch/powerpc/platforms/pasemi/cpufreq.c +++ b/arch/powerpc/platforms/pasemi/cpufreq.c | |||
@@ -112,7 +112,7 @@ static int get_gizmo_latency(void) | |||
112 | 112 | ||
113 | static void set_astate(int cpu, unsigned int astate) | 113 | static void set_astate(int cpu, unsigned int astate) |
114 | { | 114 | { |
115 | u64 flags; | 115 | unsigned long flags; |
116 | 116 | ||
117 | /* Return if called before init has run */ | 117 | /* Return if called before init has run */ |
118 | if (unlikely(!sdcasr_mapbase)) | 118 | if (unlikely(!sdcasr_mapbase)) |
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c index 217af321b0ca..a6152d922243 100644 --- a/arch/powerpc/platforms/pasemi/dma_lib.c +++ b/arch/powerpc/platforms/pasemi/dma_lib.c | |||
@@ -509,7 +509,7 @@ fallback: | |||
509 | */ | 509 | */ |
510 | int pasemi_dma_init(void) | 510 | int pasemi_dma_init(void) |
511 | { | 511 | { |
512 | static spinlock_t init_lock = SPIN_LOCK_UNLOCKED; | 512 | static DEFINE_SPINLOCK(init_lock); |
513 | struct pci_dev *iob_pdev; | 513 | struct pci_dev *iob_pdev; |
514 | struct pci_dev *pdev; | 514 | struct pci_dev *pdev; |
515 | struct resource res; | 515 | struct resource res; |