git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
amiga
/
amisound.c
diff --git
a/arch/m68k/amiga/amisound.c
b/arch/m68k/amiga/amisound.c
index
cb5d936
..
1f5bfb5
100644
(file)
--- a/
arch/m68k/amiga/amisound.c
+++ b/
arch/m68k/amiga/amisound.c
@@
-8,7
+8,6
@@
* for more details.
*/
* for more details.
*/
-#include <linux/config.h>
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/timer.h>
#include <linux/init.h>
@@
-24,6
+23,8
@@
static const signed char sine_data[] = {
};
#define DATA_SIZE (sizeof(sine_data)/sizeof(sine_data[0]))
};
#define DATA_SIZE (sizeof(sine_data)/sizeof(sine_data[0]))
+#define custom amiga_custom
+
/*
* The minimum period for audio may be modified by the frame buffer
* device since it depends on htotal (for OCS/ECS/AGA)
/*
* The minimum period for audio may be modified by the frame buffer
* device since it depends on htotal (for OCS/ECS/AGA)
@@
-63,7
+64,7
@@
void __init amiga_init_sound(void)
}
static void nosound( unsigned long ignored );
}
static void nosound( unsigned long ignored );
-static
struct timer_list sound_timer = TIMER_INITIALIZER(
nosound, 0, 0);
+static
DEFINE_TIMER(sound_timer,
nosound, 0, 0);
void amiga_mksound( unsigned int hz, unsigned int ticks )
{
void amiga_mksound( unsigned int hz, unsigned int ticks )
{