Skip to content

L
linux
Commit 4143a413 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6 

into nuts.davemloft.net:/disk1/BK/sparc-2.6
parents dc5178fa bce3bd85
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
arch/sparc/kernel/entry.S
View file @ 4143a413
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#define curptr g6 #define curptr g6
#define NR_SYSCALLS 272 /* Each OS is different... */ #define NR_SYSCALLS 273 /* Each OS is different... */
/* These are just handy. */ /* These are just handy. */
#define _SV save %sp, -STACKFRAME_SZ, %sp #define _SV save %sp, -STACKFRAME_SZ, %sp
......
arch/sparc64/kernel/entry.S
View file @ 4143a413
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define curptr g6 #define curptr g6
#define NR_SYSCALLS 272 /* Each OS is different... */ #define NR_SYSCALLS 273 /* Each OS is different... */
.text .text
.align 32 .align 32
......
sound/sparc/cs4231.c
View file @ 4143a413
...@@ -1570,8 +1570,8 @@ int snd_cs4231_pcm(cs4231_t *chip) ...@@ -1570,8 +1570,8 @@ int snd_cs4231_pcm(cs4231_t *chip)
#ifdef EBUS_SUPPORT #ifdef EBUS_SUPPORT
if (chip->flags & CS4231_FLAG_EBUS) { if (chip->flags & CS4231_FLAG_EBUS) {
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI, snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
snd_dma_pci_data(chip->dev_u.pdev) snd_dma_pci_data(chip->dev_u.pdev),
64*1024, 128*1024); 64*1024, 128*1024);
} else { } else {
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7