diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/macintosh/adb.c | 5 | ||||
-rw-r--r-- | drivers/macintosh/adbhid.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/via-pmu68k.c | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index dbaad39020a1..61b62a6f681b 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | 48 | ||
49 | EXPORT_SYMBOL(adb_controller); | ||
50 | EXPORT_SYMBOL(adb_client_list); | 49 | EXPORT_SYMBOL(adb_client_list); |
51 | 50 | ||
52 | extern struct adb_driver via_macii_driver; | 51 | extern struct adb_driver via_macii_driver; |
@@ -80,7 +79,7 @@ static struct adb_driver *adb_driver_list[] = { | |||
80 | 79 | ||
81 | static struct class *adb_dev_class; | 80 | static struct class *adb_dev_class; |
82 | 81 | ||
83 | struct adb_driver *adb_controller; | 82 | static struct adb_driver *adb_controller; |
84 | BLOCKING_NOTIFIER_HEAD(adb_client_list); | 83 | BLOCKING_NOTIFIER_HEAD(adb_client_list); |
85 | static int adb_got_sleep; | 84 | static int adb_got_sleep; |
86 | static int adb_inited; | 85 | static int adb_inited; |
@@ -290,7 +289,7 @@ static int adb_resume(struct platform_device *dev) | |||
290 | } | 289 | } |
291 | #endif /* CONFIG_PM */ | 290 | #endif /* CONFIG_PM */ |
292 | 291 | ||
293 | int __init adb_init(void) | 292 | static int __init adb_init(void) |
294 | { | 293 | { |
295 | struct adb_driver *driver; | 294 | struct adb_driver *driver; |
296 | int i; | 295 | int i; |
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index ef4c117ea35f..59ea520a5d7a 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
@@ -75,7 +75,7 @@ static struct notifier_block adbhid_adb_notifier = { | |||
75 | #define ADB_KEY_POWER_OLD 0x7e | 75 | #define ADB_KEY_POWER_OLD 0x7e |
76 | #define ADB_KEY_POWER 0x7f | 76 | #define ADB_KEY_POWER 0x7f |
77 | 77 | ||
78 | u16 adb_to_linux_keycodes[128] = { | 78 | static const u16 adb_to_linux_keycodes[128] = { |
79 | /* 0x00 */ KEY_A, /* 30 */ | 79 | /* 0x00 */ KEY_A, /* 30 */ |
80 | /* 0x01 */ KEY_S, /* 31 */ | 80 | /* 0x01 */ KEY_S, /* 31 */ |
81 | /* 0x02 */ KEY_D, /* 32 */ | 81 | /* 0x02 */ KEY_D, /* 32 */ |
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index e2f84da09e7c..b64741c95ac4 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
@@ -101,7 +101,6 @@ static int pmu_kind = PMU_UNKNOWN; | |||
101 | static int pmu_fully_inited; | 101 | static int pmu_fully_inited; |
102 | 102 | ||
103 | int asleep; | 103 | int asleep; |
104 | BLOCKING_NOTIFIER_HEAD(sleep_notifier_list); | ||
105 | 104 | ||
106 | static int pmu_probe(void); | 105 | static int pmu_probe(void); |
107 | static int pmu_init(void); | 106 | static int pmu_init(void); |
@@ -741,8 +740,8 @@ pmu_handle_data(unsigned char *data, int len) | |||
741 | } | 740 | } |
742 | } | 741 | } |
743 | 742 | ||
744 | int backlight_level = -1; | 743 | static int backlight_level = -1; |
745 | int backlight_enabled = 0; | 744 | static int backlight_enabled = 0; |
746 | 745 | ||
747 | #define LEVEL_TO_BRIGHT(lev) ((lev) < 1? 0x7f: 0x4a - ((lev) << 1)) | 746 | #define LEVEL_TO_BRIGHT(lev) ((lev) < 1? 0x7f: 0x4a - ((lev) << 1)) |
748 | 747 | ||