Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
dadb830d
Commit
dadb830d
authored
Feb 28, 2007
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SUNGEM]: __sparc__ --> CONFIG_SPARC
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
9f47df26
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
drivers/net/sungem.c
drivers/net/sungem.c
+4
-4
No files found.
drivers/net/sungem.c
View file @
dadb830d
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/irq.h>
#ifdef
__sparc__
#ifdef
CONFIG_SPARC
#include <asm/idprom.h>
#include <asm/idprom.h>
#include <asm/openprom.h>
#include <asm/openprom.h>
#include <asm/oplib.h>
#include <asm/oplib.h>
...
@@ -2849,7 +2849,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
...
@@ -2849,7 +2849,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return
rc
;
return
rc
;
}
}
#if (!defined(
__sparc__
) && !defined(CONFIG_PPC_PMAC))
#if (!defined(
CONFIG_SPARC
) && !defined(CONFIG_PPC_PMAC))
/* Fetch MAC address from vital product data of PCI ROM. */
/* Fetch MAC address from vital product data of PCI ROM. */
static
int
find_eth_addr_in_vpd
(
void
__iomem
*
rom_base
,
int
len
,
unsigned
char
*
dev_addr
)
static
int
find_eth_addr_in_vpd
(
void
__iomem
*
rom_base
,
int
len
,
unsigned
char
*
dev_addr
)
{
{
...
@@ -2904,11 +2904,11 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
...
@@ -2904,11 +2904,11 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
static
int
__devinit
gem_get_device_address
(
struct
gem
*
gp
)
static
int
__devinit
gem_get_device_address
(
struct
gem
*
gp
)
{
{
#if defined(
__sparc__
) || defined(CONFIG_PPC_PMAC)
#if defined(
CONFIG_SPARC
) || defined(CONFIG_PPC_PMAC)
struct
net_device
*
dev
=
gp
->
dev
;
struct
net_device
*
dev
=
gp
->
dev
;
#endif
#endif
#if defined(
__sparc__
)
#if defined(
CONFIG_SPARC
)
struct
pci_dev
*
pdev
=
gp
->
pdev
;
struct
pci_dev
*
pdev
=
gp
->
pdev
;
struct
pcidev_cookie
*
pcp
=
pdev
->
sysdata
;
struct
pcidev_cookie
*
pcp
=
pdev
->
sysdata
;
int
use_idprom
=
1
;
int
use_idprom
=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment