diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:30:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:30:23 +0200 |
| commit | 1de8644cc7c826e0c41e52825bd5a12e2e31e6ca (patch) | |
| tree | df1e884080599facaf70d2675c480e999da953e1 /include/asm-powerpc/mediabay.h | |
| parent | sched: rt: dont stop the period timer when there are tasks wanting to run (diff) | |
| parent | Slab: Fix memory leak in fallback_alloc() (diff) | |
| download | linux-1de8644cc7c826e0c41e52825bd5a12e2e31e6ca.tar.xz linux-1de8644cc7c826e0c41e52825bd5a12e2e31e6ca.zip | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'include/asm-powerpc/mediabay.h')
| -rw-r--r-- | include/asm-powerpc/mediabay.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-powerpc/mediabay.h b/include/asm-powerpc/mediabay.h index df111c362a7f..b2efb3325808 100644 --- a/include/asm-powerpc/mediabay.h +++ b/include/asm-powerpc/mediabay.h @@ -17,8 +17,6 @@ #define MB_POWER 6 /* media bay contains a Power device (???) */ #define MB_NO 7 /* media bay contains nothing */ -int check_media_bay(struct device_node *which_bay, int what); - /* Number of bays in the machine or 0 */ extern int media_bay_count; @@ -29,6 +27,16 @@ int check_media_bay_by_base(unsigned long base, int what); /* called by IDE PMAC host driver to register IDE controller for media bay */ int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base, int irq, ide_hwif_t *hwif); + +int check_media_bay(struct device_node *which_bay, int what); + +#else + +static inline int check_media_bay(struct device_node *which_bay, int what) +{ + return -ENODEV; +} + #endif #endif /* __KERNEL__ */ |