Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83145
b: refs/heads/master
c: deea777
h: refs/heads/master
i:
  83143: 4f4ac13
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Feb 5, 2008
1 parent 75c3d40 commit 1fac5c8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 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: 99ffab81071b7088ddebd4be9bbf1ad03c2a9e98
refs/heads/master: deea7775e2ae460aace0bf7b5bb2ff3b412017f1
2 changes: 1 addition & 1 deletion trunk/arch/m68k/mac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
#

obj-y := config.o bootparse.o macints.o iop.o via.o oss.o psc.o \
baboon.o macboing.o debug.o misc.o mac_ksyms.o
baboon.o macboing.o debug.o misc.o
8 changes: 0 additions & 8 deletions trunk/arch/m68k/mac/mac_ksyms.c

This file was deleted.

5 changes: 4 additions & 1 deletion trunk/arch/m68k/mac/via.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/ide.h>
#include <linux/module.h>

#include <asm/bootinfo.h>
#include <asm/macintosh.h>
Expand All @@ -41,7 +42,9 @@ volatile __u8 *via1, *via2;
/* See note in mac_via.h about how this is possibly not useful */
volatile long *via_memory_bogon=(long *)&via_memory_bogon;
#endif
int rbv_present, via_alt_mapping;
int rbv_present;
int via_alt_mapping;
EXPORT_SYMBOL(via_alt_mapping);
__u8 rbv_clear;

/*
Expand Down

0 comments on commit 1fac5c8

Please sign in to comment.