Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211156
b: refs/heads/master
c: e53ced1
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Oct 1, 2010
1 parent f2df3f7 commit 9a86b4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 63d66cab4755edc86ddc5b78cae657a3fda908e1
refs/heads/master: e53ced1b02a18fb006fc13c1658bb454ed6cf63c
6 changes: 3 additions & 3 deletions trunk/arch/m68k/mac/macboing.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static void mac_init_asc( void )
void mac_mksound( unsigned int freq, unsigned int length )
{
__u32 cfreq = ( freq << 5 ) / 468;
__u32 flags;
unsigned long flags;
int i;

if ( mac_special_bell == NULL )
Expand Down Expand Up @@ -224,7 +224,7 @@ static void mac_nosound( unsigned long ignored )
*/
static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsigned int volume )
{
__u32 flags;
unsigned long flags;

/* if the bell is already ringing, ring longer */
if ( mac_bell_duration > 0 )
Expand Down Expand Up @@ -271,7 +271,7 @@ static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsig
static void mac_quadra_ring_bell( unsigned long ignored )
{
int i, count = mac_asc_samplespersec / HZ;
__u32 flags;
unsigned long flags;

/*
* we neither want a sound buffer overflow nor underflow, so we need to match
Expand Down

0 comments on commit 9a86b4b

Please sign in to comment.